6 files changed, 26 insertions, 22 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 6b7141456..1c3d905b6 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -657,6 +657,8 @@ void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC;
 time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC;
 char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
 char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
+void xsettimeofday(const struct timeval *tv) FAST_FUNC;
+
 
 int xsocket(int domain, int type, int protocol) FAST_FUNC;
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index ee2dbdef1..d93d8aaf5 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -417,15 +417,3 @@ int FAST_FUNC wait4pid(pid_t pid)
                 return WTERMSIG(status) + 0x180;
         return 0;
 }
-
-// Useful when we do know that pid is valid, and we just want to wait
-// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
-int FAST_FUNC wait_for_exitstatus(pid_t pid)
-{
-        int exit_status, n;
-
-        n = safe_waitpid(pid, &exit_status, 0);
-        if (n < 0)
-                bb_simple_perror_msg_and_die("waitpid");
-        return exit_status;
-}
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index db40e996b..6c220434d 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -702,3 +702,21 @@ void FAST_FUNC xvfork_parent_waits_and_exits(void)
         }
         /* Child continues */
 }
+
+// Useful when we do know that pid is valid, and we just want to wait
+// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
+int FAST_FUNC wait_for_exitstatus(pid_t pid)
+{
+        int exit_status, n;
+
+        n = safe_waitpid(pid, &exit_status, 0);
+        if (n < 0)
+                bb_simple_perror_msg_and_die("waitpid");
+        return exit_status;
+}
+
+void FAST_FUNC xsettimeofday(const struct timeval *tv)
+{
+        if (settimeofday(tv, NULL))
+                bb_simple_perror_msg_and_die("settimeofday");
+}
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 032dc51ac..06f6017d0 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1147,8 +1147,7 @@ step_time(double offset)
         gettimeofday(&tvc, NULL); /* never fails */
         dtime = tvc.tv_sec + (1.0e-6 * tvc.tv_usec) + offset;
         d_to_tv(dtime, &tvn);
-        if (settimeofday(&tvn, NULL) == -1)
-                bb_simple_perror_msg_and_die("settimeofday");
+        xsettimeofday(&tvn);
 
         VERB2 {
                 tval = tvc.tv_sec;
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 77aa2d7c3..dd66ec199 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -184,10 +184,8 @@ static void set_kernel_timezone_and_clock(int utc, const struct timeval *hctosys
         /*tz.tz_dsttime = 0; already is */
         set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */
 
-        if (hctosys) { /* it's --hctosys: set time too */
-                if (settimeofday(hctosys, NULL))
-                        bb_simple_perror_msg_and_die("settimeofday");
-        }
+        if (hctosys) /* it's --hctosys: set time too */
+                xsettimeofday(hctosys);
 }
 
 static void to_sys_clock(const char **pp_rtcname, int utc)
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index bb1dc519a..9b80141c9 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -96,11 +96,10 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
                 if (time(NULL) == remote_time)
                         bb_simple_error_msg("current time matches remote time");
                 else {
-                        struct timespec ts;
+                        struct timeval ts;
                         ts.tv_sec = remote_time;
-                        ts.tv_nsec = 0;
-                        if (clock_settime(CLOCK_REALTIME, &ts) < 0)
-                                bb_simple_perror_msg_and_die("can't set time of day");
+                        ts.tv_usec = 0;
+                        xsettimeofday(&ts);
                 }
         }