Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / date.c

diff --git a/date.c b/date.c
index 25ce05d2d3f12a67083a5401bd717db86440cc37..bc6d131370620988992f0938afaa8b7e8417f37a 100644 (file)
--- a/date.c
+++ b/date.c
@@ -40,12 +40,14 @@
    mail commands */
 
 static const char date_usage[] = "date [OPTION]... [+FORMAT]\n"
-       "  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n"
-       "Display the current time in the given FORMAT, or set the system date.\n"
-       "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n"
-       "\t-s\t\tset time described by STRING\n"
-
-       "\t-u\t\tprint or set Coordinated Universal Time\n";
+       "  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nDisplays the current time in the given FORMAT, or sets the system date.\n"
+       "\nOptions:\n\t-R\tOutputs RFC-822 compliant date string\n"
+       "\t-s\tSets time described by STRING\n"
+       "\t-u\tPrints or sets Coordinated Universal Time\n"
+#endif
+       ;
 
 
 /* Input parsing code is always bulky - used heavy duty libc stuff as
@@ -64,7 +66,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, "date", t_string); 
+               fatalError(invalid_date, t_string); 
        }
 
        /* correct for century  - minor Y2K problem here? */
@@ -148,7 +150,7 @@ struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
 
        }
 
-       fatalError(invalid_date, "date", t_string); 
+       fatalError(invalid_date, t_string); 
 }
 
 
@@ -179,18 +181,18 @@ int date_main(int argc, char **argv)
                                        set_time = 1;
                                        if (date_str != NULL)
                                                usage(date_usage);
-                                       date_str = optarg;
+                                       date_str = *argv;
                                        break;
                                case 'u':
                                        utc = 1;
                                        if (putenv("TZ=UTC0") != 0) 
-                                               fatalError(memory_exhausted, "date");
-                                       /* Look ma, no break.  Don't fix it either. */
+                                               fatalError(memory_exhausted);
+                                       break;
                                case 'd':
                                        use_arg = 1;
                                        if (date_str != NULL)
                                                usage(date_usage);
-                                       date_str = optarg;
+                                       date_str = *argv;
                                        break;
                                case '-':
                                        usage(date_usage);
@@ -234,12 +236,12 @@ 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", date_str); 
+                       fatalError(invalid_date, date_str); 
 
                /* if setting time, set it */
                if (set_time) {
                        if (stime(&tm) < 0) {
-                               fatalError("date: can't set date.\n");
+                               fatalError("can't set date.\n");
                        }
                }
        }
@@ -271,6 +273,5 @@ int date_main(int argc, char **argv)
        strftime(t_buff, 200, date_fmt, &tm_time);
        printf("%s\n", t_buff);
 
-       exit(TRUE);
-
+       return(TRUE);
 }