X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=misc-utils%2Flogger.c;h=4c2bfb0943b2eaf9849278166691d277fb64aef2;hb=HEAD;hp=e1d270de8df6782bc5c801c185e6f53ea14e5e9b;hpb=04e06558e969396014aa2dc24ca9bb380543ec01;p=thirdparty%2Futil-linux.git

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index e1d270de8d..f696287d7a 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -154,13 +154,24 @@ static inline int logger_gettimeofday(struct timeval *tv, struct timezone *tz)
 	char *str = getenv("LOGGER_TEST_TIMEOFDAY");
 	uintmax_t sec, usec;
 
-	if (str && sscanf(str, "%ju.%ju", &sec, &usec) == 2) {
+	if (str) {
+		if (sscanf(str, "%ju.%ju", &sec, &usec) != 2)
+			goto err;
+
 		tv->tv_sec = sec;
 		tv->tv_usec = usec;
-		return tv->tv_sec >= 0 && tv->tv_usec >= 0 ? 0 : -EINVAL;
+
+		if (tv->tv_sec >= 0 && tv->tv_usec >= 0)
+			return 0;
+		else
+			goto err;
 	}
 
 	return gettimeofday(tv, tz);
+
+err:
+	errno = EINVAL;
+	return -1;
 }
 
 static inline char *logger_xgethostname(void)
@@ -406,12 +417,15 @@ static char const *rfc3164_current_time(void)
 	static char time[32];
 	struct timeval tv;
 	struct tm tm;
+	int ret;
 	static char const * const monthnames[] = {
 		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
 		"Sep", "Oct", "Nov", "Dec"
 	};
 
-	logger_gettimeofday(&tv, NULL);
+	ret = logger_gettimeofday(&tv, NULL);
+	if (ret == -1)
+		err(EXIT_FAILURE, _("gettimeofday() failed"));
 	localtime_r(&tv.tv_sec, &tm);
 	snprintf(time, sizeof(time),"%s %2d %2.2d:%2.2d:%2.2d",
 		monthnames[tm.tm_mon], tm.tm_mday,
@@ -782,6 +796,7 @@ static int valid_structured_data_id(const char *str)
  */
 static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 {
+	int ret;
 	char *time;
 	char *hostname;
 	char const *app_name = ctl->tag;
@@ -794,16 +809,18 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 		struct timeval tv;
 		struct tm tm;
 
-		logger_gettimeofday(&tv, NULL);
+		ret = logger_gettimeofday(&tv, NULL);
+		if (ret == -1)
+			err(EXIT_FAILURE, _("gettimeofday() failed"));
 		if (localtime_r(&tv.tv_sec, &tm) != NULL) {
 			char fmt[64];
 			const size_t i = strftime(fmt, sizeof(fmt),
-						  "%Y-%m-%dT%H:%M:%S.%%06u%z ", &tm);
+						  "%Y-%m-%dT%H:%M:%S.%%06jd%z ", &tm);
 			/* patch TZ info to comply with RFC3339 (we left SP at end) */
 			fmt[i - 1] = fmt[i - 2];
 			fmt[i - 2] = fmt[i - 3];
 			fmt[i - 3] = ':';
-			xasprintf(&time, fmt, tv.tv_usec);
+			xasprintf(&time, fmt, (intmax_t) tv.tv_usec);
 		} else
 			err(EXIT_FAILURE, _("localtime() failed"));
 	} else