X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=date.c;h=a8f0d7ced9ae1e30823dd8964a6323dd4d137900;hb=d58ff8731ce635a75406cc8b9629f1041bb4ed32;hp=199a894c0ee0c990de0fbc80f3f3967b4f41c879;hpb=298854f02963bd8e43dfeb7224d88cfeb0c932cb;p=oweals%2Fbusybox.git

diff --git a/date.c b/date.c
index 199a894c0..a8f0d7ced 100644
--- a/date.c
+++ b/date.c
@@ -20,7 +20,7 @@
  *
 */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_date
 #define bb_need_memory_exhausted
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <getopt.h>
 
 
 /* This 'date' command supports only 2 time setting formats, 
@@ -39,15 +40,6 @@
    an RFC 822 complient date output for shell scripting
    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";
-
-
 /* Input parsing code is always bulky - used heavy duty libc stuff as
    much as possible, missed out a lot of bounds checking */
 
@@ -64,8 +56,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) {
-		fprintf(stderr, invalid_date, "date", t_string);
-		exit(FALSE);
+		fatalError(invalid_date, t_string); 
 	}
 
 	/* correct for century  - minor Y2K problem here? */
@@ -149,10 +140,7 @@ struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
 
 	}
 
-	fprintf(stderr, invalid_date, "date", t_string);
-
-	exit(FALSE);
-
+	fatalError(invalid_date, t_string); 
 }
 
 
@@ -161,7 +149,7 @@ int date_main(int argc, char **argv)
 	char *date_str = NULL;
 	char *date_fmt = NULL;
 	char *t_buff;
-	int i;
+	int c;
 	int set_time = 0;
 	int rfc822 = 0;
 	int utc = 0;
@@ -170,51 +158,44 @@ int date_main(int argc, char **argv)
 	struct tm tm_time;
 
 	/* Interpret command line args */
-	i = --argc;
-	argv++;
-	while (i > 0 && **argv) {
-		if (**argv == '-') {
-			while (i > 0 && *++(*argv))
-				switch (**argv) {
-				case 'R':
-					rfc822 = 1;
-					break;
-				case 's':
-					set_time = 1;
-					if (date_str != NULL)
-						usage(date_usage);
-					date_str = optarg;
-					break;
-				case 'u':
-					utc = 1;
-					if (putenv("TZ=UTC0") != 0) {
-						fprintf(stderr, memory_exhausted, "date");
-						exit(FALSE);
-					}
-					/* Look ma, no break.  Don't fix it either. */
-				case 'd':
-					use_arg = 1;
-					if (date_str != NULL)
-						usage(date_usage);
-					date_str = optarg;
-					break;
-				case '-':
+	while ((c = getopt(argc, argv, "Rs:ud:")) != EOF) {
+		switch (c) {
+			case 'R':
+				rfc822 = 1;
+				break;
+			case 's':
+				set_time = 1;
+				if ((date_str != NULL) || ((date_str = optarg) == NULL)) {
 					usage(date_usage);
 				}
-		} else {
-			if ((date_fmt == NULL) && (**argv == '+'))
-				date_fmt = *argv + 1;   /* Skip over the '+' */
-			else if (date_str == NULL) {
-				set_time = 1;
-				date_str = *argv;
-			} else {
+				break;
+			case 'u':
+				utc = 1;
+				if (putenv("TZ=UTC0") != 0)
+					fatalError(memory_exhausted);
+				break;
+			case 'd':
+				use_arg = 1;
+				if ((date_str != NULL) || ((date_str = optarg) == NULL))
+					usage(date_usage);
+				break;
+			default:
 				usage(date_usage);
-			}
 		}
-		i--;
-		argv++;
 	}
 
+	if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+'))
+		date_fmt = &argv[optind][1];   /* Skip over the '+' */
+	else if (date_str == NULL) {
+		set_time = 1;
+		date_str = argv[optind];
+	} 
+#if 0
+	else {
+		errorMsg("date_str='%s'  date_fmt='%s'\n", date_str, date_fmt);
+		usage(date_usage);
+	}
+#endif
 
 	/* Now we have parsed all the information except the date format
 	   which depends on whether the clock is being set or read */
@@ -239,16 +220,17 @@ 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) {
-			fprintf(stderr, invalid_date, "date", date_str);
-			exit(FALSE);
+		if (tm < 0)
+			fatalError(invalid_date, date_str); 
+		if ( utc ) {
+			if (putenv("TZ=UTC0") != 0)
+				fatalError(memory_exhausted);
 		}
 
 		/* if setting time, set it */
 		if (set_time) {
 			if (stime(&tm) < 0) {
-				fprintf(stderr, "date: can't set date.\n");
-				exit(FALSE);
+				perrorMsg("cannot set date");
 			}
 		}
 	}
@@ -280,6 +262,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);
 }