package/utils/busybox/patches/001-remove-stime-function-calls.patch

   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
   5
   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.
   9
  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
  17
  18 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  19 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
  20 ---
  21  coreutils/date.c         | 6 +++++-
  22  libbb/missing_syscalls.c | 8 --------
  23  util-linux/rdate.c       | 8 ++++++--
  24  3 files changed, 11 insertions(+), 11 deletions(-)
  25
  26 --- a/coreutils/date.c
  27 +++ b/coreutils/date.c
  28 @@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, cha
  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);
  36
  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, cha
  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;
  43
  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 --- a/libbb/missing_syscalls.c
  51 +++ b/libbb/missing_syscalls.c
  52 @@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
  53         return syscall(__NR_getsid, pid);
  54  }
  55
  56 -int stime(const time_t *t)
  57 -{
  58 -       struct timeval tv;
  59 -       tv.tv_sec = *t;
  60 -       tv.tv_usec = 0;
  61 -       return settimeofday(&tv, NULL);
  62 -}
  63 -
  64  int sethostname(const char *name, size_t len)
  65  {
  66         return syscall(__NR_sethostname, name, len);
  67 --- a/util-linux/rdate.c
  68 +++ b/util-linux/rdate.c
  69 @@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, ch
  70         if (!(flags & 2)) { /* no -p (-s may be present) */
  71                 if (time(NULL) == remote_time)
  72                         bb_error_msg("current time matches remote time");
  73 -               else
  74 -                       if (stime(&remote_time) < 0)
  75 +               else {
  76 +                       struct timespec ts;
  77 +                       ts.tv_sec = remote_time;
  78 +                       ts.tv_nsec = 0;
  79 +                       if (clock_settime(CLOCK_REALTIME, &ts) < 0)
  80                                 bb_perror_msg_and_die("can't set time of day");
  81 +               }
  82         }
  83
  84         if (flags != 1) /* not lone -s */