libbb: introduce and use xsettimeofday()
function old new delta
xsettimeofday - 25 +25
rdate_main 274 260 -14
step_time 348 331 -17
set_kernel_timezone_and_clock 119 102 -17
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/3 up/down: 25/-48) Total: -23 bytes
text data bss dec hex filename
1020753 559 5052 1026364 fa93c busybox_old
1020708 559 5052 1026319 fa90f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/include/libbb.h b/include/libbb.h
index 6b71414..1c3d905 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -657,6 +657,8 @@
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 ee2dbde..d93d8aa 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -417,15 +417,3 @@
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 db40e99..6c22043 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -702,3 +702,21 @@
}
/* 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 032dc51..06f6017 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1147,8 +1147,7 @@
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 77aa2d7..dd66ec1 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -184,10 +184,8 @@
/*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 bb1dc51..9b80141 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -96,11 +96,10 @@
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);
}
}