* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

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

diff --git a/coreutils/date.c b/coreutils/date.c
index 2e69bde4a96afc80e2311dc597ad9ff422d251c1..6db3e2838731b0f0b0dd0e26ad021b7a245199d2 100644 (file)
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -20,18 +20,15 @@
  *
 */
 
-#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_invalid_date
-#define bb_need_memory_exhausted
-#include "messages.c"
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <string.h>
 #include <getopt.h>
+#include "busybox.h"
 
 
 /* This 'date' command supports only 2 time setting formats, 
@@ -45,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;
 
@@ -56,7 +53,7 @@ struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
                                &(tm_time->tm_min), &(tm_time->tm_year));
 
        if (nr < 4 || nr > 5) {
-               fatalError(invalid_date, t_string); 
+               error_msg_and_die(invalid_date, t_string); 
        }
 
        /* correct for century  - minor Y2K problem here? */
@@ -72,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;
 
@@ -121,7 +118,7 @@ struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
                t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
 
        } else {
-               fatalError(invalid_date, t_string); 
+               error_msg_and_die(invalid_date, t_string); 
        }
        *tm_time = t;
        return (tm_time);
@@ -150,21 +147,21 @@ int date_main(int argc, char **argv)
                        case 's':
                                set_time = 1;
                                if ((date_str != NULL) || ((date_str = optarg) == NULL)) {
-                                       usage(date_usage);
+                                       show_usage();
                                }
                                break;
                        case 'u':
                                utc = 1;
                                if (putenv("TZ=UTC0") != 0)
-                                       fatalError(memory_exhausted);
+                                       error_msg_and_die(memory_exhausted);
                                break;
                        case 'd':
                                use_arg = 1;
                                if ((date_str != NULL) || ((date_str = optarg) == NULL))
-                                       usage(date_usage);
+                                       show_usage();
                                break;
                        default:
-                               usage(date_usage);
+                               show_usage();
                }
        }
 
@@ -176,8 +173,8 @@ int date_main(int argc, char **argv)
        } 
 #if 0
        else {
-               errorMsg("date_str='%s'  date_fmt='%s'\n", date_str, date_fmt);
-               usage(date_usage);
+               error_msg("date_str='%s'  date_fmt='%s'\n", date_str, date_fmt);
+               show_usage();
        }
 #endif
 
@@ -202,19 +199,19 @@ 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)
-                       fatalError(invalid_date, date_str); 
+                       error_msg_and_die(invalid_date, date_str); 
                if ( utc ) {
                        if (putenv("TZ=UTC0") != 0)
-                               fatalError(memory_exhausted);
+                               error_msg_and_die(memory_exhausted);
                }
 
                /* if setting time, set it */
                if (set_time) {
                        if (stime(&tm) < 0) {
-                               perrorMsg("cannot set date");
+                               perror_msg("cannot set date");
                        }
                }
        }
@@ -244,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;
 }