Remove trailing whitespace. Update copyright to include 2004.

12 files changed, 48 insertions, 48 deletions

diff --git a/archival/libunarchive/Makefile b/archival/libunarchive/Makefile
index 272ca2434..9a20ea28b 100644
--- a/archival/libunarchive/Makefile
+++ b/archival/libunarchive/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index 09b0571ed..c0e12a6c8 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ DPKG_FILES:= \
 	get_header_tar.o \
 	filter_accept_list_reassign.o
 
-LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o 
+LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
 LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
 LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio.o
 LIBUNARCHIVE-$(CONFIG_DPKG) += $(DPKG_FILES)
@@ -64,7 +64,7 @@ LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
 LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
 LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
 LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += uncompress.o
-LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o 
+LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
 LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
 LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o
 LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 4cff24339..a9a3a93d8 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -37,7 +37,7 @@ extern void data_extract_all(archive_handle_t *archive_handle)
 		char *name = bb_xstrdup(file_header->name);
 		bb_make_directory (dirname(name), 0777, FILEUTILS_RECUR);
 		free(name);
-	}                  
+	}
 
 	/* Check if the file already exists */
 	if (archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) {
@@ -66,7 +66,7 @@ extern void data_extract_all(archive_handle_t *archive_handle)
 		}
 	}
 
-	/* Handle hard links seperately 
+	/* Handle hard links seperately
 	 * 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 */
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index 3e6138c95..af165336e 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -248,7 +248,7 @@ static int get_next_block(bunzip_data *bd)
 		pp=0;
 		for(i=minLen;i<=maxLen;i++) {
 			temp[i]=limit[i]=0;
-			for(t=0;t<symCount;t++) 
+			for(t=0;t<symCount;t++)
 				if(length[t]==i) hufGroup->permute[pp++] = t;
 		}
 		/* Count symbols coded for at each bit length */
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c
index 65418a7ca..ddf293fd6 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libunarchive/decompress_uncompress.c
@@ -3,7 +3,7 @@
 
 /* uncompress for busybox -- (c) 2002 Robert Griebl
  *
- * based on the original compress42.c source 
+ * based on the original compress42.c source
  * (see disclaimer below)
  */
 
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 29929c282..a436db191 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -13,7 +13,7 @@
  *
  * General cleanup to better adhere to the style guide and make use of standard
  * busybox functions by Glenn McGrath <bug1@optushome.com.au>
- * 
+ *
  * read_gz interface + associated hacking by Laurence Anderson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -148,7 +148,7 @@ static unsigned int fill_bitbuffer(unsigned int bitbuffer, unsigned int *current
 {
 	while (*current < required) {
 		if (bytebuffer_offset >= bytebuffer_size) {
-			/* Leave the first 4 bytes empty so we can always unwind the bitbuffer 
+			/* Leave the first 4 bytes empty so we can always unwind the bitbuffer
 			 * to the front of the bytebuffer, leave 4 bytes free at end of tail
 			 * so we can easily top up buffer in check_trailer_gzip() */
 			bytebuffer_size = 4 + bb_xread(gunzip_src_fd, &bytebuffer[4], bytebuffer_max - 8);
@@ -193,7 +193,7 @@ static void make_gunzip_crc_table(void)
 /*
  * Free the malloc'ed tables built by huft_build(), which makes a linked
  * list of the tables it made, with the links in a dummy first entry of
- * each table. 
+ * each table.
  * t: table to free
  */
 static int huft_free(huft_t * t)
@@ -435,9 +435,9 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b
 		md = mask_bits[bd];
 		return 0; // Don't actually do anything the first time
 	}
-	
+
 	if (resumeCopy) goto do_copy;
-	
+
 	while (1) {			/* do until end of block */
 		b = fill_bitbuffer(b, &k, bl);
 		if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
@@ -533,7 +533,7 @@ do_copy:		do {
 	/* free the decoding tables, return */
 	huft_free(tl);
 	huft_free(td);
-	
+
 	/* done */
 	return 0;
 }
@@ -548,7 +548,7 @@ static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup)
 		w = gunzip_outbuf_count;		/* initialize gunzip_window position */
 		return 0; // Don't do anything first time
 	}
-	
+
 	/* read and output the compressed data */
 	while (n--) {
 		b_stored = fill_bitbuffer(b_stored, &k_stored, 8);
@@ -639,7 +639,7 @@ static int inflate_block(int *e)
 		inflate_stored(n, b_stored, k_stored, 1); // Setup inflate_stored
 		return -1;
 	}
-	case 1:			/* Inflate fixed 
+	case 1:			/* Inflate fixed
 						   * decompress an inflated type 1 (fixed Huffman codes) block.  We should
 						   * either replace this with a custom decoder, or at least precompute the
 						   * Huffman tables.
@@ -682,9 +682,9 @@ static int inflate_block(int *e)
 
 		/* decompress until an end-of-block code */
 		inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes
-		
+
 		/* huft_free code moved into inflate_codes */
-		
+
 		return -2;
 	}
 	case 2:			/* Inflate dynamic */
@@ -836,7 +836,7 @@ static int inflate_block(int *e)
 		inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes
 
 		/* huft_free code moved into inflate_codes */
-		
+
 		return -2;
 	}
 	default:
@@ -859,12 +859,12 @@ static int inflate_get_next_window(void)
 	static int method = -1; // Method == -1 for stored, -2 for codes
 	static int e = 0;
 	static int needAnotherBlock = 1;
-	
+
 	gunzip_outbuf_count = 0;
 
 	while(1) {
 		int ret;
-	
+
 		if (needAnotherBlock) {
 			if(e) {
 				calculate_gunzip_crc();
@@ -875,7 +875,7 @@ static int inflate_get_next_window(void)
 			method = inflate_block(&e);
 			needAnotherBlock = 0;
 		}
-	
+
 		switch (method) {
 			case -1:	ret = inflate_stored(0,0,0,0);
 					break;
@@ -920,7 +920,7 @@ extern int inflate_unzip(int in, int out)
 	make_gunzip_crc_table();
 
 	/* Allocate space for buffer */
-	bytebuffer = xmalloc(bytebuffer_max);	
+	bytebuffer = xmalloc(bytebuffer_max);
 
 	while(1) {
 		int ret = inflate_get_next_window();
@@ -977,6 +977,6 @@ extern int inflate_gunzip(int in, int out)
 		(bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) {
 		bb_error_msg("Incorrect length");
 	}
-	
+
 	return 0;
 }
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index 1e9da0f2b..d0436549b 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -26,7 +26,7 @@
 /*
  *	Reassign the subarchive metadata parser based on the filename extension
  *  e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz
- *       or if its a .tar.bz2 make archive_handle->sub_archive handle that 
+ *       or if its a .tar.bz2 make archive_handle->sub_archive handle that
  */
 extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index 25eafe0bd..86e0bc08f 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -113,7 +113,7 @@ extern char get_header_ar(archive_handle_t *archive_handle)
 			archive_handle->action_data(archive_handle);
 		}
 	} else {
-		data_skip(archive_handle);			
+		data_skip(archive_handle);
 	}
 
 	archive_handle->offset += typed->size;
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index 25fdc0600..e8a68f1c3 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -36,7 +36,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
 	int namesize;
 	char dummy[16];
 	int major, minor, nlink, inode;
-	
+
 	if (pending_hardlinks) { /* Deal with any pending hardlinks */
 		hardlinks_t *tmp;
 		hardlinks_t *oldtmp;
@@ -77,7 +77,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
 	{
 	    unsigned long tmpsize;
 	    sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
-		    dummy, &inode, (unsigned int*)&file_header->mode, 
+		    dummy, &inode, (unsigned int*)&file_header->mode,
 		    (unsigned int*)&file_header->uid, (unsigned int*)&file_header->gid,
 		    &nlink, &file_header->mtime, &tmpsize,
 		    dummy, &major, &minor, &namesize, dummy);
@@ -147,7 +147,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
 		archive_handle->action_data(archive_handle);
 		archive_handle->action_header(archive_handle->file_header);
 	} else {
-		data_skip(archive_handle);			
+		data_skip(archive_handle);
 	}
 
 	archive_handle->offset += file_header->size;
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index ad580617b..c6ebdae80 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -119,7 +119,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 	file_header->gid = strtol(tar.formated.gid, NULL, 8);
 	file_header->size = strtol(tar.formated.size, NULL, 8);
 	file_header->mtime = strtol(tar.formated.mtime, NULL, 8);
-	file_header->link_name = (tar.formated.linkname[0] != '\0') ? 
+	file_header->link_name = (tar.formated.linkname[0] != '\0') ?
 	    bb_xstrdup(tar.formated.linkname) : NULL;
 	file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
 				 strtol(tar.formated.devminor, NULL, 8));
@@ -205,7 +205,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 		archive_handle->action_data(archive_handle);
 		archive_handle->passed = llist_add_to(archive_handle->passed, file_header->name);
 	} else {
-		data_skip(archive_handle);			
+		data_skip(archive_handle);
 	}
 	archive_handle->offset += file_header->size;
 
