Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

libunarchive: fix build failure with !FEATURE_TAR_UNAME_GNAME

Browse Source 
We can't use C if(...) with ENABLE_FEATURE_TAR_UNAME_GNAME because it
relies on conditional members in the file_header_t structure:

archival/libunarchive/data_extract_all.c: In function ‘data_extract_all’:
archival/libunarchive/data_extract_all.c:123: error: ‘file_header_t’ has no member named ‘uname’
archival/libunarchive/data_extract_all.c:124: error: ‘file_header_t’ has no member named ‘uname’
archival/libunarchive/data_extract_all.c:127: error: ‘file_header_t’ has no member named ‘gname’
archival/libunarchive/data_extract_all.c:128: error: ‘file_header_t’ has no member named ‘gname’
make[1]: *** [archival/libunarchive/data_extract_all.o] Error 1

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-05-05 07:00:27 -04:00
parent 76f5e38c82
commit 4f239b1bb4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archival/libunarchive/data_extract_all.c
View File

@ -114,9 +114,8 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
} }
if (!(archive_handle->ah_flags & ARCHIVE_NOPRESERVE_OWN)) { if (!(archive_handle->ah_flags & ARCHIVE_NOPRESERVE_OWN)) {
if (ENABLE_FEATURE_TAR_UNAME_GNAME #if ENABLE_FEATURE_TAR_UNAME_GNAME
&& !(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER) if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) {
) {
uid_t uid = file_header->uid; uid_t uid = file_header->uid;
gid_t gid = file_header->gid; gid_t gid = file_header->gid;
@ -129,10 +128,10 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
if (grp) gid = grp->gr_gid; if (grp) gid = grp->gr_gid;
} }
lchown(file_header->name, uid, gid); lchown(file_header->name, uid, gid);
} else { } else
#endif
lchown(file_header->name, file_header->uid, file_header->gid); lchown(file_header->name, file_header->uid, file_header->gid);
} }
}
if ((file_header->mode & S_IFMT) != S_IFLNK) { if ((file_header->mode & S_IFMT) != S_IFLNK) {
/* uclibc has no lchmod, glibc is even stranger - /* uclibc has no lchmod, glibc is even stranger -
* it has lchmod which seems to do nothing! * it has lchmod which seems to do nothing!