emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stime() function calls

Browse Source 
stime() has been deprecated in glibc 2.31 and replaced with
clock_settime(). Let's replace the stime() function calls with
clock_settime() in preperation.

function                                             old     new   delta
rdate_main                                           197     224     +27
clock_settime                                          -      27     +27
date_main                                            926     941     +15
stime                                                 37       -     -37
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37)             Total: 32 bytes

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Alistair Francis 2019-11-19 13:06:40 +01:00 committed by Denys Vlasenko
parent 419d0294e9
commit d3539be8f2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/date.c
View File

@ -276,6 +276,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
time(&ts.tv_sec); time(&ts.tv_sec);
#endif #endif
} }
#if !ENABLE_FEATURE_DATE_NANO
ts.tv_nsec = 0;
#endif
localtime_r(&ts.tv_sec, &tm_time); localtime_r(&ts.tv_sec, &tm_time);
/* If date string is given, update tm_time, and maybe set date */ /* If date string is given, update tm_time, and maybe set date */
@ -298,9 +301,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
if (date_str[0] != '@') if (date_str[0] != '@')
tm_time.tm_isdst = -1; tm_time.tm_isdst = -1;
ts.tv_sec = validate_tm_time(date_str, &tm_time); ts.tv_sec = validate_tm_time(date_str, &tm_time);
ts.tv_nsec = 0;
/* if setting time, set it */ /* if setting time, set it */
if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
bb_simple_perror_msg("can't set date"); bb_simple_perror_msg("can't set date");
} }
} }

8
libbb/missing_syscalls.c
View File

@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
return syscall(__NR_getsid, pid); return syscall(__NR_getsid, pid);
} }
int stime(const time_t *t)
{
struct timeval tv;
tv.tv_sec = *t;
tv.tv_usec = 0;
return settimeofday(&tv, NULL);
}
int sethostname(const char *name, size_t len) int sethostname(const char *name, size_t len)
{ {
return syscall(__NR_sethostname, name, len); return syscall(__NR_sethostname, name, len);

8
util-linux/rdate.c
View File

@ -95,10 +95,14 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
if (!(flags & 2)) { /* no -p (-s may be present) */ if (!(flags & 2)) { /* no -p (-s may be present) */
if (time(NULL) == remote_time) if (time(NULL) == remote_time)
bb_simple_error_msg("current time matches remote time"); bb_simple_error_msg("current time matches remote time");
else else {
if (stime(&remote_time) < 0) struct timespec 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"); bb_simple_perror_msg_and_die("can't set time of day");
} }
}
if (flags != 1) /* not lone -s */ if (flags != 1) /* not lone -s */
printf("%s", ctime(&remote_time)); printf("%s", ctime(&remote_time));