- pull from busybox_scratch: r15829:15850

  Various fixes, cleanups and shrinkage:
saves 952 Bytes:
   text    data     bss     dec     hex filename
1087742   15853  790632 1894227  1ce753 ../busybox/busybox.old
1086790   15853  790632 1893275  1ce39b busybox
via:
# scripts/bloat-o-meter ../busybox/busybox_unstripped.old busybox_unstripped 
function                                             old     new   delta
ipcrm_main                                           756     822     +66
getval                                                 -      61     +61
maybe_set_utc                                          -      40     +40
udhcpc_main                                         2896    2912     +16
md5_hash_block                                       428     437      +9
opt                                                    8      16      +8
qgravechar                                           106     110      +4
make_bitmap                                          292     295      +3
inflate_unzip                                       2056    2059      +3
add_partition                                       1412    1414      +2
__parsespent                                         156     158      +2
qrealloc                                              41      42      +1
format                                                 -       1      +1
catv_main                                            313     314      +1
watch_main                                           293     292      -1
varunset                                              81      80      -1
part                                                   1       -      -1
check_if_skip                                        837     836      -1
start_stop_daemon_main                               840     837      -3
create_lost_and_found                                175     172      -3
supress_non_delimited_lines                            4       -      -4
static.l                                               4       -      -4
static.c                                               5       1      -4
bsd_sum_file                                         237     233      -4
eval2                                                338     332      -6
arithmetic_common                                    166     158      -8
cmpfunc                                               22       5     -17
cksum_main                                           294     275     -19
cmp_main                                             465     439     -26
dd_main                                             1535    1508     -27
rmmod_main                                           376     333     -43
cut_file                                             727     644     -83
ipcs_main                                           3809    3721     -88
cut_main                                             722     614    -108
date_main                                           1443    1263    -180
remove_ids                                           222       -    -222
------------------------------------------------------------------------------
(add/remove: 3/4 grow/shrink: 11/18 up/down: 217/-853)       Total: -636 bytes

1 files changed, 123 insertions, 137 deletions

diff --git a/coreutils/date.c b/coreutils/date.c
index f08392e..2a82e04 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -5,14 +5,17 @@
  * by Matthew Grant <grantma@anathoth.gen.nz>
  *
  * iso-format handling added by Robert Griebl <griebl@gmx.de>
+ * bugfixes and cleanup by Bernhard Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
+#include "busybox.h"
+
 /* This 'date' command supports only 2 time setting formats,
    all the GNU strftime stuff (its in libc, lets use it),
-   setting time using UTC and displaying int, as well as
-   an RFC 822 complient date output for shell scripting
+   setting time using UTC and displaying it, as well as
+   an RFC 2822 compliant date output for shell scripting
    mail commands */
 
 /* Input parsing code is always bulky - used heavy duty libc stuff as
@@ -20,13 +23,6 @@
 
 /* Default input handling to save surprising some people */
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include "busybox.h"
 
 #define DATE_OPT_RFC2822	0x01
 #define DATE_OPT_SET		0x02
@@ -36,119 +32,45 @@
 #define DATE_OPT_TIMESPEC	0x20
 #define DATE_OPT_HINT		0x40
 
