24 files changed, 129 insertions, 129 deletions

diff --git a/archival/Config.in b/archival/Config.in
index daf3cf221..db358db08 100644
--- a/archival/Config.in
+++ b/archival/Config.in
@@ -46,11 +46,11 @@ config CONFIG_BUNZIP2
           sorting text compression algorithm, and Huffman coding.  Compression
           is generally considerably better than that achieved by more
           conventional LZ77/LZ78-based compressors, and approaches the
-          performance of the PPM family of statistical compressors.  
-          
+          performance of the PPM family of statistical compressors.
+        
           The BusyBox bunzip2 applet is limited to de-compression only.
           On an x86 system, this applet adds about 11K.
-          
+        
           Unless you have a specific application which requires bunzip2, you
           should probably say N here.
 
@@ -63,7 +63,7 @@ config CONFIG_CPIO
           cpio has 110 bytes of overheads for every stored file.
 
           This implementation of cpio can extract cpio archives created in the
-          "newc" or "crc" format, it cannot create or modify them. 
+          "newc" or "crc" format, it cannot create or modify them.
 
           Unless you have a specific application which requires cpio, you should
           probably say N here.
@@ -73,7 +73,7 @@ config CONFIG_DPKG
         default n
         help
           dpkg is a medium-level tool to install, build, remove and manage Debian packages.
-          
+        
           This implementation of dpkg has a number of limitations, you should use the
           official dpkg if possible.
 
@@ -82,9 +82,9 @@ config CONFIG_DPKG_DEB
         default n
         help
           dpkg-deb packs, unpacks and provides information about Debian archives.
-          
+        
           This implementation of dpkg-deb cannot pack archives.
-          
+        
           Unless you have a specific application which requires dpkg-deb, you should
           probably say N here.
 
@@ -94,7 +94,7 @@ config CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
         depends on CONFIG_DPKG_DEB
         help
           This reduces dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx".
-          However it saves space as none of the extra dpkg-deb, ar or tar options are 
+          However it saves space as none of the extra dpkg-deb, ar or tar options are
           needed, they are linked to internally.
 
 config CONFIG_GUNZIP
@@ -195,7 +195,7 @@ config CONFIG_FEATURE_TAR_GNU_EXTENSIONS
         default y
         depends on CONFIG_TAR
         help
-          With this option busybox supports GNU long filenames and 
+          With this option busybox supports GNU long filenames and
           linknames.
 
 config CONFIG_FEATURE_TAR_LONG_OPTIONS
@@ -241,7 +241,7 @@ config CONFIG_FEATURE_DEB_TAR_GZ
         depends on CONFIG_DPKG || CONFIG_DPKG_DEB
         help
           This is the default compression method inside the debian ar file.
-          
+        
           If you want compatibility with standard .deb's you should say yes here.
 
 config CONFIG_FEATURE_DEB_TAR_BZ2
@@ -251,7 +251,7 @@ config CONFIG_FEATURE_DEB_TAR_BZ2
         help
           This allows dpkg and dpkg-deb to extract deb's that are compressed internally
           with bzip2 instead of gzip.
-          
+        
           You only want this if you are creating your own custom debian packages that
           use an internal control.tar.bz2 or data.tar.bz2.
 
diff --git a/archival/Makefile b/archival/Makefile
index 3362feafb..1cbe7ee00 100644
--- a/archival/Makefile
+++ b/archival/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/Makefile.in b/archival/Makefile.in
index 3247ad8bd..1673662f9 100644
--- a/archival/Makefile.in
+++ b/archival/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
diff --git a/archival/ar.c b/archival/ar.c
index 890e81fc5..ddf3fdadb 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -1,10 +1,10 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini ar implementation for busybox 
+ * Mini ar implementation for busybox
  *
  * Copyright (C) 2000 by Glenn McGrath
  * Written by Glenn McGrath <bug1@optushome.com.au> 1 June 2000
