annotate sources/patches/busybox-fixtar.patch @ 243:be703e9510bb

Added tag 0.3.0 for changeset c3d2fd8b45cf
author Rob Landley <rob@landley.net>
date Fri, 02 Nov 2007 02:19:32 -0500
parents 11e99cacb09e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
219
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 --- busybox-1.2.2/archival/libunarchive/get_header_tar.c 2006-07-28 17:53:44.000000000 -0500
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 +++ busybox-new/archival/libunarchive/get_header_tar.c 2007-09-17 21:50:44.000000000 -0500
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
3 @@ -51,6 +51,7 @@
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 long sum = 0;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 long i;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 static int end = 0;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 + int skippy = 0;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
8
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 /* Align header */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 data_align(archive_handle, 512);
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 @@ -183,10 +184,12 @@
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 case 'N': /* Old GNU for names > 100 characters */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 case 'S': /* Sparse file */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
14 case 'V': /* Volume header */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 + bb_error_msg("Ignoring extension type %c", tar.formated.typeflag);
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 + break;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
17 #endif
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 case 'g': /* pax global header */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
19 case 'x': /* pax extended header */
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
20 - bb_error_msg("Ignoring extension type %c", tar.formated.typeflag);
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 + skippy = 1;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
22 break;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
23 default:
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
24 bb_error_msg("Unknown typeflag: 0x%x", tar.formated.typeflag);
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
25 @@ -199,7 +202,7 @@
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
26 }
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
27 }
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
28
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
29 - if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
30 + if (!skippy && archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
31 archive_handle->action_header(archive_handle->file_header);
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
32 archive_handle->flags |= ARCHIVE_EXTRACT_QUIET;
11e99cacb09e Fix the old busybox tar so it can extract linux kernel tarballs.
Rob Landley <rob@landley.net>
parents:
diff changeset
33 archive_handle->action_data(archive_handle);