-
-static struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
-{
-	int nr;
-	char *cp;
-
-	nr = sscanf(t_string, "%2d%2d%2d%2d%d", &(tm_time->tm_mon),
-				&(tm_time->tm_mday), &(tm_time->tm_hour), &(tm_time->tm_min),
-				&(tm_time->tm_year));
-
-	if (nr < 4 || nr > 5) {
-		bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-	}
-
-	cp = strchr(t_string, '.');
-	if (cp) {
-		nr = sscanf(cp + 1, "%2d", &(tm_time->tm_sec));
-		if (nr != 1) {
-			bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-		}
-	}
-
-	/* correct for century  - minor Y2K problem here? */
-	if (tm_time->tm_year >= 1900) {
-		tm_time->tm_year -= 1900;
-	}
-	/* adjust date */
-	tm_time->tm_mon -= 1;
-
-	return (tm_time);
-
-}
-
-
-/* The new stuff for LRP */
-
-static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
+static void maybe_set_utc(int opt)
 {
-	struct tm t;
-
-	/* Parse input and assign appropriately to 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) {
-		/* Adjust dates from 1-12 to 0-11 */
-		t.tm_mon -= 1;
-	} 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) {
-		/* Adjust dates from 1-12 to 0-11 */
-		t.tm_mon -= 1;
-	} 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 {
-		bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-	}
-	*tm_time = t;
-	return (tm_time);
+	if ((opt & DATE_OPT_UTC) && putenv("TZ=UTC0") != 0)
+		bb_error_msg_and_die(bb_msg_memory_exhausted);
 }
 
 int date_main(int argc, char **argv)
 {
-	char *date_str = NULL;
-	char *date_fmt = NULL;
-	int set_time;
-	int utc;
 	time_t tm;
-	unsigned long opt;
 	struct tm tm_time;
+	unsigned long opt;
+	int ifmt = -1;
+	char *date_str = NULL;
+	char *date_fmt = NULL;
 	char *filename = NULL;
-
-	int ifmt = 0;
 	char *isofmt_arg;
 	char *hintfmt_arg;
 
-	bb_opt_complementally = "?:d--s:s--d";
+	bb_opt_complementally = "?:d--s:s--d"
+		USE_FEATURE_DATE_ISOFMT(":R--I:I--R");
 	opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:"
-		  		 	USE_FEATURE_DATE_ISOFMT("I::D:"),
+					USE_FEATURE_DATE_ISOFMT("I::D:"),
 					&date_str, &date_str, &filename
 					USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
-	set_time = opt & DATE_OPT_SET;
-	utc = opt & DATE_OPT_UTC;
-	if (utc && putenv("TZ=UTC0") != 0) {
-		bb_error_msg_and_die(bb_msg_memory_exhausted);
-	}
+	maybe_set_utc(opt);
 
-	if(ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
+	if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
 		if (!isofmt_arg) {
-			ifmt = 1;
+			ifmt = 0; /* default is date */
 		} else {
-			char *isoformats[]={"date","hours","minutes","seconds"};
-			for(ifmt = 4; ifmt;)
-				if(!strcmp(isofmt_arg,isoformats[--ifmt]))
+			const char * const isoformats[] =
+				{"date", "hours", "minutes", "seconds"};
+
+			for (ifmt = 0; ifmt < 4; ifmt++)
+				if (!strcmp(isofmt_arg, isoformats[ifmt])) {
 					break;
-		}
-		if (!ifmt) {
-			bb_show_usage();
+				}
+			if (ifmt == 4) /* parse error */
+				bb_show_usage();
 		}
 	}
 
@@ -156,18 +78,19 @@ int date_main(int argc, char **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;
+		opt |= DATE_OPT_SET;
 		date_str = argv[optind];
 	}
 
 	/* Now we have parsed all the information except the date format
 	   which depends on whether the clock is being set or read */
 
-	if(filename) {
+	if (filename) {
 		struct stat statbuf;
-		xstat(filename,&statbuf);
-		tm=statbuf.st_mtime;
-	} else time(&tm);
+		xstat(filename, &statbuf);
+		tm = statbuf.st_mtime;
+	} else
+		time(&tm);
 	memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
 	/* Zero out fields - take her back to midnight! */
 	if (date_str != NULL) {
@@ -179,9 +102,64 @@ int date_main(int argc, char **argv)
 		if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
 			strptime(date_str, hintfmt_arg, &tm_time);
 		} else if (strchr(date_str, ':') != NULL) {
-			date_conv_ftime(&tm_time, date_str);
+			/* Parse input and assign appropriately to tm_time */
+
+			if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min,
+								 &tm_time.tm_sec) == 3) {
+				/* no adjustments needed */
+			} else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour,
+										&tm_time.tm_min) == 2) {
+				/* no adjustments needed */
+			} else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon,
+								&tm_time.tm_mday, &tm_time.tm_hour,
+								&tm_time.tm_min, &tm_time.tm_sec) == 5) {
+				/* Adjust dates from 1-12 to 0-11 */
+				tm_time.tm_mon -= 1;
+			} else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon,
+								&tm_time.tm_mday,
+								&tm_time.tm_hour, &tm_time.tm_min) == 4) {
+				/* Adjust dates from 1-12 to 0-11 */
+				tm_time.tm_mon -= 1;
+			} else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year,
+								&tm_time.tm_mon, &tm_time.tm_mday,
+								&tm_time.tm_hour, &tm_time.tm_min,
+									&tm_time.tm_sec) == 6) {
+				tm_time.tm_year -= 1900;	/* Adjust years */
+				tm_time.tm_mon -= 1;	/* Adjust dates from 1-12 to 0-11 */
+			} else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year,
+								&tm_time.tm_mon, &tm_time.tm_mday,
+								&tm_time.tm_hour, &tm_time.tm_min) == 5) {
+				tm_time.tm_year -= 1900;	/* Adjust years */
+				tm_time.tm_mon -= 1;	/* Adjust dates from 1-12 to 0-11 */
+			} else {
+				bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+			}
 		} else {
-			date_conv_time(&tm_time, date_str);
+			int nr;
+			char *cp;
+
+			nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon,
+						&tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
+						&tm_time.tm_year);
+
+			if (nr < 4 || nr > 5) {
+				bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+			}
+
+			cp = strchr(date_str, '.');
+			if (cp) {
+				nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec);
+				if (nr != 1) {
+					bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+				}
+			}
+
+			/* correct for century  - minor Y2K problem here? */
+			if (tm_time.tm_year >= 1900) {
+				tm_time.tm_year -= 1900;
+			}
+			/* adjust date */
+			tm_time.tm_mon -= 1;
 		}
 
 		/* Correct any day of week and day of year etc. fields */