- *              
+ *
  * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/archival/cpio.c b/archival/cpio.c
index 8f85779c9..aff6a55f9 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -2,7 +2,7 @@
 /*
  * Mini cpio implementation for busybox
  *
- * Copyright (C) 2001 by Glenn McGrath 
+ * Copyright (C) 2001 by Glenn McGrath
  *
  * 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
@@ -62,7 +62,7 @@ extern int cpio_main(int argc, char **argv)
                 /* if both extract and test option are given, ignore extract option */
                 if (opt & CPIO_OPT_EXTRACT) {
                         opt &= ~CPIO_OPT_EXTRACT;
-                }               
+                }
                 archive_handle->action_header = header_list;
         }
         if (opt & CPIO_OPT_EXTRACT) {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 2ebbbdf4e..e192b4a62 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -4,7 +4,7 @@
  *
  *  Written By Glenn McGrath with the help of others
  *  Copyright (C) 2001 by Glenn McGrath
- *              
+ *
  *  Started life as a busybox implementation of udpkg
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
  *    int's and chaos is assured, 16381 is the max prime for 14 bit field
  */
 
-/* NAME_HASH_PRIME, Stores package names and versions, 
+/* NAME_HASH_PRIME, Stores package names and versions,
  * I estimate it should be at least 50% bigger than PACKAGE_HASH_PRIME,
  * as there a lot of duplicate version numbers */
 #define NAME_HASH_PRIME 16381
@@ -150,7 +150,7 @@ void make_hash(const char *key, unsigned int *start, unsigned int *decrement, co
                  * shift amount is mod 24 because long int is 32 bit and data
                  * to be shifted is 8, dont want to shift data to where it has
                  * no effect*/
-                hash_num += ((key[i] + key[i-1]) << ((key[i] * i) % 24)); 
+                hash_num += ((key[i] + key[i-1]) << ((key[i] * i) % 24));
         }
         *start = (unsigned int) hash_num % hash_prime;
         *decrement = (unsigned int) 1 + (hash_num % (hash_prime - 1));
@@ -464,11 +464,11 @@ void add_split_dependencies(common_node_t *parent_node, const char *whole_line,
                 } else {
                         or_edge = NULL;
                 }
-                
+
                 if ( or_edge ) {
                         or_edge->name = search_name_hashtable(field);
                         or_edge->version = 0; // tracks the number of altenatives
-                        
+
                         add_edge_to_node(parent_node, or_edge);
                 }
 
@@ -572,7 +572,7 @@ unsigned int fill_package_struct(char *control_buffer)
                         goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement ! */
                 }
 
-                field_num = compare_string_array(field_names, field_name);              
+                field_num = compare_string_array(field_names, field_name);
                 switch(field_num) {
                         case 0: /* Package */
                                 new_node->name = search_name_hashtable(field_value);
@@ -697,7 +697,7 @@ const char *describe_status(int status_num) {
                         return "is marked to be removed";
                 if ( status_want == search_name_hashtable("purge") )
                         return "is marked to be purged";
-        } 
+        }
         if ( status_want ==  search_name_hashtable("unknown") )
                 return "is in an indeterminate state";
         if ( status_want == search_name_hashtable("install") )
@@ -957,11 +957,11 @@ void write_status_file(deb_file_t **deb_file)
 
         /* Create a seperate backfile to dpkg */
         if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) {
-                struct stat stat_buf;   
+                struct stat stat_buf;
                 if (stat("/var/lib/dpkg/status", &stat_buf) == 0) {
                         bb_error_msg_and_die("Couldnt create backup status file");
                 }
-                /* Its ok if renaming the status file fails becasue status 
+                /* Its ok if renaming the status file fails becasue status
                  * file doesnt exist, maybe we are starting from scratch */
                 bb_error_msg("No status file found, creating new one");
         }
