aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-09-21 15:19:18 +0100
committerRon Yorston <rmy@pobox.com>2021-09-21 15:19:18 +0100
commit90b3ba992ecb39e32e5a66b2e37579becc56d286 (patch)
tree4c4a2c9e1baeb8230d78efd058bb4bcabc3fd12b /archival
parentdf34f5e92b1d10f0bb858d2ea6e8c249e87ac593 (diff)
parent56f0e886db0543a27f369d7f95eb9da2fb3d069c (diff)
downloadbusybox-w32-90b3ba992ecb39e32e5a66b2e37579becc56d286.tar.gz
busybox-w32-90b3ba992ecb39e32e5a66b2e37579becc56d286.tar.bz2
busybox-w32-90b3ba992ecb39e32e5a66b2e37579becc56d286.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c3
-rw-r--r--archival/libarchive/header_verbose_list.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 1879ec79f..beccab217 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -213,9 +213,10 @@ static int write_ar_archive(archive_handle_t *handle)
213 213
214static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header) 214static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
215{ 215{
216 const char *mode = bb_mode_string(file_header->mode); 216 char mode[12];
217 char *mtime; 217 char *mtime;
218 218
219 bb_mode_string(mode, file_header->mode);
219 mtime = ctime(&file_header->mtime); 220 mtime = ctime(&file_header->mtime);
220 mtime[16] = ' '; 221 mtime[16] = ' ';
221 memmove(&mtime[17], &mtime[20], 4); 222 memmove(&mtime[17], &mtime[20], 4);
diff --git a/archival/libarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index be5140f8b..a575a08a0 100644
--- a/archival/libarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -9,6 +9,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
9{ 9{
10 struct tm tm_time; 10 struct tm tm_time;
11 struct tm *ptm = &tm_time; //localtime(&file_header->mtime); 11 struct tm *ptm = &tm_time; //localtime(&file_header->mtime);
12 char modestr[12];
12 13
13#if ENABLE_FEATURE_TAR_UNAME_GNAME 14#if ENABLE_FEATURE_TAR_UNAME_GNAME
14 char uid[sizeof(int)*3 + 2]; 15 char uid[sizeof(int)*3 + 2];
@@ -29,7 +30,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
29 group = utoa(file_header->gid); 30 group = utoa(file_header->gid);
30 } 31 }
31 printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s", 32 printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
32 bb_mode_string(file_header->mode), 33 bb_mode_string(modestr, file_header->mode),
33 user, 34 user,
34 group, 35 group,
35 file_header->size, 36 file_header->size,
@@ -46,7 +47,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
46 localtime_r(&file_header->mtime, ptm); 47 localtime_r(&file_header->mtime, ptm);
47 48
48 printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s", 49 printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
49 bb_mode_string(file_header->mode), 50 bb_mode_string(modestr, file_header->mode),
50 (unsigned)file_header->uid, 51 (unsigned)file_header->uid,
51 (unsigned)file_header->gid, 52 (unsigned)file_header->gid,
52 file_header->size, 53 file_header->size,