@@ -190,12 +168,10 @@ int date_main(int argc, char **argv)
 		if (tm < 0) {
 			bb_error_msg_and_die(bb_msg_invalid_date, date_str);
 		}
-		if (utc && putenv("TZ=UTC0") != 0) {
-			bb_error_msg_and_die(bb_msg_memory_exhausted);
-		}
+		maybe_set_utc(opt);
 
 		/* if setting time, set it */
-		if (set_time && stime(&tm) < 0) {
+		if ((opt & DATE_OPT_SET) && stime(&tm) < 0) {
 			bb_perror_msg("cannot set date");
 		}
 	}
@@ -203,33 +179,43 @@ int date_main(int argc, char **argv)
 	/* Display output */
 
 	/* Deal with format string */
+
 	if (date_fmt == NULL) {
-		/* Start with the default case */
-		
-		date_fmt = (opt & DATE_OPT_RFC2822 ?
-					(utc ? "%a, %d %b %Y %H:%M:%S GMT" :
-					"%a, %d %b %Y %H:%M:%S %z") :
-					"%a %b %e %H:%M:%S %Z %Y");
-
-		if (ENABLE_FEATURE_DATE_ISOFMT) {
-			if (ifmt == 4)
-				date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z";
-			else if (ifmt == 3)
-				date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z";
-			else if (ifmt == 2) 
-				date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z";
-			else if (ifmt == 1)
-				date_fmt = "%Y-%m-%d";
-		}
+		int i;
+		date_fmt = xzalloc(32);
+		if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
+			strcpy(date_fmt, "%Y-%m-%d");
+			if (ifmt > 0) {
+				i = 8;
+				date_fmt[i++] = 'T';
+				date_fmt[i++] = '%';
+				date_fmt[i++] = 'H';
+				if (ifmt > 1) {
+					date_fmt[i++] = ':';
+					date_fmt[i++] = '%';
+					date_fmt[i++] = 'M';
+				}
+				if (ifmt > 2) {
+					date_fmt[i++] = ':';
+					date_fmt[i++] = '%';
+					date_fmt[i++] = 'S';
+				}
+format_utc:
+				date_fmt[i++] = '%';
+				date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
+			}
+		} else if (opt & DATE_OPT_RFC2822) {
+			strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");
+			i = 22;
+			goto format_utc;
+		} else /* default case */
+			date_fmt = "%a %b %e %H:%M:%S %Z %Y";
 	}
-	
-	if (*date_fmt == '\0') {
 
+	if (*date_fmt == '\0') {
 		/* With no format string, just print a blank line */
-		
-		*bb_common_bufsiz1=0;
+		*bb_common_bufsiz1 = 0;
 	} else {
-
 		/* Handle special conversions */
 
 		if (strncmp(date_fmt, "%f", 2) == 0) {