[BusyBox-cvs] busybox/archival/libunarchive data_extract_all.c, 1.19, 1.20 decompress_bunzip2.c, 1.12, 1.13 decompress_uncompress.c, 1.10, 1.11 decompress_unzip.c, 1.33, 1.34 get_header_tar.c, 1.36, 1.37

[Erik Andersen]

Update of /var/cvs/busybox/archival/libunarchive
In directory nail:/tmp/cvs-serv15466/archival/libunarchive

Modified Files:
	data_extract_all.c decompress_bunzip2.c 
	decompress_uncompress.c decompress_unzip.c get_header_tar.c 
Log Message:
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



Index: data_extract_all.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/data_extract_all.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/data_extract_all.c	15 Mar 2004 08:28:17 -0000	1.19
+++ b/data_extract_all.c	14 Apr 2004 17:51:08 -0000	1.20
@@ -66,7 +66,7 @@
 		}
 	}
 
-	/* Handle hard links seperately
+	/* Handle hard links separately
 	 * We identified hard links as regular files of size 0 with a symlink */
 	if (S_ISREG(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
 		/* hard link */

Index: get_header_tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- a/get_header_tar.c	15 Mar 2004 08:28:17 -0000	1.36
+++ b/get_header_tar.c	14 Apr 2004 17:51:08 -0000	1.37
@@ -14,7 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *  FIXME:
- *    In privelidged mode if uname and gname map to a uid amd gid then use the
+ *    In privileged mode if uname and gname map to a uid and gid then use the
  *    mapped value instead of the uid/gid values in tar header
  *
  *  References:

Index: decompress_bunzip2.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/decompress_bunzip2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/decompress_bunzip2.c	15 Mar 2004 08:28:17 -0000	1.12
+++ b/decompress_bunzip2.c	14 Apr 2004 17:51:08 -0000	1.13
@@ -13,7 +13,7 @@
 /*
 	Size and speed optimizations by Manuel Novoa III  (mjn3 at codepoet.org).
 
-	More efficient reading of huffman codes, a streamlined read_bunzip()
+	More efficient reading of Huffman codes, a streamlined read_bunzip()
 	function, and various other tweaks.  In (limited) tests, approximately
 	20% faster than bzcat on x86 and about 10% faster on arm.
 
@@ -49,10 +49,10 @@
 
 #include "libbb.h"
 
-/* Constants for huffman coding */
+/* Constants for Huffman coding */
 #define MAX_GROUPS			6
 #define GROUP_SIZE   		50		/* 64 would have been more efficient */
-#define MAX_HUFCODE_BITS 	20		/* Longest huffman code allowed */
+#define MAX_HUFCODE_BITS 	20		/* Longest Huffman code allowed */
 #define MAX_SYMBOLS 		258		/* 256 literals + RUNA + RUNB */
 #define SYMBOL_RUNA			0
 #define SYMBOL_RUNB			1
@@ -70,7 +70,7 @@
 /* Other housekeeping constants */
 #define IOBUF_SIZE			4096
 
-/* This is what we know about each huffman coding group */
+/* This is what we know about each Huffman coding group */
 struct group_data {
 	/* We have an extra slot at the end of limit[] for a sentinal value. */
 	int limit[MAX_HUFCODE_BITS+1],base[MAX_HUFCODE_BITS],permute[MAX_SYMBOLS];
@@ -92,7 +92,7 @@
 	unsigned int *dbuf, dbufSize;
 	/* These things are a bit too big to go on the stack */
 	unsigned char selectors[32768];			/* nSelectors=15 bits */
-	struct group_data groups[MAX_GROUPS];	/* huffman coding tables */
+	struct group_data groups[MAX_GROUPS];	/* Huffman coding tables */
 	/* For I/O error handling */
 	jmp_buf jmpbuf;
 } bunzip_data;
@@ -172,10 +172,10 @@
 				if(k&(1<<(15-j))) symToByte[symTotal++]=(16*i)+j;
 		}
 	}
-	/* How many different huffman coding groups does this block use? */
+	/* How many different Huffman coding groups does this block use? */
 	groupCount=get_bits(bd,3);
 	if (groupCount<2 || groupCount>MAX_GROUPS) return RETVAL_DATA_ERROR;
-	/* nSelectors: Every GROUP_SIZE many symbols we select a new huffman coding
+	/* nSelectors: Every GROUP_SIZE many symbols we select a new Huffman coding
 	   group.  Read in the group selector list, which is stored as MTF encoded
 	   bit runs.  (MTF=Move To Front, as each value is used it's moved to the
 	   start of the list.) */
@@ -189,13 +189,13 @@
 		for(;j;j--) mtfSymbol[j] = mtfSymbol[j-1];
 		mtfSymbol[0]=selectors[i]=uc;
 	}