@@ -1056,10 +1056,10 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                         const edge_t *package_edge = package_node->edge[j];
 
                         if (package_edge->type == EDGE_CONFLICTS) {
-                                const unsigned int package_num = 
+                                const unsigned int package_num =
                                         search_package_hashtable(package_edge->name,
-                                                                 package_edge->version, 
-                                                                 package_edge->operator);       
+                                                                 package_edge->version,
+                                                                 package_edge->operator);
                                 int result = 0;
                                 if (package_hashtable[package_num] != NULL) {
                                         status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
@@ -1078,7 +1078,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                         }
                 }
                 i++;
-        }           
+        }       
 
 
         /* Check dependendcies */
@@ -1098,7 +1098,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
 
                 /* If there is no status then this package is a
                  * virtual one provided by something else. In which
-                 * case there are no dependencies to check. 
+                 * case there are no dependencies to check.
                  */
                 if ( status_hashtable[status_num] == NULL ) continue;
 
@@ -1125,7 +1125,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                 for (j = 0; j < package_node->num_of_edges; j++) {
                         const edge_t *package_edge = package_node->edge[j];
                         unsigned int package_num;
-                               
+                        
                         if ( package_edge->type == EDGE_OR_PRE_DEPENDS ||
                              package_edge->type == EDGE_OR_DEPENDS ) {  /* start an EDGE_OR_ list */
                                 number_of_alternatives = package_edge->version;
@@ -1147,26 +1147,26 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                  * this edge is the right type.
                                  *
                                  * EDGE_DEPENDS == OR_DEPENDS -1
-                                 * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1 
+                                 * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1
                                  */
                                 if ( root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
                                         bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1 \n",
                                                              package_edge->type, root_of_alternatives->type);
-                                
+
                                 if (package_hashtable[package_num] != NULL)
                                         result = !package_satisfies_dependency(package_num, package_edge->type);
 
                                 if (result) { /* check for other package which provide what we are looking for */
                                         int provider = -1;
-                                        
+
                                         while ( (provider = search_for_provides(package_edge->name, provider) ) > -1 ) {
                                                 if ( package_hashtable[provider] == NULL ) {
                                                         printf("Have a provider but no package information for it\n");
                                                         continue;
-                                                }                                               
+                                                }
                                                 result = !package_satisfies_dependency(provider, package_edge->type);
-                                                
-                                                if ( result == 0 ) 
+
+                                                if ( result == 0 )
                                                         break;
                                         }
                                 }
@@ -1176,14 +1176,14 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                 if (result && number_of_alternatives == 0) {
                                         if ( root_of_alternatives )
                                                 bb_error_msg_and_die(
-                                                        "Package %s %sdepends on %s, " 
+                                                        "Package %s %sdepends on %s, "
                                                         "which cannot be satisfied",
                                                         name_hashtable[package_node->name],
                                                         package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
                                                         name_hashtable[root_of_alternatives->name]);
-                                        else 
+                                        else
                                                 bb_error_msg_and_die(
-                                                        "Package %s %sdepends on %s, which %s\n", 
+                                                        "Package %s %sdepends on %s, which %s\n",
                                                         name_hashtable[package_node->name],
                                                         package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
                                                         name_hashtable[package_edge->name],
@@ -1192,7 +1192,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                         /* we've found a package which
                                          * satisfies the dependency,
                                          * so skip over the rest of
-                                         * the alternatives. 
+                                         * the alternatives.
                                          */
                                         j += number_of_alternatives;
                                         number_of_alternatives = 0;
@@ -1312,7 +1312,7 @@ char **all_control_list(const char *package_name)
 
 void free_array(char **array)
 {
-        
+
         if (array) {
                 unsigned short i = 0;
                 while (array[i]) {
@@ -1325,7 +1325,7 @@ void free_array(char **array)
 
 /* This function lists information on the installed packages. It loops through
  * the status_hashtable to retrieve the info. This results in smaller code than
- * scanning the status file. The resulting list, however, is unsorted. 
+ * scanning the status file. The resulting list, however, is unsorted.
  */
 void list_packages(void)
 {
@@ -1333,7 +1333,7 @@ void list_packages(void)
 
         printf("    Name           Version\n");
         printf("+++-==============-==============\n");
-        
+
         /* go through status hash, dereference package hash and finally strings */
         for (i=0; i<STATUS_HASH_PRIME+1; i++) {
 
@@ -1342,22 +1342,22 @@ void list_packages(void)
                         const char *name_str;  /* package name */
                         const char *vers_str;  /* version */
                         char  s1, s2;          /* status abbreviations */
-                        int   spccnt;          /* space count */      
+                        int   spccnt;          /* space count */
                         int   j;
-                        
+
                         stat_str = name_hashtable[status_hashtable[i]->status];
                         name_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->name];
                         vers_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->version];
-                        
+
                         /* get abbreviation for status field 1 */
                         s1 = stat_str[0] == 'i' ? 'i' : 'r';
-                        
+
                         /* get abbreviation for status field 2 */
                         for (j=0, spccnt=0; stat_str[j] && spccnt<2; j++) {
                                 if (stat_str[j] == ' ') spccnt++;
                         }
                         s2 = stat_str[j];
-                        
+
                         /* print out the line formatted like Debian dpkg */
                         printf("%c%c  %-14s %s\n", s1, s2, name_str, vers_str);
                 }
@@ -1376,7 +1376,7 @@ void remove_package(const unsigned int package_num, int noisy)
         char conffile_name[package_name_length + 30];
         int return_value;
 
-        if ( noisy ) 
+        if ( noisy )
                 printf("Removing %s (%s) ...\n", package_name, package_version);
 
         /* run prerm script */
@@ -1464,12 +1464,12 @@ static archive_handle_t *init_archive_deb_ar(const char *filename)
 {
         archive_handle_t *ar_handle;
 
-        /* Setup an ar archive handle that refers to the gzip sub archive */    
+        /* Setup an ar archive handle that refers to the gzip sub archive */
         ar_handle = init_handle();
         ar_handle->filter = filter_accept_list_reassign;
         ar_handle->src_fd = bb_xopen(filename, O_RDONLY);
 
-        return(ar_handle);      
+        return(ar_handle);
 }
 
 static void init_archive_deb_control(archive_handle_t *ar_handle)
@@ -1491,7 +1491,7 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
         /* Assign the tar handle as a subarchive of the ar handle */
         ar_handle->sub_archive = tar_handle;
 
-        return; 
+        return;
 }
 
 static void init_archive_deb_data(archive_handle_t *ar_handle)
@@ -1513,7 +1513,7 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
         /* Assign the tar handle as a subarchive of the ar handle */
         ar_handle->sub_archive = tar_handle;
 
-        return; 
+        return;
 }
 
 static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *myaccept)
@@ -1586,7 +1586,7 @@ static void unpack_package(deb_file_t *deb_file)
         if (run_package_script(package_name, "preinst") != 0) {
                 /* when preinst returns exit code != 0 then quit installation process */
                 bb_error_msg_and_die("subprocess pre-installation script returned error.");
-        }       
+        }
 
         /* Extract data.tar.gz to the root directory */
         archive_handle = init_archive_deb_ar(deb_file->filename);
@@ -1598,7 +1598,7 @@ static void unpack_package(deb_file_t *deb_file)
 
         /* Create the list file */
         strcat(info_prefix, "list");
-        out_stream = bb_xfopen(info_prefix, "w");                       
+        out_stream = bb_xfopen(info_prefix, "w");
         while (archive_handle->sub_archive->passed) {
                 /* the leading . has been stripped by data_extract_all_prefix already */
                 fputs(archive_handle->sub_archive->passed->data, out_stream);
@@ -1653,7 +1653,7 @@ int dpkg_main(int argc, char **argv)
                         case 'F': // equivalent to --force in official dpkg
                                 if (strcmp(optarg, "depends") == 0) {
                                         dpkg_opt |= dpkg_opt_force_ignore_depends;
-                                }                               
+                                }
                                 break;
                         case 'i':
                                 dpkg_opt |= dpkg_opt_install;
@@ -1691,7 +1691,7 @@ int dpkg_main(int argc, char **argv)
                 list_packages();
                 return(EXIT_SUCCESS);
         }
