4 files changed, 14 insertions, 13 deletions

diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index f687d7e16..16ed9e920 100644
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -42,7 +42,7 @@ enum {
 static void show_entry(struct utmp *ut, int state, time_t dur_secs)
 {
         unsigned days, hours, mins;
-        char duration[32];
+        char duration[sizeof("(%u+02:02)") + sizeof(int)*3];
         char login_time[17];
         char logout_time[8];
         const char *logout_str;
@@ -53,7 +53,8 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
          * but some systems have it wrong */
         tmp = ut->ut_tv.tv_sec;
         safe_strncpy(login_time, ctime(&tmp), 17);
-        snprintf(logout_time, 8, "- %s", ctime(&dur_secs) + 11);
+        tmp = dur_secs;
+        snprintf(logout_time, 8, "- %s", ctime(&tmp) + 11);
 
         dur_secs = MAX(dur_secs - (time_t)ut->ut_tv.tv_sec, (time_t)0);
         /* unsigned int is easier to divide than time_t (which may be signed long) */
diff --git a/networking/inetd.c b/networking/inetd.c
index 584c5e5e4..b3f2e9fbc 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1654,7 +1654,7 @@ static void FAST_FUNC daytime_stream(int s, servtab_t *sep UNUSED_PARAM)
 {
         time_t t;
 
-        t = time(NULL);
+        time(&t);
         fdprintf(s, "%.24s\r\n", ctime(&t));
 }
 static void FAST_FUNC daytime_dg(int s, servtab_t *sep)
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 6e35cd519..8075ef6af 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -11,9 +11,9 @@
 //usage:#define rdate_trivial_usage
 //usage:       "[-sp] HOST"
 //usage:#define rdate_full_usage "\n\n"
-//usage:       "Get and possibly set the system date/time from a remote HOST\n"
-//usage:     "\n        -s      Set the system date/time (default)"
-//usage:     "\n        -p      Print the date/time"
+//usage:       "Get and possibly set system time from a remote HOST\n"
+//usage:     "\n        -s      Set system time (default)"
+//usage:     "\n        -p      Print time"
 
 #include "libbb.h"
 
@@ -36,7 +36,7 @@ static time_t askremotedate(const char *host)
         fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37));
 
         if (safe_read(fd, &nett, 4) != 4)    /* read time from server */
-                bb_error_msg_and_die("%s did not send the complete time", host);
+                bb_error_msg_and_die("%s: %s", host, "short read");
         if (ENABLE_FEATURE_CLEAN_UP)
                 close(fd);
 
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 33cdbfad4..53d9384db 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -32,18 +32,18 @@
 //usage:     "\n        -l,--local      Clock is set to local time"
 //usage:     "\n        -u,--utc        Clock is set to UTC time"
 //usage:     "\n        -d,--device=DEV Specify the RTC device"
-//usage:     "\n        -m,--mode=MODE  Set the sleep state (default: standby)"
-//usage:     "\n        -s,--seconds=SEC Set the timeout in SEC seconds from now"
-//usage:     "\n        -t,--time=TIME  Set the timeout to TIME seconds from epoch"
+//usage:     "\n        -m,--mode=MODE  Set sleep state (default: standby)"
+//usage:     "\n        -s,--seconds=SEC Set timeout in SEC seconds from now"
+//usage:     "\n        -t,--time=TIME  Set timeout to TIME seconds from epoch"
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -a      Read clock mode from adjtime"
 //usage:     "\n        -l      Clock is set to local time"
 //usage:     "\n        -u      Clock is set to UTC time"
 //usage:     "\n        -d DEV  Specify the RTC device"
-//usage:     "\n        -m MODE Set the sleep state (default: standby)"
-//usage:     "\n        -s SEC  Set the timeout in SEC seconds from now"
-//usage:     "\n        -t TIME Set the timeout to TIME seconds from epoch"
+//usage:     "\n        -m MODE Set sleep state (default: standby)"
+//usage:     "\n        -s SEC  Set timeout in SEC seconds from now"
+//usage:     "\n        -t TIME Set timeout to TIME seconds from epoch"
 //usage:        )
 
 #include "libbb.h"