diff options
author | Tim Riker <tim@rikers.org> | 2006-01-25 00:08:53 +0000 |
---|---|---|
committer | Tim Riker <tim@rikers.org> | 2006-01-25 00:08:53 +0000 |
commit | c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4 (patch) | |
tree | 5f329b7d0c7f20ecced0dc7581a9ba6dc720d965 /archival | |
parent | f64ff682a3d58dbb627e760e6fe1ec21d9ccdf61 (diff) | |
download | busybox-w32-c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4.tar.gz busybox-w32-c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4.tar.bz2 busybox-w32-c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4.zip |
just whitespace
Diffstat (limited to 'archival')
-rw-r--r-- | archival/Config.in | 20 | ||||
-rw-r--r-- | archival/ar.c | 4 | ||||
-rw-r--r-- | archival/dpkg.c | 22 | ||||
-rw-r--r-- | archival/gzip.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 6 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unlzma.c | 10 | ||||
-rw-r--r-- | archival/libunarchive/get_header_ar.c | 20 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 2 | ||||
-rw-r--r-- | archival/rpm.c | 2 | ||||
-rw-r--r-- | archival/tar.c | 14 | ||||
-rw-r--r-- | archival/unzip.c | 4 |
11 files changed, 53 insertions, 53 deletions
diff --git a/archival/Config.in b/archival/Config.in index e7d5debb0..7810c354d 100644 --- a/archival/Config.in +++ b/archival/Config.in | |||
@@ -47,10 +47,10 @@ config CONFIG_BUNZIP2 | |||
47 | is generally considerably better than that achieved by more | 47 | is generally considerably better than that achieved by more |
48 | conventional LZ77/LZ78-based compressors, and approaches the | 48 | conventional LZ77/LZ78-based compressors, and approaches the |
49 | performance of the PPM family of statistical compressors. | 49 | performance of the PPM family of statistical compressors. |
50 | 50 | ||
51 | The BusyBox bunzip2 applet is limited to de-compression only. | 51 | The BusyBox bunzip2 applet is limited to de-compression only. |
52 | On an x86 system, this applet adds about 11K. | 52 | On an x86 system, this applet adds about 11K. |
53 | 53 | ||
54 | Unless you have a specific application which requires bunzip2, you | 54 | Unless you have a specific application which requires bunzip2, you |
55 | should probably say N here. | 55 | should probably say N here. |
56 | 56 | ||
@@ -73,7 +73,7 @@ config CONFIG_DPKG | |||
73 | default n | 73 | default n |
74 | help | 74 | help |
75 | dpkg is a medium-level tool to install, build, remove and manage Debian packages. | 75 | dpkg is a medium-level tool to install, build, remove and manage Debian packages. |
76 | 76 | ||
77 | This implementation of dpkg has a number of limitations, you should use the | 77 | This implementation of dpkg has a number of limitations, you should use the |
78 | official dpkg if possible. | 78 | official dpkg if possible. |
79 | 79 | ||
@@ -82,9 +82,9 @@ config CONFIG_DPKG_DEB | |||
82 | default n | 82 | default n |
83 | help | 83 | help |
84 | dpkg-deb packs, unpacks and provides information about Debian archives. | 84 | dpkg-deb packs, unpacks and provides information about Debian archives. |
85 | 85 | ||
86 | This implementation of dpkg-deb cannot pack archives. | 86 | This implementation of dpkg-deb cannot pack archives. |
87 | 87 | ||
88 | Unless you have a specific application which requires dpkg-deb, you should | 88 | Unless you have a specific application which requires dpkg-deb, you should |
89 | probably say N here. | 89 | probably say N here. |
90 | 90 | ||
@@ -228,10 +228,10 @@ config CONFIG_UNLZMA | |||
228 | compression algorithm, and range coding. Compression | 228 | compression algorithm, and range coding. Compression |
229 | is generally considerably better than that achieved by the bzip2 | 229 | is generally considerably better than that achieved by the bzip2 |
230 | compressors. | 230 | compressors. |
231 | 231 | ||
232 | The BusyBox unlzma applet is limited to de-compression only. | 232 | The BusyBox unlzma applet is limited to de-compression only. |
233 | On an x86 system, this applet adds about 4K. | 233 | On an x86 system, this applet adds about 4K. |
234 | 234 | ||
235 | Unless you have a specific application which requires unlzma, you | 235 | Unless you have a specific application which requires unlzma, you |
236 | should probably say N here. | 236 | should probably say N here. |
237 | 237 | ||
@@ -272,7 +272,7 @@ config CONFIG_FEATURE_DEB_TAR_GZ | |||
272 | depends on CONFIG_DPKG || CONFIG_DPKG_DEB | 272 | depends on CONFIG_DPKG || CONFIG_DPKG_DEB |
273 | help | 273 | help |
274 | This is the default compression method inside the debian ar file. | 274 | This is the default compression method inside the debian ar file. |
275 | 275 | ||
276 | If you want compatibility with standard .deb's you should say yes here. | 276 | If you want compatibility with standard .deb's you should say yes here. |
277 | 277 | ||
278 | config CONFIG_FEATURE_DEB_TAR_BZ2 | 278 | config CONFIG_FEATURE_DEB_TAR_BZ2 |
@@ -282,7 +282,7 @@ config CONFIG_FEATURE_DEB_TAR_BZ2 | |||
282 | help | 282 | help |
283 | This allows dpkg and dpkg-deb to extract deb's that are compressed internally | 283 | This allows dpkg and dpkg-deb to extract deb's that are compressed internally |
284 | with bzip2 instead of gzip. | 284 | with bzip2 instead of gzip. |
285 | 285 | ||
286 | You only want this if you are creating your own custom debian packages that | 286 | You only want this if you are creating your own custom debian packages that |
287 | use an internal control.tar.bz2 or data.tar.bz2. | 287 | use an internal control.tar.bz2 or data.tar.bz2. |
288 | 288 | ||
@@ -293,7 +293,7 @@ config CONFIG_FEATURE_DEB_TAR_LZMA | |||
293 | help | 293 | help |
294 | This allows dpkg and dpkg-deb to extract deb's that are compressed | 294 | This allows dpkg and dpkg-deb to extract deb's that are compressed |
295 | internally with lzma instead of gzip. | 295 | internally with lzma instead of gzip. |
296 | 296 | ||
297 | You only want this if you are creating your own custom debian | 297 | You only want this if you are creating your own custom debian |
298 | packages that use an internal control.tar.lzma or data.tar.lzma. | 298 | packages that use an internal control.tar.lzma or data.tar.lzma. |
299 | 299 | ||
diff --git a/archival/ar.c b/archival/ar.c index 983b5ae2c..05cb231aa 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
@@ -61,12 +61,12 @@ extern int ar_main(int argc, char **argv) | |||
61 | { | 61 | { |
62 | archive_handle_t *archive_handle; | 62 | archive_handle_t *archive_handle; |
63 | unsigned long opt; | 63 | unsigned long opt; |
64 | static const char msg_unsupported_err[] = | 64 | static const char msg_unsupported_err[] = |
65 | "Archive %s not supported. Install binutils 'ar'."; | 65 | "Archive %s not supported. Install binutils 'ar'."; |
66 | char magic[8]; | 66 | char magic[8]; |
67 | 67 | ||
68 | archive_handle = init_handle(); | 68 | archive_handle = init_handle(); |
69 | 69 | ||
70 | /* Prepend '-' to the first argument if required */ | 70 | /* Prepend '-' to the first argument if required */ |
71 | bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt"; | 71 | bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt"; |
72 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); | 72 | opt = bb_getopt_ulflags(argc, argv, "ptxovcr"); |
diff --git a/archival/dpkg.c b/archival/dpkg.c index 5f9f3a76b..7ed17d711 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -850,7 +850,7 @@ static void write_status_file(deb_file_t **deb_file) | |||
850 | } | 850 | } |
851 | 851 | ||
852 | tmp_string += 8; | 852 | tmp_string += 8; |
853 | tmp_string += strspn(tmp_string, " \n\t"); | 853 | tmp_string += strspn(tmp_string, " \n\t"); |
854 | package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); | 854 | package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); |
855 | write_flag = FALSE; | 855 | write_flag = FALSE; |
856 | tmp_string = strstr(control_buffer, "Status:"); | 856 | tmp_string = strstr(control_buffer, "Status:"); |
@@ -989,8 +989,8 @@ static int package_satisfies_dependency(int package, int depend_type) | |||
989 | return 0; | 989 | return 0; |
990 | 990 | ||
991 | switch (depend_type) { | 991 | switch (depend_type) { |
992 | case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); | 992 | case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); |
993 | case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); | 993 | case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); |
994 | } | 994 | } |
995 | return 0; | 995 | return 0; |
996 | } | 996 | } |
@@ -1078,7 +1078,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) | |||
1078 | } | 1078 | } |
1079 | } | 1079 | } |
1080 | i++; | 1080 | i++; |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | 1083 | ||
1084 | /* Check dependendcies */ | 1084 | /* Check dependendcies */ |
@@ -1114,8 +1114,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) | |||
1114 | * things which are broken but unrelated to the | 1114 | * things which are broken but unrelated to the |
1115 | * packages that are currently being installed | 1115 | * packages that are currently being installed |
1116 | */ | 1116 | */ |
1117 | if (state_status == search_name_hashtable("installed")) | 1117 | if (state_status == search_name_hashtable("installed")) |
1118 | continue; | 1118 | continue; |
1119 | #endif | 1119 | #endif |
1120 | 1120 | ||
1121 | /* This code is tested only for EDGE_DEPENDS, since I | 1121 | /* This code is tested only for EDGE_DEPENDS, since I |
@@ -1125,13 +1125,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) | |||
1125 | for (j = 0; j < package_node->num_of_edges; j++) { | 1125 | for (j = 0; j < package_node->num_of_edges; j++) { |
1126 | const edge_t *package_edge = package_node->edge[j]; | 1126 | const edge_t *package_edge = package_node->edge[j]; |
1127 | unsigned int package_num; | 1127 | unsigned int package_num; |
1128 | 1128 | ||
1129 | if ( package_edge->type == EDGE_OR_PRE_DEPENDS || | 1129 | if ( package_edge->type == EDGE_OR_PRE_DEPENDS || |
1130 | package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */ | 1130 | package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */ |
1131 | number_of_alternatives = package_edge->version; | 1131 | number_of_alternatives = package_edge->version; |
1132 | root_of_alternatives = package_edge; | 1132 | root_of_alternatives = package_edge; |
1133 | continue; | 1133 | continue; |
1134 | } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */ | 1134 | } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */ |
1135 | number_of_alternatives = 1; | 1135 | number_of_alternatives = 1; |
1136 | root_of_alternatives = NULL; | 1136 | root_of_alternatives = NULL; |
1137 | } | 1137 | } |
@@ -1329,7 +1329,7 @@ static void free_array(char **array) | |||
1329 | */ | 1329 | */ |
1330 | static void list_packages(void) | 1330 | static void list_packages(void) |
1331 | { | 1331 | { |
1332 | int i; | 1332 | int i; |
1333 | 1333 | ||
1334 | printf(" Name Version\n"); | 1334 | printf(" Name Version\n"); |
1335 | printf("+++-==============-==============\n"); | 1335 | printf("+++-==============-==============\n"); |
@@ -1715,7 +1715,7 @@ int dpkg_main(int argc, char **argv) | |||
1715 | 1715 | ||
1716 | if (package_num == -1) { | 1716 | if (package_num == -1) { |
1717 | bb_error_msg("Invalid control file in %s", argv[optind]); | 1717 | bb_error_msg("Invalid control file in %s", argv[optind]); |
1718 | optind++; | 1718 | optind++; |
1719 | continue; | 1719 | continue; |
1720 | } | 1720 | } |
1721 | deb_file[deb_count]->package = (unsigned int) package_num; | 1721 | deb_file[deb_count]->package = (unsigned int) package_num; |
diff --git a/archival/gzip.c b/archival/gzip.c index 3aa077fbd..1f268dd26 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -1031,7 +1031,7 @@ static void fill_window(void) | |||
1031 | */ | 1031 | */ |
1032 | #define FLUSH_BLOCK(eof) \ | 1032 | #define FLUSH_BLOCK(eof) \ |
1033 | flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ | 1033 | flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ |
1034 | (char*)NULL, (long)strstart - block_start, (eof)) | 1034 | (char*)NULL, (long)strstart - block_start, (eof)) |
1035 | 1035 | ||
1036 | /* =========================================================================== | 1036 | /* =========================================================================== |
1037 | * Same as above, but achieves better compression. We use a lazy | 1037 | * Same as above, but achieves better compression. We use a lazy |
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 597ec85a3..af3731b15 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c | |||
@@ -51,9 +51,9 @@ | |||
51 | 51 | ||
52 | /* Constants for Huffman coding */ | 52 | /* Constants for Huffman coding */ |
53 | #define MAX_GROUPS 6 | 53 | #define MAX_GROUPS 6 |
54 | #define GROUP_SIZE 50 /* 64 would have been more efficient */ | 54 | #define GROUP_SIZE 50 /* 64 would have been more efficient */ |
55 | #define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */ | 55 | #define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */ |
56 | #define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */ | 56 | #define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */ |
57 | #define SYMBOL_RUNA 0 | 57 | #define SYMBOL_RUNA 0 |
58 | #define SYMBOL_RUNB 1 | 58 | #define SYMBOL_RUNB 1 |
59 | 59 | ||
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c index 977cb48d0..62811ddfc 100644 --- a/archival/libunarchive/decompress_unlzma.c +++ b/archival/libunarchive/decompress_unlzma.c | |||
@@ -50,9 +50,9 @@ typedef struct { | |||
50 | #define LZMA_LEN_CHOICE_2 (LZMA_LEN_CHOICE + 1) | 50 | #define LZMA_LEN_CHOICE_2 (LZMA_LEN_CHOICE + 1) |
51 | #define LZMA_LEN_LOW (LZMA_LEN_CHOICE_2 + 1) | 51 | #define LZMA_LEN_LOW (LZMA_LEN_CHOICE_2 + 1) |
52 | #define LZMA_LEN_MID (LZMA_LEN_LOW \ | 52 | #define LZMA_LEN_MID (LZMA_LEN_LOW \ |
53 | + (1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_LOW_BITS))) | 53 | + (1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_LOW_BITS))) |
54 | #define LZMA_LEN_HIGH (LZMA_LEN_MID \ | 54 | #define LZMA_LEN_HIGH (LZMA_LEN_MID \ |
55 | +(1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_MID_BITS))) | 55 | +(1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_MID_BITS))) |
56 | #define LZMA_NUM_LEN_PROBS (LZMA_LEN_HIGH + (1 << LZMA_LEN_NUM_HIGH_BITS)) | 56 | #define LZMA_NUM_LEN_PROBS (LZMA_LEN_HIGH + (1 << LZMA_LEN_NUM_HIGH_BITS)) |
57 | 57 | ||
58 | #define LZMA_NUM_STATES 12 | 58 | #define LZMA_NUM_STATES 12 |
@@ -76,11 +76,11 @@ typedef struct { | |||
76 | #define LZMA_IS_REP_G2 (LZMA_IS_REP_G1 + LZMA_NUM_STATES) | 76 | #define LZMA_IS_REP_G2 (LZMA_IS_REP_G1 + LZMA_NUM_STATES) |
77 | #define LZMA_IS_REP_0_LONG (LZMA_IS_REP_G2 + LZMA_NUM_STATES) | 77 | #define LZMA_IS_REP_0_LONG (LZMA_IS_REP_G2 + LZMA_NUM_STATES) |
78 | #define LZMA_POS_SLOT (LZMA_IS_REP_0_LONG \ | 78 | #define LZMA_POS_SLOT (LZMA_IS_REP_0_LONG \ |
79 | + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX)) | 79 | + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX)) |
80 | #define LZMA_SPEC_POS (LZMA_POS_SLOT \ | 80 | #define LZMA_SPEC_POS (LZMA_POS_SLOT \ |
81 | +(LZMA_NUM_LEN_TO_POS_STATES << LZMA_NUM_POS_SLOT_BITS)) | 81 | +(LZMA_NUM_LEN_TO_POS_STATES << LZMA_NUM_POS_SLOT_BITS)) |
82 | #define LZMA_ALIGN (LZMA_SPEC_POS \ | 82 | #define LZMA_ALIGN (LZMA_SPEC_POS \ |
83 | + LZMA_NUM_FULL_DISTANCES - LZMA_END_POS_MODEL_INDEX) | 83 | + LZMA_NUM_FULL_DISTANCES - LZMA_END_POS_MODEL_INDEX) |
84 | #define LZMA_LEN_CODER (LZMA_ALIGN + (1 << LZMA_NUM_ALIGN_BITS)) | 84 | #define LZMA_LEN_CODER (LZMA_ALIGN + (1 << LZMA_NUM_ALIGN_BITS)) |
85 | #define LZMA_REP_LEN_CODER (LZMA_LEN_CODER + LZMA_NUM_LEN_PROBS) | 85 | #define LZMA_REP_LEN_CODER (LZMA_LEN_CODER + LZMA_NUM_LEN_PROBS) |
86 | #define LZMA_LITERAL (LZMA_REP_LEN_CODER + LZMA_NUM_LEN_PROBS) | 86 | #define LZMA_LITERAL (LZMA_REP_LEN_CODER + LZMA_NUM_LEN_PROBS) |
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c index ebb6f8cbe..e3a71951f 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libunarchive/get_header_ar.c | |||
@@ -26,15 +26,15 @@ extern char get_header_ar(archive_handle_t *archive_handle) | |||
26 | file_header_t *typed = archive_handle->file_header; | 26 | file_header_t *typed = archive_handle->file_header; |
27 | union { | 27 | union { |
28 | char raw[60]; | 28 | char raw[60]; |
29 | struct { | 29 | struct { |
30 | char name[16]; | 30 | char name[16]; |
31 | char date[12]; | 31 | char date[12]; |
32 | char uid[6]; | 32 | char uid[6]; |
33 | char gid[6]; | 33 | char gid[6]; |
34 | char mode[8]; | 34 | char mode[8]; |
35 | char size[10]; | 35 | char size[10]; |
36 | char magic[2]; | 36 | char magic[2]; |
37 | } formated; | 37 | } formated; |
38 | } ar; | 38 | } ar; |
39 | #ifdef CONFIG_FEATURE_AR_LONG_FILENAMES | 39 | #ifdef CONFIG_FEATURE_AR_LONG_FILENAMES |
40 | static char *ar_long_names; | 40 | static char *ar_long_names; |
@@ -102,7 +102,7 @@ extern char get_header_ar(archive_handle_t *archive_handle) | |||
102 | #endif | 102 | #endif |
103 | } else { | 103 | } else { |
104 | /* short filenames */ | 104 | /* short filenames */ |
105 | typed->name = bb_xstrndup(ar.formated.name, 16); | 105 | typed->name = bb_xstrndup(ar.formated.name, 16); |
106 | } | 106 | } |
107 | 107 | ||
108 | typed->name[strcspn(typed->name, " /")] = '\0'; | 108 | typed->name[strcspn(typed->name, " /")] = '\0'; |
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 659b75d9b..26dfad55f 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * References: | 20 | * References: |
21 | * GNU tar and star man pages, | 21 | * GNU tar and star man pages, |
22 | * Opengroup's ustar interchange format, | 22 | * Opengroup's ustar interchange format, |
23 | * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html | 23 | * http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <stdio.h> | 26 | #include <stdio.h> |
diff --git a/archival/rpm.c b/archival/rpm.c index 32d506de0..a80f799a6 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #define RPM_STRING_ARRAY_TYPE 8 | 43 | #define RPM_STRING_ARRAY_TYPE 8 |
44 | #define RPM_I18NSTRING_TYPE 9 | 44 | #define RPM_I18NSTRING_TYPE 9 |
45 | 45 | ||
46 | #define RPMTAG_NAME 1000 | 46 | #define RPMTAG_NAME 1000 |
47 | #define RPMTAG_VERSION 1001 | 47 | #define RPMTAG_VERSION 1001 |
48 | #define RPMTAG_RELEASE 1002 | 48 | #define RPMTAG_RELEASE 1002 |
49 | #define RPMTAG_SUMMARY 1004 | 49 | #define RPMTAG_SUMMARY 1004 |
diff --git a/archival/tar.c b/archival/tar.c index a4b13b5de..ab4d1f266 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -91,7 +91,7 @@ struct HardLinkInfo { | |||
91 | struct TarBallInfo { | 91 | struct TarBallInfo { |
92 | char *fileName; /* File name of the tarball */ | 92 | char *fileName; /* File name of the tarball */ |
93 | int tarFd; /* Open-for-write file descriptor | 93 | int tarFd; /* Open-for-write file descriptor |
94 | for the tarball */ | 94 | for the tarball */ |
95 | struct stat statBuf; /* Stat info for the tarball, letting | 95 | struct stat statBuf; /* Stat info for the tarball, letting |
96 | us know the inode and device that the | 96 | us know the inode and device that the |
97 | tarball lives, so we can avoid trying | 97 | tarball lives, so we can avoid trying |
@@ -569,7 +569,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) | |||
569 | 569 | ||
570 | /* do the decompression, and cleanup */ | 570 | /* do the decompression, and cleanup */ |
571 | if (bb_xread_char(archive_handle->src_fd) != 0x1f || | 571 | if (bb_xread_char(archive_handle->src_fd) != 0x1f || |
572 | bb_xread_char(archive_handle->src_fd) != 0x9d) | 572 | bb_xread_char(archive_handle->src_fd) != 0x9d) |
573 | { | 573 | { |
574 | bb_error_msg_and_die("Invalid magic"); | 574 | bb_error_msg_and_die("Invalid magic"); |
575 | } | 575 | } |
@@ -699,7 +699,7 @@ static const struct option tar_long_options[] = { | |||
699 | # ifdef CONFIG_FEATURE_TAR_COMPRESS | 699 | # ifdef CONFIG_FEATURE_TAR_COMPRESS |
700 | { "compress", 0, NULL, 'Z' }, | 700 | { "compress", 0, NULL, 'Z' }, |
701 | # endif | 701 | # endif |
702 | { 0, 0, 0, 0 } | 702 | { 0, 0, 0, 0 } |
703 | }; | 703 | }; |
704 | #else | 704 | #else |
705 | #define tar_long_options 0 | 705 | #define tar_long_options 0 |
@@ -713,7 +713,7 @@ int tar_main(int argc, char **argv) | |||
713 | const char *tar_filename = "-"; | 713 | const char *tar_filename = "-"; |
714 | unsigned long opt; | 714 | unsigned long opt; |
715 | llist_t *excludes = NULL; | 715 | llist_t *excludes = NULL; |
716 | 716 | ||
717 | /* Initialise default values */ | 717 | /* Initialise default values */ |
718 | tar_handle = init_handle(); | 718 | tar_handle = init_handle(); |
719 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; | 719 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; |
@@ -743,7 +743,7 @@ int tar_main(int argc, char **argv) | |||
743 | } | 743 | } |
744 | if((opt & CTX_EXTRACT) && tar_handle->action_data != data_extract_to_stdout) | 744 | if((opt & CTX_EXTRACT) && tar_handle->action_data != data_extract_to_stdout) |
745 | tar_handle->action_data = data_extract_all; | 745 | tar_handle->action_data = data_extract_all; |
746 | 746 | ||
747 | if (opt & TAR_OPT_2STDOUT) | 747 | if (opt & TAR_OPT_2STDOUT) |
748 | tar_handle->action_data = data_extract_to_stdout; | 748 | tar_handle->action_data = data_extract_to_stdout; |
749 | 749 | ||
@@ -843,9 +843,9 @@ int tar_main(int argc, char **argv) | |||
843 | int zipMode = 0; | 843 | int zipMode = 0; |
844 | 844 | ||
845 | if (ENABLE_FEATURE_TAR_GZIP && get_header_ptr == get_header_tar_gz) | 845 | if (ENABLE_FEATURE_TAR_GZIP && get_header_ptr == get_header_tar_gz) |
846 | zipMode = 1; | 846 | zipMode = 1; |
847 | if (ENABLE_FEATURE_TAR_BZIP2 && get_header_ptr == get_header_tar_bz2) | 847 | if (ENABLE_FEATURE_TAR_BZIP2 && get_header_ptr == get_header_tar_bz2) |
848 | zipMode = 2; | 848 | zipMode = 2; |
849 | 849 | ||
850 | if ((tar_handle->action_header == header_list) || | 850 | if ((tar_handle->action_header == header_list) || |
851 | (tar_handle->action_header == header_verbose_list)) | 851 | (tar_handle->action_header == header_verbose_list)) |
diff --git a/archival/unzip.c b/archival/unzip.c index caac716cc..f602db12d 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -66,8 +66,8 @@ typedef union { | |||
66 | unsigned short method; /* 4-5 */ | 66 | unsigned short method; /* 4-5 */ |
67 | unsigned short modtime; /* 6-7 */ | 67 | unsigned short modtime; /* 6-7 */ |
68 | unsigned short moddate; /* 8-9 */ | 68 | unsigned short moddate; /* 8-9 */ |
69 | unsigned int crc32 ATTRIBUTE_PACKED; /* 10-13 */ | 69 | unsigned int crc32 ATTRIBUTE_PACKED; /* 10-13 */ |
70 | unsigned int cmpsize ATTRIBUTE_PACKED; /* 14-17 */ | 70 | unsigned int cmpsize ATTRIBUTE_PACKED; /* 14-17 */ |
71 | unsigned int ucmpsize ATTRIBUTE_PACKED; /* 18-21 */ | 71 | unsigned int ucmpsize ATTRIBUTE_PACKED; /* 18-21 */ |
72 | unsigned short filename_len; /* 22-23 */ | 72 | unsigned short filename_len; /* 22-23 */ |
73 | unsigned short extra_len; /* 24-25 */ | 73 | unsigned short extra_len; /* 24-25 */ |