pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Ivan Trubach <mr.trubach@icloud.com>
   3 Date: Tue, 30 Jul 2024 16:06:57 +0300
   4 Subject: [PATCH 17/19] Fix time format for musl
   5
   6 Directive %F is not supported in musl (until recent versions).
   7 https://git.musl-libc.org/cgit/musl/commit/src/time/strptime.c?id=fced99e93daeefb0192fd16304f978d4401d1d77
   8
   9 Avoid using it for str[fp]time.
  10 ---
  11  xar/lib/stat.c | 15 +++++++--------
  12  1 file changed, 7 insertions(+), 8 deletions(-)
  13
  14 diff --git a/xar/lib/stat.c b/xar/lib/stat.c
  15 index 81771dc..d71a613 100644
  16 --- a/xar/lib/stat.c
  17 +++ b/xar/lib/stat.c
  18 @@ -82,6 +82,8 @@
  19  #define LLONG_MAX LONG_LONG_MAX
  20  #endif
  21
  22 +static const char time_format[] = "%Y-%m-%dT%H:%M:%SZ";
  23 +
  24  static struct {
  25         const char *name;
  26         mode_t type;
  27 @@ -513,24 +515,21 @@ int32_t xar_stat_archive(xar_t x, xar_file_t f, const char *file, const char *bu
  28         if( xar_check_prop(x, "atime") ) {
  29                 gmtime_r(&XAR(x)->sbcache.st_atime, &t);
  30                 memset(time, 0, sizeof(time));
  31 -               strftime(time, sizeof(time), "%FT%T", &t);
  32 -               strcat(time, "Z");
  33 +               strftime(time, sizeof(time), time_format, &t);
  34                 xar_prop_set(f, "atime", time);
  35         }
  36
  37         if( xar_check_prop(x, "mtime") ) {
  38                 gmtime_r(&XAR(x)->sbcache.st_mtime, &t);
  39                 memset(time, 0, sizeof(time));
  40 -               strftime(time, sizeof(time), "%FT%T", &t);
  41 -               strcat(time, "Z");
  42 +               strftime(time, sizeof(time), time_format, &t);
  43                 xar_prop_set(f, "mtime", time);
  44         }
  45
  46         if( xar_check_prop(x, "ctime") ) {
  47                 gmtime_r(&XAR(x)->sbcache.st_ctime, &t);
  48                 memset(time, 0, sizeof(time));
  49 -               strftime(time, sizeof(time), "%FT%T", &t);
  50 -               strcat(time, "Z");
  51 +               strftime(time, sizeof(time), time_format, &t);
  52                 xar_prop_set(f, "ctime", time);
  53         }
  54
  55 @@ -680,7 +679,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size
  56         xar_prop_get(f, "atime", &timestr);
  57         if( timestr ) {
  58                 memset(&t, 0, sizeof(t));
  59 -               strptime(timestr, "%FT%T", &t);
  60 +               strptime(timestr, time_format, &t);
  61                 tv[ATIME].tv_sec = timegm(&t);
  62         } else {
  63                 tv[ATIME].tv_sec = time(NULL);
  64 @@ -689,7 +688,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size
  65         xar_prop_get(f, "mtime", &timestr);
  66         if( timestr ) {
  67                 memset(&t, 0, sizeof(t));
  68 -               strptime(timestr, "%FT%T", &t);
  69 +               strptime(timestr, time_format, &t);
  70                 tv[MTIME].tv_sec = timegm(&t);
  71         } else {
  72                 tv[MTIME].tv_sec = time(NULL);
  73 --
  74 2.44.1
  75