From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../archival/libunarchive/header_verbose_list.c | 51 +++++++++++++++++----- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'release/src/router/busybox/archival/libunarchive/header_verbose_list.c') diff --git a/release/src/router/busybox/archival/libunarchive/header_verbose_list.c b/release/src/router/busybox/archival/libunarchive/header_verbose_list.c index 6739dd39..dc310036 100644 --- a/release/src/router/busybox/archival/libunarchive/header_verbose_list.c +++ b/release/src/router/busybox/archival/libunarchive/header_verbose_list.c @@ -1,18 +1,47 @@ -#include -#include -#include +/* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ + #include "libbb.h" #include "unarchive.h" -extern void header_verbose_list(const file_header_t *file_header) +void FAST_FUNC header_verbose_list(const file_header_t *file_header) { - struct tm *mtime = localtime(&file_header->mtime); + struct tm *mtime = localtime(&(file_header->mtime)); + +#if ENABLE_FEATURE_TAR_UNAME_GNAME + char uid[8]; + char gid[8]; + char *user = file_header->uname; + char *group = file_header->gname; - printf("%s %d/%d%10u %4u-%02u-%02u %02u:%02u:%02u %s", + if (user == NULL) { + snprintf(uid, sizeof(uid), "%u", (unsigned)file_header->uid); + user = uid; + } + if (group == NULL) { + snprintf(gid, sizeof(gid), "%u", (unsigned)file_header->gid); + group = gid; + } + printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s", + bb_mode_string(file_header->mode), + user, + group, + file_header->size, + 1900 + mtime->tm_year, + 1 + mtime->tm_mon, + mtime->tm_mday, + mtime->tm_hour, + mtime->tm_min, + mtime->tm_sec, + file_header->name); +#else /* !FEATURE_TAR_UNAME_GNAME */ + printf("%s %d/%d %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s", bb_mode_string(file_header->mode), file_header->uid, file_header->gid, - (unsigned int) file_header->size, + file_header->size, 1900 + mtime->tm_year, 1 + mtime->tm_mon, mtime->tm_mday, @@ -20,10 +49,10 @@ extern void header_verbose_list(const file_header_t *file_header) mtime->tm_min, mtime->tm_sec, file_header->name); +#endif /* FEATURE_TAR_UNAME_GNAME */ - if (file_header->link_name) { - printf(" -> %s", file_header->link_name); + if (file_header->link_target) { + printf(" -> %s", file_header->link_target); } - /* putchar isnt used anywhere else i dont think */ - puts(""); + bb_putchar('\n'); } -- cgit v1.2.3-54-g00ecf