-	/* Read the huffman coding tables for each group, which code for symTotal
+	/* Read the Huffman coding tables for each group, which code for symTotal
 	   literal symbols, plus two run symbols (RUNA, RUNB) */
 	symCount=symTotal+2;
 	for (j=0; j<groupCount; j++) {
 		unsigned char length[MAX_SYMBOLS],temp[MAX_HUFCODE_BITS+1];
 		int	minLen,	maxLen, pp;
-		/* Read huffman code lengths for each symbol.  They're stored in
+		/* Read Huffman code lengths for each symbol.  They're stored in
 		   a way similar to mtf; record a starting value for the first symbol,
 		   and an offset from the previous value for everys symbol after that.
 		   (Subtracting 1 before the loop and then adding it back at the end is
@@ -228,12 +228,12 @@
 		}
 		/* Calculate permute[], base[], and limit[] tables from length[].
 		 *
-		 * permute[] is the lookup table for converting huffman coded symbols
+		 * permute[] is the lookup table for converting Huffman coded symbols
 		 * into decoded symbols.  base[] is the amount to subtract from the
-		 * value of a huffman symbol of a given length when using permute[].
+		 * value of a Huffman symbol of a given length when using permute[].
 		 *
 		 * limit[] indicates the largest numerical value a symbol with a given
-		 * number of bits can have.  This is how the huffman codes can vary in
+		 * number of bits can have.  This is how the Huffman codes can vary in
 		 * length: each code with a value>limit[length] needs another bit.
 		 */
 		hufGroup=bd->groups+j;
@@ -275,7 +275,7 @@
 		base[minLen]=0;
 	}
 	/* We've finished reading and digesting the block header.  Now read this
-	   block's huffman coded symbols from the file and undo the huffman coding
+	   block's Huffman coded symbols from the file and undo the Huffman coding
 	   and run length encoding, saving the result into dbuf[dbufCount++]=uc */
 
 	/* Initialize symbol occurrence counters and symbol Move To Front table */
@@ -286,7 +286,7 @@
 	/* Loop through compressed symbols. */
 	runPos=dbufCount=symCount=selector=0;
 	for(;;) {
-		/* Determine which huffman coding group to use. */
+		/* Determine which Huffman coding group to use. */
 		if(!(symCount--)) {
 			symCount=GROUP_SIZE-1;
 			if(selector>=nSelectors) return RETVAL_DATA_ERROR;
@@ -294,7 +294,7 @@
 			base=hufGroup->base-1;
 			limit=hufGroup->limit-1;
 		}
-		/* Read next huffman-coded symbol. */
+		/* Read next Huffman-coded symbol. */
 		/* Note: It is far cheaper to read maxLen bits and back up than it is
 		   to read minLen bits and then an additional bit at a time, testing
 		   as we go.  Because there is a trailing last block (with file CRC),
@@ -383,7 +383,7 @@
 		byteCount[uc]++;
 		dbuf[dbufCount++] = (unsigned int)uc;
 	}
-	/* At this point, we've read all the huffman-coded symbols (and repeated
+	/* At this point, we've read all the Huffman-coded symbols (and repeated
        runs) for this block from the input stream, and decoded them into the
 	   intermediate buffer.  There are dbufCount many decoded bytes in dbuf[].
 	   Now undo the Burrows-Wheeler transform on dbuf.
@@ -439,7 +439,7 @@
 
 	/* We will always have pending decoded data to write into the output
 	   buffer unless this is the very first call (in which case we haven't
-	   huffman-decoded a block into the intermediate buffer yet). */
+	   Huffman-decoded a block into the intermediate buffer yet). */
 
 	if (bd->writeCopies) {
 		/* Inside the loop, writeCopies means extra copies (beyond 1) */
@@ -495,7 +495,7 @@
 		}
 	}
 
-	/* Refill the intermediate buffer by huffman-decoding next block of input */
+	/* Refill the intermediate buffer by Huffman-decoding next block of input */
 	/* (previous is just a convenient unused temp variable here) */
 	previous=get_next_block(bd);
 	if(previous) {

Index: decompress_unzip.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/decompress_unzip.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- a/decompress_unzip.c	15 Mar 2004 08:28:17 -0000	1.33
+++ b/decompress_unzip.c	14 Apr 2004 17:51:08 -0000	1.34
@@ -892,7 +892,7 @@
 	/* Doesnt get here */
 }
 
-/* Initialise bytebuffer, be carefull not to overfill the buffer */
+/* Initialise bytebuffer, be careful not to overfill the buffer */
 extern void inflate_init(unsigned int bufsize)
 {
 	/* Set the bytebuffer size, default is same as gunzip_wsize */

Index: decompress_uncompress.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/decompress_uncompress.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/decompress_uncompress.c	15 Mar 2004 08:28:17 -0000	1.10
+++ b/decompress_uncompress.c	14 Apr 2004 17:51:08 -0000	1.11
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Defailt input buffer size */
+/* Default input buffer size */
 #define	IBUFSIZ	2048
 
 /* Default output buffer size */