It turns out that DODMALLOC was broken when I reorganized busybox.h

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

diff --git a/coreutils/date.c b/coreutils/date.c
index a8f0d7ced9ae1e30823dd8964a6323dd4d137900..878331f71af57e60fbe331f8887993912e1f5bc6 100644 (file)
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -20,18 +20,19 @@
  *
 */
 
-#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"
+#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, 
@@ -56,7 +57,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? */
@@ -74,73 +75,57 @@ struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
 
 struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
 {
-       struct tm itm_time, jtm_time, ktm_time, ltm_time, mtm_time, ntm_time;
-
-       itm_time = *tm_time;
-       jtm_time = *tm_time;
-       ktm_time = *tm_time;
-       ltm_time = *tm_time;
-       mtm_time = *tm_time;
-       ntm_time = *tm_time;
+       struct tm t;
 
        /* Parse input and assign appropriately to tm_time */
 
-       if (sscanf(t_string, "%d:%d:%d",
-                          &itm_time.tm_hour, &itm_time.tm_min, &itm_time.tm_sec) == 3) {
-
-               *tm_time = itm_time;
-               return (tm_time);
-
-       } else if (sscanf(t_string, "%d:%d",
-                                         &jtm_time.tm_hour, &jtm_time.tm_min) == 2) {
-
-               *tm_time = jtm_time;
-               return (tm_time);
-
-       } else if (sscanf(t_string, "%d.%d-%d:%d:%d",
-                                         &ktm_time.tm_mon,
-                                         &ktm_time.tm_mday,
-                                         &ktm_time.tm_hour,
-                                         &ktm_time.tm_min, &ktm_time.tm_sec) == 5) {
-
-               ktm_time.tm_mon -= 1;   /* Adjust dates from 1-12 to 0-11 */
-               *tm_time = ktm_time;
-               return (tm_time);
-
-       } else if (sscanf(t_string, "%d.%d-%d:%d",
-                                         &ltm_time.tm_mon,
-                                         &ltm_time.tm_mday,
-                                         &ltm_time.tm_hour, &ltm_time.tm_min) == 4) {
-
-               ltm_time.tm_mon -= 1;   /* Adjust dates from 1-12 to 0-11 */
-               *tm_time = ltm_time;
-               return (tm_time);
-
-       } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d",
-                                         &mtm_time.tm_year,
-                                         &mtm_time.tm_mon,
-                                         &mtm_time.tm_mday,
-                                         &mtm_time.tm_hour,
-                                         &mtm_time.tm_min, &mtm_time.tm_sec) == 6) {
-
-               mtm_time.tm_year -= 1900;       /* Adjust years */
-               mtm_time.tm_mon -= 1;   /* Adjust dates from 1-12 to 0-11 */
-               *tm_time = mtm_time;
-               return (tm_time);
-
-       } else if (sscanf(t_string, "%d.%d.%d-%d:%d",
-                                         &ntm_time.tm_year,
-                                         &ntm_time.tm_mon,
-                                         &ntm_time.tm_mday,
-                                         &ntm_time.tm_hour, &ntm_time.tm_min) == 5) {
-               ntm_time.tm_year -= 1900;       /* Adjust years */
-               ntm_time.tm_mon -= 1;   /* Adjust dates from 1-12 to 0-11 */
-               *tm_time = ntm_time;
-               return (tm_time);
+       if (t=*tm_time,sscanf(t_string, "%d:%d:%d",
+                          &t.tm_hour, &t.tm_min, &t.tm_sec) == 3) {
+                                       /* no adjustments needed */
 
-       }
+       } else if (t=*tm_time,sscanf(t_string, "%d:%d",
+                                         &t.tm_hour, &t.tm_min) == 2) {
+                                       /* no adjustments needed */
+
+
+       } else if (t=*tm_time,sscanf(t_string, "%d.%d-%d:%d:%d",
+                                         &t.tm_mon,
+                                         &t.tm_mday,
+                                         &t.tm_hour,
+                                         &t.tm_min, &t.tm_sec) == 5) {
+
+               t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
+
+       } else if (t=*tm_time,sscanf(t_string, "%d.%d-%d:%d",
+                                         &t.tm_mon,
+                                         &t.tm_mday,
+                                         &t.tm_hour, &t.tm_min) == 4) {
+
+               t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
 
-       fatalError(invalid_date, t_string); 
+       } else if (t=*tm_time,sscanf(t_string, "%d.%d.%d-%d:%d:%d",
+                                         &t.tm_year,
+                                         &t.tm_mon,
+                                         &t.tm_mday,
+                                         &t.tm_hour,
+                                         &t.tm_min, &t.tm_sec) == 6) {
+
+               t.tm_year -= 1900;      /* Adjust years */
+               t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
+
+       } else if (t=*tm_time,sscanf(t_string, "%d.%d.%d-%d:%d",
+                                         &t.tm_year,
+                                         &t.tm_mon,
+                                         &t.tm_mday,
+                                         &t.tm_hour, &t.tm_min) == 5) {
+               t.tm_year -= 1900;      /* Adjust years */
+               t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
+
+       } else {
+               error_msg_and_die(invalid_date, t_string); 
+       }
+       *tm_time = t;
+       return (tm_time);
 }
 
 
@@ -166,21 +151,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();
                }
        }
 
@@ -192,8 +177,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
 
@@ -221,16 +206,16 @@ int date_main(int argc, char **argv)
                /* 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");
                        }
                }
        }
@@ -248,7 +233,7 @@ int date_main(int argc, char **argv)
        } else if (*date_fmt == '\0') {
                /* Imitate what GNU 'date' does with NO format string! */
                printf("\n");
-               exit(TRUE);
+               return EXIT_SUCCESS;
        }
 
        /* Handle special conversions */
@@ -262,5 +247,5 @@ int date_main(int argc, char **argv)
        strftime(t_buff, 200, date_fmt, &tm_time);
        printf("%s\n", t_buff);
 
-       return(TRUE);
+       return EXIT_SUCCESS;
 }