-        
+
         /* Read arguments and store relevant info in structs */
         while (optind < argc) {
                 /* deb_count = nb_elem - 1 and we need nb_elem + 1 to allocate terminal node [NULL pointer] */
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index da94b394f..5aa9881d5 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -41,7 +41,7 @@ extern int dpkg_deb_main(int argc, char **argv)
         /* Setup the tar archive handle */
         tar_archive = init_handle();
 
-        /* Setup an ar archive handle that refers to the gzip sub archive */    
+        /* Setup an ar archive handle that refers to the gzip sub archive */
         ar_archive = init_handle();
         ar_archive->sub_archive = tar_archive;
         ar_archive->filter = filter_accept_list_reassign;
@@ -73,7 +73,7 @@ extern int dpkg_deb_main(int argc, char **argv)
         }
         if (opt & DPKG_DEB_OPT_FIELD) {
                 /* Print the entire control file
-                 * it should accept a second argument which specifies a 
+                 * it should accept a second argument which specifies a
                  * specific field to print */
                 ar_archive->accept = control_tar_llist;
                 tar_archive->accept = llist_add_to(NULL, "./control");;
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 367e0470c..dec53f660 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.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>
- * 
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -153,12 +153,12 @@ extern int gunzip_main(int argc, char **argv)
                 /* do the decompression, and cleanup */
                 if (bb_xread_char(src_fd) == 0x1f) {
                         unsigned char magic2;
-                        
+
                         magic2 = bb_xread_char(src_fd);
 #ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS
                         if (magic2 == 0x9d) {
                                 status = uncompress(src_fd, dst_fd);
-                        } else 
+                        } else
 #endif
                                 if (magic2 == 0x8b) {
                                         check_header_gzip(src_fd);
diff --git a/archival/gzip.c b/archival/gzip.c
index 2be5603a0..1708ac1a1 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -9,8 +9,8 @@
  *              only standard in to standard out with -9 compression.  It also requires
  *              the zcat module for some important functions."
  *
- * Adjusted further by Erik Andersen <andersen@codepoet.org> to support 
- * files as well as stdin/stdout, and to generally behave itself wrt 
+ * Adjusted further by Erik Andersen <andersen@codepoet.org> to support
+ * files as well as stdin/stdout, and to generally behave itself wrt
  * command line handling.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
  */
 
 /* These defines are very important for BusyBox.  Without these,
- * huge chunks of ram are pre-allocated making the BusyBox bss 
+ * huge chunks of ram are pre-allocated making the BusyBox bss
  * size Freaking Huge(tm), which is a bad thing.*/
 #define SMALL_MEM
 #define DYN_ALLOC
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;
 }
diff --git a/archival/rpm.c b/archival/rpm.c
index eb2c0433b..30cdc93fb 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -204,12 +204,12 @@ void extract_cpio_gz(int fd) {
         archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS;
         archive_handle->src_fd = fd;
         archive_handle->offset = 0;
-        
+
         bb_xread_all(archive_handle->src_fd, &magic, 2);
         if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
                 bb_error_msg_and_die("Invalid gzip magic");
         }
-        check_header_gzip(archive_handle->src_fd);      
+        check_header_gzip(archive_handle->src_fd);
         chdir("/"); // Install RPM's to root
 
         archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip);
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index d0041a83c..7b5059518 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -89,7 +89,7 @@ extern int rpm2cpio_main(int argc, char **argv)
 
         /* Skip the main header */
         skip_header(rpm_fd);
