[BusyBox-cvs] busybox/archival/libunarchive get_header_tar.c, 1.22, 1.23

Glenn McGrath bug1 at busybox.net
Fri Sep 12 06:49:12 UTC 2003


Update of /var/cvs/busybox/archival/libunarchive
In directory winder:/tmp/cvs-serv20657/archival/libunarchive

Modified Files:
	get_header_tar.c 
Log Message:
Fix handling of hardlinks when OLDGNU and GNU extensions arent enabled.


Index: get_header_tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- get_header_tar.c	12 Sep 2003 06:31:28 -0000	1.22
+++ get_header_tar.c	12 Sep 2003 06:49:09 -0000	1.23
@@ -53,7 +53,6 @@
 	} tar;
 	long sum = 0;
 	long i;
-	char *tmp;
 
 	/* Align header */
 	data_align(archive_handle, 512);
@@ -117,7 +116,6 @@
 	file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
 				 strtol(tar.formated.devminor, NULL, 8));
 
-#if defined CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY || defined CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 	/* Fix mode, used by the old format */
 	switch (tar.formated.typeflag) {
 # ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
@@ -176,7 +174,6 @@
 		bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
 # endif
 	}
-#endif
 
 	if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
 		archive_handle->action_header(archive_handle->file_header);




More information about the busybox-cvs mailing list