[patch] archival/libunarchive/data_extract_all.c

[Cristian Ionescu-Idbohrn]

Doesn't compile:

  CC      archival/libunarchive/data_extract_all.o
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

Looks like the problem was introduced here:

--- data_extract_all.c  (revision 23704)
+++ data_extract_all.c  (revision 26172)

Is this patch a possible solution to the problem?

--- busybox-svn/archival/libunarchive/data_extract_all.c.~1~	2009-04-21 08:35:20.000000000 +0200
+++ busybox-svn/archival/libunarchive/data_extract_all.c	2009-05-05 12:32:38.000000000 +0200
@@ -114,9 +114,8 @@ void FAST_FUNC data_extract_all(archive_
 	}

 	if (!(archive_handle->ah_flags & ARCHIVE_NOPRESERVE_OWN)) {
-		if (ENABLE_FEATURE_TAR_UNAME_GNAME
-		 && !(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)
-		) {
+#if ENABLE_FEATURE_TAR_UNAME_GNAME
+		if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) {
 			uid_t uid = file_header->uid;
 			gid_t gid = file_header->gid;

@@ -129,7 +128,9 @@ void FAST_FUNC data_extract_all(archive_
 				if (grp) gid = grp->gr_gid;
 			}
 			lchown(file_header->name, uid, gid);
-		} else {
+		} else
+#endif
+		{
 			lchown(file_header->name, file_header->uid, file_header->gid);
 		}
 	}


Cheers,

-- 
Cristian