aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2003-09-12 06:49:09 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2003-09-12 06:49:09 +0000
commitbeb3bbd991c6c4c988763af7d1a95618094097d2 (patch)
tree6fea3794ece32493ed6f41e39e60ccd5603fbcf3
parentef91bf67ed675cd6de2cc78acd930059fbefa375 (diff)
downloadbusybox-w32-beb3bbd991c6c4c988763af7d1a95618094097d2.tar.gz
busybox-w32-beb3bbd991c6c4c988763af7d1a95618094097d2.tar.bz2
busybox-w32-beb3bbd991c6c4c988763af7d1a95618094097d2.zip
Fix handling of hardlinks when OLDGNU and GNU extensions arent enabled.
-rw-r--r--archival/libunarchive/get_header_tar.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index b66bd322b..cf5ac6b62 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -53,7 +53,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
53 } tar; 53 } tar;
54 long sum = 0; 54 long sum = 0;
55 long i; 55 long i;
56 char *tmp;
57 56
58 /* Align header */ 57 /* Align header */
59 data_align(archive_handle, 512); 58 data_align(archive_handle, 512);
@@ -117,7 +116,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
117 file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) + 116 file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
118 strtol(tar.formated.devminor, NULL, 8)); 117 strtol(tar.formated.devminor, NULL, 8));
119 118
120#if defined CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY || defined CONFIG_FEATURE_TAR_GNU_EXTENSIONS
121 /* Fix mode, used by the old format */ 119 /* Fix mode, used by the old format */
122 switch (tar.formated.typeflag) { 120 switch (tar.formated.typeflag) {
123# ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 121# ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
@@ -176,7 +174,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
176 bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag); 174 bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
177# endif 175# endif
178 } 176 }
179#endif
180 177
181 if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) { 178 if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
182 archive_handle->action_header(archive_handle->file_header); 179 archive_handle->action_header(archive_handle->file_header);