-        
+
         bb_xread_all(rpm_fd, &magic, 2);
         if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
                 bb_error_msg_and_die("Invalid gzip magic");
diff --git a/archival/tar.c b/archival/tar.c
index cbd069425..2310e80cb 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini tar implementation for busybox 
+ * Mini tar implementation for busybox
  *
  * Modifed to use common extraction code used by ar, cpio, dpkg-deb, dpkg
  *  Glenn McGrath <bug1@optushome.com.au>
@@ -9,7 +9,7 @@
  * ground up.  It still has remnents of the old code lying about, but it is
  * very different now (i.e., cleaner, less global variables, etc.)
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * Based in part in the tar implementation in sash
  *  Copyright (c) 1999 by David I. Bell
@@ -111,7 +111,7 @@ struct TarBallInfo {
                                                    for the tarball */
         struct stat statBuf;    /* Stat info for the tarball, letting
                                                            us know the inode and device that the
-                                                           tarball lives, so we can avoid trying 
+                                                           tarball lives, so we can avoid trying
                                                            to include the tarball into itself */
         int verboseFlag;        /* Whether to print extra stuff or not */
         const llist_t *excludeList;     /* List of files to not include */
@@ -470,7 +470,7 @@ static inline int writeTarFile(const int tar_fd, const int verboseFlag,
                         (void) &include;
                         (void) &errorFlag;
 # endif
- 
+
                 gzipPid = vfork();
 
                 if (gzipPid == 0) {
@@ -616,7 +616,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
 #endif
 
 #ifdef CONFIG_FEATURE_TAR_BZIP2
-# define TAR_OPT_BZIP2  (1 << (8 + TAR_OPT_FLAG_CREATE)) 
+# define TAR_OPT_BZIP2  (1 << (8 + TAR_OPT_FLAG_CREATE))
 # define TAR_OPT_STR_BZIP2      "j"
 # define TAR_OPT_FLAG_BZIP2     1
 #else
@@ -646,7 +646,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
 #ifdef CONFIG_FEATURE_TAR_COMPRESS
 # define TAR_OPT_UNCOMPRESS     (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM + TAR_OPT_FLAG_GZIP))
 # define TAR_OPT_STR_COMPRESS   "Z"
-#else 
+#else
 # define TAR_OPT_STR_COMPRESS   ""
 #endif
 
@@ -740,7 +740,7 @@ int tar_main(int argc, char **argv)
                 bb_show_usage();
         }
         if(ctx_flag & CTX_TEST) {
-                if ((tar_handle->action_header == header_list) || 
+                if ((tar_handle->action_header == header_list) ||
                         (tar_handle->action_header == header_verbose_list)) {
                         tar_handle->action_header = header_verbose_list;
                 } else {
@@ -756,8 +756,8 @@ int tar_main(int argc, char **argv)
                 tar_handle->action_data = data_extract_to_stdout;
         }
         if(opt & TAR_OPT_VERBOSE) {
-                if ((tar_handle->action_header == header_list) || 
-                        (tar_handle->action_header == header_verbose_list)) 
+                if ((tar_handle->action_header == header_list) ||
+                        (tar_handle->action_header == header_verbose_list))
                 {
                 tar_handle->action_header = header_verbose_list;
                 } else {
@@ -860,13 +860,13 @@ int tar_main(int argc, char **argv)
                 }
 # endif /* CONFIG_FEATURE_TAR_BZIP2 */
 
-                if ((tar_handle->action_header == header_list) || 
+                if ((tar_handle->action_header == header_list) ||
                                 (tar_handle->action_header == header_verbose_list)) {
                         verboseFlag = TRUE;
                 }
                 writeTarFile(tar_handle->src_fd, verboseFlag, opt & TAR_OPT_DEREFERNCE, tar_handle->accept,
                         tar_handle->reject, gzipFlag);
-        } else 
+        } else
 #endif /* CONFIG_FEATURE_TAR_CREATE */
         {
                 while (get_header_ptr(tar_handle) == EXIT_SUCCESS);