X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=date.c;h=4b2f66add384cfc87b32eaf3d3bbb0922547df26;hb=e5f39576650933770153e82c63a46f27fcd72b0e;hp=2e69bde4a96afc80e2311dc597ad9ff422d251c1;hpb=3e856ce428cabaf6c8d99a2374a1f9a4a05db5f0;p=oweals%2Fbusybox.git

diff --git a/date.c b/date.c
index 2e69bde4a..4b2f66add 100644
--- a/date.c
+++ b/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, 
@@ -45,7 +46,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 +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? */
@@ -72,7 +73,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 +122,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 +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();
 		}
 	}
 
@@ -176,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
 
@@ -205,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");
 			}
 		}
 	}