diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
commit | aff114c33d2b8879233fa513e6d760d0ef99b632 (patch) | |
tree | 101230a8bd16a03319acc4b9b5fb33c33fb58672 /archival/libunarchive | |
parent | 4c8b0dd97385b820e28bb8cb2d08ef3bd194a16a (diff) | |
download | busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.gz busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.bz2 busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.zip |
Larry Doolittle writes:
This is a bulk spelling fix patch against busybox-1.00-pre10.
If anyone gets a corrupted copy (and cares), let me know and
I will make alternate arrangements.
Erik - please apply.
Authors - please check that I didn't corrupt any meaning.
Package importers - see if any of these changes should be
passed to the upstream authors.
I glossed over lots of sloppy capitalizations, missing apostrophes,
mixed American/British spellings, and German-style compound words.
What is "pretect redefined for test" in cmdedit.c?
Good luck on the 1.00 release!
- Larry
Diffstat (limited to 'archival/libunarchive')
-rw-r--r-- | archival/libunarchive/data_extract_all.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 36 | ||||
-rw-r--r-- | archival/libunarchive/decompress_uncompress.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unzip.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index a9a3a93d8..52edaa182 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c | |||
@@ -66,7 +66,7 @@ extern void data_extract_all(archive_handle_t *archive_handle) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | /* Handle hard links seperately | 69 | /* Handle hard links separately |
70 | * We identified hard links as regular files of size 0 with a symlink */ | 70 | * We identified hard links as regular files of size 0 with a symlink */ |
71 | if (S_ISREG(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) { | 71 | if (S_ISREG(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) { |
72 | /* hard link */ | 72 | /* hard link */ |
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index af165336e..4b8ceb804 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c | |||
@@ -13,7 +13,7 @@ | |||
13 | /* | 13 | /* |
14 | Size and speed optimizations by Manuel Novoa III (mjn3@codepoet.org). | 14 | Size and speed optimizations by Manuel Novoa III (mjn3@codepoet.org). |
15 | 15 | ||
16 | More efficient reading of huffman codes, a streamlined read_bunzip() | 16 | More efficient reading of Huffman codes, a streamlined read_bunzip() |
17 | function, and various other tweaks. In (limited) tests, approximately | 17 | function, and various other tweaks. In (limited) tests, approximately |
18 | 20% faster than bzcat on x86 and about 10% faster on arm. | 18 | 20% faster than bzcat on x86 and about 10% faster on arm. |
19 | 19 | ||
@@ -49,10 +49,10 @@ | |||
49 | 49 | ||
50 | #include "libbb.h" | 50 | #include "libbb.h" |
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 |
@@ -70,7 +70,7 @@ | |||
70 | /* Other housekeeping constants */ | 70 | /* Other housekeeping constants */ |
71 | #define IOBUF_SIZE 4096 | 71 | #define IOBUF_SIZE 4096 |
72 | 72 | ||
73 | /* This is what we know about each huffman coding group */ | 73 | /* This is what we know about each Huffman coding group */ |
74 | struct group_data { | 74 | struct group_data { |
75 | /* We have an extra slot at the end of limit[] for a sentinal value. */ | 75 | /* We have an extra slot at the end of limit[] for a sentinal value. */ |
76 | int limit[MAX_HUFCODE_BITS+1],base[MAX_HUFCODE_BITS],permute[MAX_SYMBOLS]; | 76 | int limit[MAX_HUFCODE_BITS+1],base[MAX_HUFCODE_BITS],permute[MAX_SYMBOLS]; |
@@ -92,7 +92,7 @@ typedef struct { | |||
92 | unsigned int *dbuf, dbufSize; | 92 | unsigned int *dbuf, dbufSize; |
93 | /* These things are a bit too big to go on the stack */ | 93 | /* These things are a bit too big to go on the stack */ |
94 | unsigned char selectors[32768]; /* nSelectors=15 bits */ | 94 | unsigned char selectors[32768]; /* nSelectors=15 bits */ |
95 | struct group_data groups[MAX_GROUPS]; /* huffman coding tables */ | 95 | struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */ |
96 | /* For I/O error handling */ | 96 | /* For I/O error handling */ |
97 | jmp_buf jmpbuf; | 97 | jmp_buf jmpbuf; |
98 | } bunzip_data; | 98 | } bunzip_data; |
@@ -172,10 +172,10 @@ static int get_next_block(bunzip_data *bd) | |||
172 | if(k&(1<<(15-j))) symToByte[symTotal++]=(16*i)+j; | 172 | if(k&(1<<(15-j))) symToByte[symTotal++]=(16*i)+j; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | /* How many different huffman coding groups does this block use? */ | 175 | /* How many different Huffman coding groups does this block use? */ |
176 | groupCount=get_bits(bd,3); | 176 | groupCount=get_bits(bd,3); |
177 | if (groupCount<2 || groupCount>MAX_GROUPS) return RETVAL_DATA_ERROR; | 177 | if (groupCount<2 || groupCount>MAX_GROUPS) return RETVAL_DATA_ERROR; |
178 | /* nSelectors: Every GROUP_SIZE many symbols we select a new huffman coding | 178 | /* nSelectors: Every GROUP_SIZE many symbols we select a new Huffman coding |
179 | group. Read in the group selector list, which is stored as MTF encoded | 179 | group. Read in the group selector list, which is stored as MTF encoded |
180 | bit runs. (MTF=Move To Front, as each value is used it's moved to the | 180 | bit runs. (MTF=Move To Front, as each value is used it's moved to the |
181 | start of the list.) */ | 181 | start of the list.) */ |
@@ -189,13 +189,13 @@ static int get_next_block(bunzip_data *bd) | |||
189 | for(;j;j--) mtfSymbol[j] = mtfSymbol[j-1]; | 189 | for(;j;j--) mtfSymbol[j] = mtfSymbol[j-1]; |
190 | mtfSymbol[0]=selectors[i]=uc; | 190 | mtfSymbol[0]=selectors[i]=uc; |
191 | } | 191 | } |
192 | /* Read the huffman coding tables for each group, which code for symTotal | 192 | /* Read the Huffman coding tables for each group, which code for symTotal |
193 | literal symbols, plus two run symbols (RUNA, RUNB) */ | 193 | literal symbols, plus two run symbols (RUNA, RUNB) */ |
194 | symCount=symTotal+2; | 194 | symCount=symTotal+2; |
195 | for (j=0; j<groupCount; j++) { | 195 | for (j=0; j<groupCount; j++) { |
196 | unsigned char length[MAX_SYMBOLS],temp[MAX_HUFCODE_BITS+1]; | 196 | unsigned char length[MAX_SYMBOLS],temp[MAX_HUFCODE_BITS+1]; |
197 | int minLen, maxLen, pp; | 197 | int minLen, maxLen, pp; |
198 | /* Read huffman code lengths for each symbol. They're stored in | 198 | /* Read Huffman code lengths for each symbol. They're stored in |
199 | a way similar to mtf; record a starting value for the first symbol, | 199 | a way similar to mtf; record a starting value for the first symbol, |
200 | and an offset from the previous value for everys symbol after that. | 200 | and an offset from the previous value for everys symbol after that. |
201 | (Subtracting 1 before the loop and then adding it back at the end is | 201 | (Subtracting 1 before the loop and then adding it back at the end is |
@@ -228,12 +228,12 @@ static int get_next_block(bunzip_data *bd) | |||
228 | } | 228 | } |
229 | /* Calculate permute[], base[], and limit[] tables from length[]. | 229 | /* Calculate permute[], base[], and limit[] tables from length[]. |
230 | * | 230 | * |
231 | * permute[] is the lookup table for converting huffman coded symbols | 231 | * permute[] is the lookup table for converting Huffman coded symbols |
232 | * into decoded symbols. base[] is the amount to subtract from the | 232 | * into decoded symbols. base[] is the amount to subtract from the |
233 | * value of a huffman symbol of a given length when using permute[]. | 233 | * value of a Huffman symbol of a given length when using permute[]. |
234 | * | 234 | * |
235 | * limit[] indicates the largest numerical value a symbol with a given | 235 | * limit[] indicates the largest numerical value a symbol with a given |
236 | * number of bits can have. This is how the huffman codes can vary in | 236 | * number of bits can have. This is how the Huffman codes can vary in |
237 | * length: each code with a value>limit[length] needs another bit. | 237 | * length: each code with a value>limit[length] needs another bit. |
238 | */ | 238 | */ |
239 | hufGroup=bd->groups+j; | 239 | hufGroup=bd->groups+j; |
@@ -275,7 +275,7 @@ static int get_next_block(bunzip_data *bd) | |||
275 | base[minLen]=0; | 275 | base[minLen]=0; |
276 | } | 276 | } |
277 | /* We've finished reading and digesting the block header. Now read this | 277 | /* We've finished reading and digesting the block header. Now read this |
278 | block's huffman coded symbols from the file and undo the huffman coding | 278 | block's Huffman coded symbols from the file and undo the Huffman coding |
279 | and run length encoding, saving the result into dbuf[dbufCount++]=uc */ | 279 | and run length encoding, saving the result into dbuf[dbufCount++]=uc */ |
280 | 280 | ||
281 | /* Initialize symbol occurrence counters and symbol Move To Front table */ | 281 | /* Initialize symbol occurrence counters and symbol Move To Front table */ |
@@ -286,7 +286,7 @@ static int get_next_block(bunzip_data *bd) | |||
286 | /* Loop through compressed symbols. */ | 286 | /* Loop through compressed symbols. */ |
287 | runPos=dbufCount=symCount=selector=0; | 287 | runPos=dbufCount=symCount=selector=0; |
288 | for(;;) { | 288 | for(;;) { |
289 | /* Determine which huffman coding group to use. */ | 289 | /* Determine which Huffman coding group to use. */ |
290 | if(!(symCount--)) { | 290 | if(!(symCount--)) { |
291 | symCount=GROUP_SIZE-1; | 291 | symCount=GROUP_SIZE-1; |
292 | if(selector>=nSelectors) return RETVAL_DATA_ERROR; | 292 | if(selector>=nSelectors) return RETVAL_DATA_ERROR; |
@@ -294,7 +294,7 @@ static int get_next_block(bunzip_data *bd) | |||
294 | base=hufGroup->base-1; | 294 | base=hufGroup->base-1; |
295 | limit=hufGroup->limit-1; | 295 | limit=hufGroup->limit-1; |
296 | } | 296 | } |
297 | /* Read next huffman-coded symbol. */ | 297 | /* Read next Huffman-coded symbol. */ |
298 | /* Note: It is far cheaper to read maxLen bits and back up than it is | 298 | /* Note: It is far cheaper to read maxLen bits and back up than it is |
299 | to read minLen bits and then an additional bit at a time, testing | 299 | to read minLen bits and then an additional bit at a time, testing |
300 | as we go. Because there is a trailing last block (with file CRC), | 300 | as we go. Because there is a trailing last block (with file CRC), |
@@ -383,7 +383,7 @@ got_huff_bits: | |||
383 | byteCount[uc]++; | 383 | byteCount[uc]++; |
384 | dbuf[dbufCount++] = (unsigned int)uc; | 384 | dbuf[dbufCount++] = (unsigned int)uc; |
385 | } | 385 | } |
386 | /* At this point, we've read all the huffman-coded symbols (and repeated | 386 | /* At this point, we've read all the Huffman-coded symbols (and repeated |
387 | runs) for this block from the input stream, and decoded them into the | 387 | runs) for this block from the input stream, and decoded them into the |
388 | intermediate buffer. There are dbufCount many decoded bytes in dbuf[]. | 388 | intermediate buffer. There are dbufCount many decoded bytes in dbuf[]. |
389 | Now undo the Burrows-Wheeler transform on dbuf. | 389 | Now undo the Burrows-Wheeler transform on dbuf. |
@@ -439,7 +439,7 @@ static int read_bunzip(bunzip_data *bd, char *outbuf, int len) | |||
439 | 439 | ||
440 | /* We will always have pending decoded data to write into the output | 440 | /* We will always have pending decoded data to write into the output |
441 | buffer unless this is the very first call (in which case we haven't | 441 | buffer unless this is the very first call (in which case we haven't |
442 | huffman-decoded a block into the intermediate buffer yet). */ | 442 | Huffman-decoded a block into the intermediate buffer yet). */ |
443 | 443 | ||
444 | if (bd->writeCopies) { | 444 | if (bd->writeCopies) { |
445 | /* Inside the loop, writeCopies means extra copies (beyond 1) */ | 445 | /* Inside the loop, writeCopies means extra copies (beyond 1) */ |
@@ -495,7 +495,7 @@ decode_next_byte: | |||
495 | } | 495 | } |
496 | } | 496 | } |
497 | 497 | ||
498 | /* Refill the intermediate buffer by huffman-decoding next block of input */ | 498 | /* Refill the intermediate buffer by Huffman-decoding next block of input */ |
499 | /* (previous is just a convenient unused temp variable here) */ | 499 | /* (previous is just a convenient unused temp variable here) */ |
500 | previous=get_next_block(bd); | 500 | previous=get_next_block(bd); |
501 | if(previous) { | 501 | if(previous) { |
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c index ddf293fd6..e39872cbe 100644 --- a/archival/libunarchive/decompress_uncompress.c +++ b/archival/libunarchive/decompress_uncompress.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <string.h> | 30 | #include <string.h> |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | 32 | ||
33 | /* Defailt input buffer size */ | 33 | /* Default input buffer size */ |
34 | #define IBUFSIZ 2048 | 34 | #define IBUFSIZ 2048 |
35 | 35 | ||
36 | /* Default output buffer size */ | 36 | /* Default output buffer size */ |
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index a436db191..35fcfeec8 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -892,7 +892,7 @@ static int inflate_get_next_window(void) | |||
892 | /* Doesnt get here */ | 892 | /* Doesnt get here */ |
893 | } | 893 | } |
894 | 894 | ||
895 | /* Initialise bytebuffer, be carefull not to overfill the buffer */ | 895 | /* Initialise bytebuffer, be careful not to overfill the buffer */ |
896 | extern void inflate_init(unsigned int bufsize) | 896 | extern void inflate_init(unsigned int bufsize) |
897 | { | 897 | { |
898 | /* Set the bytebuffer size, default is same as gunzip_wsize */ | 898 | /* Set the bytebuffer size, default is same as gunzip_wsize */ |
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index c6ebdae80..33f19c60a 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
15 | * | 15 | * |
16 | * FIXME: | 16 | * FIXME: |
17 | * In privelidged mode if uname and gname map to a uid amd gid then use the | 17 | * In privileged mode if uname and gname map to a uid and gid then use the |
18 | * mapped value instead of the uid/gid values in tar header | 18 | * mapped value instead of the uid/gid values in tar header |
19 | * | 19 | * |
20 | * References: | 20 | * References: |