diff --git a/archival/libunarchive/uncompress.c b/archival/libunarchive/uncompress.c
index 65418a7ca..ddf293fd6 100644
--- a/archival/libunarchive/uncompress.c
+++ b/archival/libunarchive/uncompress.c
@@ -3,7 +3,7 @@
 
 /* uncompress for busybox -- (c) 2002 Robert Griebl
  *
- * based on the original compress42.c source 
+ * based on the original compress42.c source
  * (see disclaimer below)
  */
 
diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index 29929c282..a436db191 100644
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -13,7 +13,7 @@
  *
  * General cleanup to better adhere to the style guide and make use of standard
  * busybox functions by Glenn McGrath <bug1@optushome.com.au>
- * 
+ *
  * read_gz interface + associated hacking by Laurence Anderson
  *
  * This program is free software; you can redistribute it and/or modify
@@ -148,7 +148,7 @@ static unsigned int fill_bitbuffer(unsigned int bitbuffer, unsigned int *current
 {
 	while (*current < required) {
 		if (bytebuffer_offset >= bytebuffer_size) {
-			/* Leave the first 4 bytes empty so we can always unwind the bitbuffer 
+			/* Leave the first 4 bytes empty so we can always unwind the bitbuffer
 			 * to the front of the bytebuffer, leave 4 bytes free at end of tail
 			 * so we can easily top up buffer in check_trailer_gzip() */
 			bytebuffer_size = 4 + bb_xread(gunzip_src_fd, &bytebuffer[4], bytebuffer_max - 8);
@@ -193,7 +193,7 @@ static void make_gunzip_crc_table(void)
 /*
  * Free the malloc'ed tables built by huft_build(), which makes a linked
  * list of the tables it made, with the links in a dummy first entry of
- * each table. 
+ * each table.
  * t: table to free
  */
 static int huft_free(huft_t * t)
@@ -435,9 +435,9 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b
 		md = mask_bits[bd];
 		return 0; // Don't actually do anything the first time
 	}
-	
+
 	if (resumeCopy) goto do_copy;
-	
+
 	while (1) {			/* do until end of block */
 		b = fill_bitbuffer(b, &k, bl);
 		if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
@@ -533,7 +533,7 @@ do_copy:		do {
 	/* free the decoding tables, return */
 	huft_free(tl);
 	huft_free(td);
-	
+
 	/* done */
 	return 0;
 }
@@ -548,7 +548,7 @@ static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup)
 		w = gunzip_outbuf_count;		/* initialize gunzip_window position */
 		return 0; // Don't do anything first time
 	}
-	
+
 	/* read and output the compressed data */
 	while (n--) {
 		b_stored = fill_bitbuffer(b_stored, &k_stored, 8);
@@ -639,7 +639,7 @@ static int inflate_block(int *e)
 		inflate_stored(n, b_stored, k_stored, 1); // Setup inflate_stored
 		return -1;
 	}
-	case 1:			/* Inflate fixed 
+	case 1:			/* Inflate fixed
 						   * decompress an inflated type 1 (fixed Huffman codes) block.  We should
 						   * either replace this with a custom decoder, or at least precompute the
 						   * Huffman tables.
@@ -682,9 +682,9 @@ static int inflate_block(int *e)
 
 		/* decompress until an end-of-block code */
 		inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes
-		
+
 		/* huft_free code moved into inflate_codes */
-		
+
 		return -2;
 	}
 	case 2:			/* Inflate dynamic */
@@ -836,7 +836,7 @@ static int inflate_block(int *e)
 		inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes
 
 		/* huft_free code moved into inflate_codes */
-		
+
 		return -2;
 	}
 	default:
@@ -859,12 +859,12 @@ static int inflate_get_next_window(void)
 	static int method = -1; // Method == -1 for stored, -2 for codes
 	static int e = 0;
 	static int needAnotherBlock = 1;
-	
+
 	gunzip_outbuf_count = 0;
 
 	while(1) {
 		int ret;
-	
+
 		if (needAnotherBlock) {
 			if(e) {
 				calculate_gunzip_crc();
@@ -875,7 +875,7 @@ static int inflate_get_next_window(void)
 			method = inflate_block(&e);
 			needAnotherBlock = 0;
 		}
-	
+
 		switch (method) {
 			case -1:	ret = inflate_stored(0,0,0,0);
 					break;
@@ -920,7 +920,7 @@ extern int inflate_unzip(int in, int out)
 	make_gunzip_crc_table();
 
 	/* Allocate space for buffer */
-	bytebuffer = xmalloc(bytebuffer_max);	
+	bytebuffer = xmalloc(bytebuffer_max);
 
 	while(1) {
 		int ret = inflate_get_next_window();
@@ -977,6 +977,6 @@ extern int inflate_gunzip(int in, int out)
 		(bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) {
 		bb_error_msg("Incorrect length");
 	}
-	
+
 	return 0;
 }