diff options
| author | Denys Vlasenko | 2010-01-06 10:53:17 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-01-06 10:53:17 +0100 |
| commit | aa4977d8e549d9fff2b2946f03d304e435eb20f1 (patch) | |
| tree | bc7c7fe4ab64263a9f8356762cb8f7e77165de73 /archival/libunarchive/data_extract_all.c | |
| parent | 86350f8d5f5d5a1006cffe0bedccd625f012702f (diff) | |
| download | busybox-aa4977d8e549d9fff2b2946f03d304e435eb20f1.zip busybox-aa4977d8e549d9fff2b2946f03d304e435eb20f1.tar.gz | |
libunarchive: clean up dirty hacks. code shrank as a result
function old new delta
cpio_main 526 539 +13
init_handle 57 58 +1
init_archive_deb_ar 34 35 +1
get_header_ar 408 409 +1
dpkg_main 3900 3901 +1
unpack_package 516 515 -1
rpm_main 1673 1672 -1
tar_main 774 767 -7
get_header_cpio 990 972 -18
data_extract_all 750 727 -23
get_header_tar 1631 1576 -55
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/6 up/down: 17/-105) Total: -88 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libunarchive/data_extract_all.c')
| -rw-r--r-- | archival/libunarchive/data_extract_all.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index 874d37d..58b0533 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c @@ -127,13 +127,13 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) uid_t uid = file_header->uid; gid_t gid = file_header->gid; - if (file_header->uname) { + if (file_header->tar__uname) { //TODO: cache last name/id pair? - struct passwd *pwd = getpwnam(file_header->uname); + struct passwd *pwd = getpwnam(file_header->tar__uname); if (pwd) uid = pwd->pw_uid; } - if (file_header->gname) { - struct group *grp = getgrnam(file_header->gname); + if (file_header->tar__gname) { + struct group *grp = getgrnam(file_header->tar__gname); if (grp) gid = grp->gr_gid; } /* GNU tar 1.15.1 uses chown, not lchown */ |