Some more patchelttes from Larry Doolittle.

[oweals/busybox.git] / coreutils / date.c

diff --git a/coreutils/date.c b/coreutils/date.c
index 878331f71af57e60fbe331f8887993912e1f5bc6..6db3e2838731b0f0b0dd0e26ad021b7a245199d2 100644 (file)
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -29,10 +29,6 @@
 #include <string.h>
 #include <getopt.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_invalid_date
-#define bb_need_memory_exhausted
-#include "messages.c"
 
 
 /* This 'date' command supports only 2 time setting formats, 
@@ -46,7 +42,7 @@
 
 /* Default input handling to save suprising some people */
 
-struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
+static struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
 {
        int nr;
 
@@ -73,7 +69,7 @@ struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
 
 /* The new stuff for LRP */
 
-struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
+static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
 {
        struct tm t;
 
@@ -203,7 +199,7 @@ int date_main(int argc, char **argv)
                        date_conv_time(&tm_time, date_str);
                }
 
-               /* Correct any day of week and day of year etc fields */
+               /* Correct any day of week and day of year etc. fields */
                tm = mktime(&tm_time);
                if (tm < 0)
                        error_msg_and_die(invalid_date, date_str); 
@@ -245,7 +241,7 @@ int date_main(int argc, char **argv)
        /* Print OUTPUT (after ALL that!) */
        t_buff = xmalloc(201);
        strftime(t_buff, 200, date_fmt, &tm_time);
-       printf("%s\n", t_buff);
+       puts(t_buff);
 
        return EXIT_SUCCESS;
 }