wok-current view busybox/stuff/busybox-1.31-remove-stime-function-calls.patch @ rev 25785
Mass rebuild after bump to glibc 2.31, add epson printer and scanner package
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Tue Jul 15 20:40:17 2025 +0000 (3 months ago) |
| parents | |
| children |
line source
1 From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001
2 From: Alistair Francis <alistair.francis@wdc.com>
3 Date: Tue, 19 Nov 2019 13:06:40 +0100
4 Subject: Remove stime() function calls
6 stime() has been deprecated in glibc 2.31 and replaced with
7 clock_settime(). Let's replace the stime() function calls with
8 clock_settime() in preperation.
10 function old new delta
11 rdate_main 197 224 +27
12 clock_settime - 27 +27
13 date_main 926 941 +15
14 stime 37 - -37
15 ------------------------------------------------------------------------------
16 (add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
18 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
19 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
20 ---
22 https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9
24 diff --git a/coreutils/date.c b/coreutils/date.c
25 index 3414d38ae..4ade6abb4 100644
26 --- a/coreutils/date.c
27 +++ b/coreutils/date.c
28 @@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
29 time(&ts.tv_sec);
30 #endif
31 }
32 +#if !ENABLE_FEATURE_DATE_NANO
33 + ts.tv_nsec = 0;
34 +#endif
35 localtime_r(&ts.tv_sec, &tm_time);
37 /* If date string is given, update tm_time, and maybe set date */
38 @@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
39 if (date_str[0] != '@')
40 tm_time.tm_isdst = -1;
41 ts.tv_sec = validate_tm_time(date_str, &tm_time);
42 + ts.tv_nsec = 0;
44 /* if setting time, set it */
45 - if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
46 + if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
47 bb_perror_msg("can't set date");
48 }
49 }
50 diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
51 index 87cf59b3d..dc40d9155 100644
52 --- a/libbb/missing_syscalls.c
53 +++ b/libbb/missing_syscalls.c
54 @@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
55 return syscall(__NR_getsid, pid);
56 }
58 -int stime(const time_t *t)
59 -{
60 - struct timeval tv;
61 - tv.tv_sec = *t;
62 - tv.tv_usec = 0;
63 - return settimeofday(&tv, NULL);
64 -}
65 -
66 int sethostname(const char *name, size_t len)
67 {
68 return syscall(__NR_sethostname, name, len);
69 diff --git a/util-linux/rdate.c b/util-linux/rdate.c
70 index 70f829e7f..878375d78 100644
71 --- a/util-linux/rdate.c
72 +++ b/util-linux/rdate.c
73 @@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
74 if (!(flags & 2)) { /* no -p (-s may be present) */
75 if (time(NULL) == remote_time)
76 bb_error_msg("current time matches remote time");
77 - else
78 - if (stime(&remote_time) < 0)
79 + else {
80 + struct timespec ts;
81 + ts.tv_sec = remote_time;
82 + ts.tv_nsec = 0;
83 + if (clock_settime(CLOCK_REALTIME, &ts) < 0)
84 bb_perror_msg_and_die("can't set time of day");
85 + }
86 }
88 if (flags != 1) /* not lone -s */