fix accumulated whitespace and indentation damage

23 files changed, 145 insertions, 145 deletions

diff --git a/archival/gzip.c b/archival/gzip.c
index c2333e3b1..b8f576500 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2019,7 +2019,7 @@ static
 USE_DESKTOP(long long) int pack_gzip(void)
 {
         struct stat s;
-        
+
         clear_bufs();
         s.st_ctime = 0;
         fstat(STDIN_FILENO, &s);
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 64cf63797..a80e0d286 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -51,7 +51,7 @@ int cp_main(int argc, char **argv)
         if (flags & OPT_H) ... // deref command-line params only
         */
 
-#if ENABLE_SELINUX 
+#if ENABLE_SELINUX
         if (flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) {
                 selinux_or_die();
         }
diff --git a/coreutils/id.c b/coreutils/id.c
index e183402fa..8a604195d 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -48,7 +48,7 @@ int id_main(int argc, char **argv)
         unsigned long flags;
         short status;
 #if ENABLE_SELINUX
-        security_context_t scontext;
+        security_context_t scontext;
 #endif
         /* Don't allow -n -r -nr -ug -rug -nug -rnug */
         /* Don't allow more than one username */
@@ -78,26 +78,26 @@ int id_main(int argc, char **argv)
                         puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
                 } else {
                         if (flags & JUST_USER) {
-                                printf("%u\n", uid);
-                        }
-                        if (flags & JUST_GROUP) {
-                                printf("%u\n", gid);
-                        }
-                }
-                
+                                printf("%u\n", uid);
+                        }
+                        if (flags & JUST_GROUP) {
+                                printf("%u\n", gid);
+                        }
+                }
+
 #if ENABLE_SELINUX
-                if (flags & JUST_CONTEXT) {        
+                if (flags & JUST_CONTEXT) {
                         selinux_or_die();
-                        if (argc - optind == 1) {
-                                bb_error_msg_and_die("user name can't be passed with -Z");
-                        }
-                        
-                        if (getcon(&scontext)) {
-                                bb_error_msg_and_die("can't get process context");              
-                        }
-                        printf("%s\n", scontext);
-                }
-#endif  
+                        if (argc - optind == 1) {
+                                bb_error_msg_and_die("user name can't be passed with -Z");
+                        }
+
+                        if (getcon(&scontext)) {
+                                bb_error_msg_and_die("can't get process context");
+                        }
+                        printf("%s\n", scontext);
+                }
+#endif
                 /* exit */
                 fflush_stdout_and_exit(EXIT_SUCCESS);
         }
diff --git a/coreutils/install.c b/coreutils/install.c
index a58a23b6e..c80be01ff 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -41,7 +41,7 @@ static void setdefaultfilecon(const char *path) {
 
         if (!is_selinux_enabled()) {
                 return;
-        }       
+        }
         if (lstat(path, &s) != 0) {
                 return;
         }
@@ -101,7 +101,7 @@ int install_main(int argc, char **argv)
         /* -c exists for backwards compatibility, it's needed */
 
         flags = getopt32(argc, argv, "cdpsg:m:o:" USE_SELINUX("Z:"), &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
-        
+
 #if ENABLE_SELINUX
         if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
                 use_default_selinux_context = 0;
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2e68eb848..34836ee29 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -770,7 +770,7 @@ static const unsigned opt_flags[] = {
 #if ENABLE_FEATURE_AUTOWIDTH
         0, 0,                       /* T, w - ignored */
 #endif
-#if ENABLE_SELINUX      
+#if ENABLE_SELINUX
         LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */
 #endif
         (1U<<31)
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 64cae965b..c08d2327c 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -118,7 +118,7 @@ DO_MOVE:
                                 copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS;
 #if ENABLE_SELINUX
                                 copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
-#endif                          
+#endif
                                 if ((copy_file(*argv, dest, copy_flag) >= 0) &&
                                         (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0)) {
                                         goto RET_0;
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 37a924057..a2cdbfb29 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -416,7 +416,7 @@ static int do_statfs(char const *filename, char const *format)
         format = (flags & OPT_TERSE
                         ? (flags & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n":
                         "%n %i %l %t %s %b %f %a %c %d\n")
-                        : (flags & OPT_SELINUX ? 
+                        : (flags & OPT_SELINUX ?
                         "  File: \"%n\"\n"
                         "    ID: %-8i Namelen: %-7l Type: %T\n"
                         "Block size: %-10s\n"
@@ -531,7 +531,7 @@ static int do_stat(char const *filename, char const *format)
                 }
 #else
                 if (flags & OPT_TERSE) {
-                        format = (flags & OPT_SELINUX ? 
+                        format = (flags & OPT_SELINUX ?
                                   "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n":
                                   "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n");
                 } else {
diff --git a/docs/cgi/env.html b/docs/cgi/env.html
index 961671aaa..924026b3e 100644
--- a/docs/cgi/env.html
+++ b/docs/cgi/env.html
@@ -16,7 +16,7 @@ The following environment variables are not request-specific and are
 set for all requests: </p><p>
 
 </p><ul>
-<li> <code>SERVER_SOFTWARE</code> <p> 
+<li> <code>SERVER_SOFTWARE</code> <p>
 
     The name and version of the information server software answering
     the request (and running the gateway). Format: name/version </p><p>
@@ -25,7 +25,7 @@ set for all requests: </p><p>
     The server's hostname, DNS alias, or IP address as it would appear
     in self-referencing URLs. </p><p>
 
-</p></li><li> <code>GATEWAY_INTERFACE</code> <p> 
+</p></li><li> <code>GATEWAY_INTERFACE</code> <p>
     The revision of the CGI specification to which this server
     complies. Format: CGI/revision</p><p>
 
@@ -48,7 +48,7 @@ fulfilled by the gateway program: <p>
     The method with which the request was made. For HTTP, this is
     "GET", "HEAD", "POST", etc. </p><p>
 
-</p></li><li> <code>PATH_INFO</code> <p> 
+</p></li><li> <code>PATH_INFO</code> <p>
     The extra path information, as given by the client. In other
     words, scripts can be accessed by their virtual pathname, followed
     by extra information at the end of this path. The extra
@@ -64,7 +64,7 @@ fulfilled by the gateway program: <p>
     A virtual path to the script being executed, used for
     self-referencing URLs. </p><p>
 
-</p></li><li> <a name="query"><code>QUERY_STRING</code></a> <p> 
+</p></li><li> <a name="query"><code>QUERY_STRING</code></a> <p>
     The information which follows the ? in the <a href="http://www.ncsa.uiuc.edu/demoweb/url-primer.html">URL</a>
     which referenced this script. This is the query information. It
     should not be decoded in any fashion. This variable should always
@@ -82,7 +82,7 @@ fulfilled by the gateway program: <p>
     protects, this is the protocol-specific authentication method used
     to validate the user. </p><p>
 
-</p></li><li> <code>REMOTE_USER</code> <p> 
+</p></li><li> <code>REMOTE_USER</code> <p>
     If the server supports user authentication, and the script is
     protected, this is the username they have authenticated as. </p><p>
 </p></li><li> <code>REMOTE_IDENT</code> <p>
diff --git a/docs/cgi/interface.html b/docs/cgi/interface.html
index 33f02881b..ea73ce3a2 100644
--- a/docs/cgi/interface.html
+++ b/docs/cgi/interface.html
@@ -12,7 +12,7 @@ The server and the CGI script communicate in four major ways. Each of
 the following is a hotlink to graphic detail.</p><p>
 
 </p><ul>
-<li> <a href="env.html">Environment variables</a> 
+<li> <a href="env.html">Environment variables</a>
 </li><li> <a href="cl.html">The command line</a>
 </li><li> <a href="in.html">Standard input</a>
 </li><li> <a href="out.html">Standard output</a>
diff --git a/docs/draft-coar-cgi-v11-03-clean.html b/docs/draft-coar-cgi-v11-03-clean.html
index 37835500c..d52c9b842 100644
--- a/docs/draft-coar-cgi-v11-03-clean.html
+++ b/docs/draft-coar-cgi-v11-03-clean.html
@@ -123,7 +123,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </P>
   <P>
   Discussion of this draft occurs on the CGI-WG mailing list; see the
-  project Web page at 
+  project Web page at
   <SAMP>&lt;URL:<A HREF="http://CGI-Spec.Golux.Com/"
                 >http://CGI-Spec.Golux.Com/</A>&gt;</SAMP>
   for details on the mailing list and the status of the project.
@@ -410,17 +410,17 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </H3>
   <P>
   Together the HTTP [<A HREF="#[3]">3</A>,<A HREF="#[8]">8</A>] server
-  and the CGI script are responsible 
+  and the CGI script are responsible
   for servicing a client
   request by sending back responses. The client
   request comprises a Universal Resource Identifier (URI)
-  [<A HREF="#[1]">1</A>], a 
+  [<A HREF="#[1]">1</A>], a
   request method, and various ancillary
   information about the request
   provided by the transport mechanism.
   </P>
   <P>
-  The CGI defines the abstract parameters, known as 
+  The CGI defines the abstract parameters, known as
   metavariables,
   which describe the client's
   request. Together with a
@@ -435,7 +435,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </H3>
   <P>
   This specification uses the same words as RFC 1123
-  [<A HREF="#[5]">5</A>] to define the 
+  [<A HREF="#[5]">5</A>] to define the
   significance of each particular requirement. These are:
   </P><!--#if expr="! $GUI" -->
   <P></P><!--#endif -->
@@ -478,7 +478,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   all of the 'should' requirements for its features is said to be
   'conditionally compliant.'
   </P>
-  
+
   <H3>
    <A NAME="1.3">
     1.3. Specifications
@@ -514,7 +514,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     </P>
    </DD>
   </DL>
-  
+
   <H3>
    <A NAME="1.4">
     1.4. Terminology
@@ -523,11 +523,11 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   This specification uses many terms defined in the HTTP/1.1
   specification [<A HREF="#[8]">8</A>]; however, the following terms are
-  used here in a 
+  used here in a
   sense which may not accord with their definitions in that document,
   or with their common meaning.
   </P>
-  
+
   <DL>
    <DT><EM>metavariable</EM>
    </DT>
@@ -538,13 +538,13 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     environment, although that is the most common implementation.
     </P>
    </DD>
-  
+
    <DT><EM>script</EM>
    </DT>
    <DD>
     <P>
     The software which is invoked by the server <EM>via</EM> this
-    interface. It 
+    interface. It
     need not be a standalone program, but could be a
     dynamically-loaded or shared library, or even a subroutine in the
     server.  It <EM>may</EM> be a set of statements
@@ -562,7 +562,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     </P>
    </DD>
   </DL>
-  
+
   <H2>
    <A NAME="2.0">
     2. Notational Conventions and Generic Grammar
@@ -632,7 +632,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     </P>
    </DD>
   </DL>
-  
+
   <H3>
    <A NAME="2.2">
     2.2. Basic Rules
@@ -687,7 +687,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Note that newline (NL) need not be a single character, but can be a
   character sequence.
   </P>
-  
+
   <H2>
    <A NAME="3.0">
     3. Protocol Parameters
@@ -730,7 +730,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   2396 [<A HREF="#[4]">4</A>]
   for authoritative treatment of this issue.
   </P>
-  
+
   <H3>
    <A NAME="3.2">
     3.2. The Script-URI
@@ -739,7 +739,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   The 'Script-URI' is defined as the URI of the resource identified
   by the metavariables.   Often,
-  this URI will be the same as 
+  this URI will be the same as
   the URI requested by the client (the 'Client-URI'); however, it need
   not be. Instead, it could be a URI invented by the server, and so it
   can only be used in the context of the server and its CGI interface.
@@ -747,7 +747,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   The Script-URI has the syntax of generic-RL as defined in section 2.1
   of RFC 1808 [<A HREF="#[7]">7</A>], with the exception that object
-  parameters and 
+  parameters and
   fragment identifiers are not permitted:
   </P><!--#if expr="! $GUI" -->
   <P></P><!--#endif -->
@@ -783,7 +783,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   for the script to reconstruct this, and therefore
   the Script-URI includes the base protocol used.
   </P>
-  
+
   <H2>
    <A NAME="4.0">
     4. Invoking the Script
@@ -795,7 +795,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   otherwise, the file containing the script will be invoked as an
   executable program.
   </P>
-  
+
   <H2>
    <A NAME="5.0">
     5. The CGI Script Command Line
@@ -807,7 +807,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   This is identified by a "GET" or "HEAD" HTTP request with a URL
   query
   string not containing any unencoded "=" characters. For such a
-  request, 
+  request,
   servers SHOULD parse the search string
   into words, using the following rules:
   </P><!--#if expr="! $GUI" -->
@@ -862,12 +862,12 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   Each CGI server
   implementation MUST define a mechanism
-  to pass data about the request from 
+  to pass data about the request from
   the server to the script.
   The metavariables containing these
   data
   are accessed by the script in a system
-  defined manner. 
+  defined manner.
   The
   representation of the characters in the
   metavariables is
@@ -935,7 +935,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
    </A>
   </H4>
   <P>
-  This variable is specific to requests made 
+  This variable is specific to requests made
   <EM>via</EM> the
   "<CODE>http</CODE>"
   scheme.
@@ -943,10 +943,10 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   If the Script-URI
   required access authentication for external
-  access, then the server 
+  access, then the server
   MUST set
   the value of
-  this variable 
+  this variable
   from the '<SAMP>auth-scheme</SAMP>' token in
   the request's "<SAMP>Authorization</SAMP>" header
   field.
@@ -962,7 +962,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   HTTP access authentication schemes are described in section 11 of the
   HTTP/1.1 specification [<A HREF="#[8]">8</A>]. The auth-scheme is
-  not case-sensitive. 
+  not case-sensitive.
   </P>
   <P>
   Servers
@@ -1018,7 +1018,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   entity if the type was provided <EM>via</EM>
   a "<SAMP>Content-type</SAMP>" field in the
   request header, or if the server can determine it in the absence
-  of a supplied "<SAMP>Content-type</SAMP>" field. The syntax is the 
+  of a supplied "<SAMP>Content-type</SAMP>" field. The syntax is the
   same as for the HTTP
   "<SAMP>Content-Type</SAMP>" header field.
   </P><!--#if expr="! $GUI" -->
@@ -1053,7 +1053,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   the data received. If the type remains unknown, then
   the script MAY choose to either assume a
   content-type of
-  <SAMP>application/octet-stream</SAMP> 
+  <SAMP>application/octet-stream</SAMP>
   or reject the request with  a 415 ("Unsupported Media Type")
   error.  See <A HREF="#7.2.1.3">section 7.2.1.3</A>
   for more information about returning error status values.
@@ -1091,7 +1091,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </PRE>
   <P>
   Note that the major and minor numbers are treated as separate
-  integers and hence each may be 
+  integers and hence each may be
   more than a single
   digit. Thus CGI/2.4 is a lower version than CGI/2.13 which in turn
   is lower than CGI/12.3. Leading zeros in either
@@ -1114,10 +1114,10 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </H4>
   <P>
   These metavariables are specific to
-  the protocol 
+  the protocol
   <EM>via</EM> which the request is made.
-  Interpretation of these variables depends on the value of 
-  the 
+  Interpretation of these variables depends on the value of
+  the
   SERVER_PROTOCOL
   metavariable
   (see
@@ -1158,7 +1158,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   the request
   header fields that they
   receive. In particular,
-  they MAY 
+  they MAY
   decline to make available any
   header fields carrying authentication information, such as
   "<SAMP>Authorization</SAMP>", or
@@ -1188,7 +1188,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   (defined in
   RFC 2396
   [<A HREF="#[4]">4</A>]), with the exception
-  that a PATH_INFO of "/" 
+  that a PATH_INFO of "/"
   represents a single void path segment.
   </P><!--#if expr="! $GUI" -->
   <P></P><!--#endif -->
@@ -1202,7 +1202,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   The PATH_INFO string is the trailing part of the &lt;path&gt; component of
   the Script-URI
   (see <A HREF="#3.2">section 3.2</A>)
-  that follows the SCRIPT_NAME 
+  that follows the SCRIPT_NAME
   portion of the path.
   </P>
   <P>
@@ -1285,7 +1285,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   case of the original segment through the translation.
   </P>
   <P>
-  The 
+  The
   translation
   algorithm the server uses to derive PATH_TRANSLATED is
   implementation defined; CGI scripts which use this variable may
@@ -1303,7 +1303,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
    </A>
   </H4>
   <P>
-  A URL-encoded 
+  A URL-encoded
   string; the &lt;query&gt; part of the
   Script-URI.
   (See
@@ -1371,7 +1371,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers SHOULD provide this information to
   scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.11">
     6.1.11. REMOTE_IDENT
@@ -1398,7 +1398,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers MAY supply this information to scripts if the
   RFC1413 [<A HREF="#[11]">11</A>] lookup is performed.
   </P>
-  
+
   <H4>
    <A NAME="6.1.12">
     6.1.12. REMOTE_USER
@@ -1426,7 +1426,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers SHOULD provide this metavariable
   to scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.13">
     6.1.13. REQUEST_METHOD
@@ -1438,7 +1438,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   is set to the
   method with which the request was made, as described in section
   5.1.1 of the HTTP/1.0 specification [<A HREF="#[3]">3</A>] and
-  section 5.1.1 of the 
+  section 5.1.1 of the
   HTTP/1.1 specification [<A HREF="#[8]">8</A>].
   </P><!--#if expr="! $GUI" -->
   <P></P><!--#endif -->
@@ -1449,7 +1449,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     extension-method = token
   </PRE>
   <P>
-  The method is case sensitive. 
+  The method is case sensitive.
   CGI/1.1 servers MAY choose to process some methods
   directly rather than passing them to scripts.
   </P>
@@ -1460,7 +1460,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers MUST provide this metavariable
   to scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.14">
     6.1.14. SCRIPT_NAME
@@ -1494,7 +1494,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers MUST provide this metavariable
   to scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.15">
     6.1.15. SERVER_NAME
@@ -1505,7 +1505,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   metavariable
   is set to the
   name  of the
-  server, as 
+  server, as
   derived from the &lt;host&gt; part of the
   Script-URI
   (see <A HREF="#3.2">section 3.2</A>).
@@ -1544,7 +1544,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers MUST provide this metavariable
   to scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.17">
     6.1.17. SERVER_PROTOCOL
@@ -1589,7 +1589,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Servers MUST provide this metavariable
   to scripts.
   </P>
-  
+
   <H4>
    <A NAME="6.1.18">
     6.1.18. SERVER_SOFTWARE
@@ -1641,7 +1641,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   For non-parsed header (NPH) scripts (see
   <A HREF="#7.1">section 7.1</A>
-  below), 
+  below),
   servers SHOULD
   attempt to ensure that the data
   supplied to the script are precisely
@@ -1705,7 +1705,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   internal and no transport-visible
   buffering.
   </P>
-  
+
   <H3>
    <A NAME="7.2">
     7.2. Parsed Header Output
@@ -1790,7 +1790,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   a member of the "one of these is required" set of header
   fields.
   </P>
-  
+
   <H4>
    <A NAME="7.2.1.2">
     7.2.1.2. Location
@@ -1819,7 +1819,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   value is either an absolute URI with optional fragment,
   as defined in RFC 1630 [<A HREF="#[1]">1</A>], or an absolute path
   within the server's URI space (<EM>i.e.</EM>,
-  omitting the scheme and network-related fields) and optional 
+  omitting the scheme and network-related fields) and optional
   query-string. If an absolute URI is returned by the script,
   then the
   server MUST generate a
@@ -1867,7 +1867,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   The valid status codes are listed in section 6.1.1 of the HTTP/1.0
   specifications [<A HREF="#[3]">3</A>]. If the SERVER_PROTOCOL is
   "HTTP/1.1", then the status codes defined in the HTTP/1.1
-  specification [<A HREF="#[8]">8</A>] may 
+  specification [<A HREF="#[8]">8</A>] may
   be used. If the script does not return a "<SAMP>Status</SAMP>" header
   field, then "200 OK" SHOULD be assumed by the server.
   </P>
@@ -1879,7 +1879,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   SHOULD include a "Status:&nbsp;404&nbsp;Not&nbsp;Found" in the
   header data returned to the server.
   </P>
-  
+
   <H4>
    <A NAME="7.2.1.4">
     7.2.1.4. Extension header fields
@@ -1941,7 +1941,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   </H3>
   <P>
   Servers MUST support the standard mechanism (described below) which
-  allows 
+  allows
   script authors to determine
   what URL to use in documents
   which reference the script;
@@ -1951,11 +1951,11 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   mechanism is as follows:
   </P>
   <P>
-  The server 
+  The server
   MUST translate the header data from the CGI header field syntax to
   the HTTP
   header field syntax if these differ. For example, the character
-  sequence for 
+  sequence for
   newline (such as Unix's ASCII NL) used by CGI scripts may not be the
   same as that used by HTTP (ASCII CR followed by LF). The server MUST
   also resolve any conflicts between header fields returned by the script
@@ -2052,7 +2052,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
    </LI>
    <LI>define the behaviour for <SAMP>"."</SAMP> or <SAMP>".."</SAMP> path
     segments; <EM>i.e.</EM>, whether they are prohibited, treated as
-    ordinary path 
+    ordinary path
     segments or interpreted in accordance with the relative URL
     specification [<A HREF="#[7]">7</A>];
    </LI>
@@ -2143,7 +2143,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
 
   <H2>
    <A NAME="9.0">
-    9. 
+    9.
     Script Implementation
    </A>
   </H2>
@@ -2219,7 +2219,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Found' if PATH_INFO is not NULL.
   </P>
   <P>
-  If a script is processing the output of a form, it SHOULD 
+  If a script is processing the output of a form, it SHOULD
   verify that the CONTENT_TYPE
   is "<SAMP>application/x-www-form-urlencoded</SAMP>" [<A HREF="#[2]">2</A>]
   or whatever other media type is expected.
@@ -2231,12 +2231,12 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   of void path segments ("<SAMP>//</SAMP>") and special path segments
   (<SAMP>"."</SAMP> and
   <SAMP>".."</SAMP>). They SHOULD either be removed from the path before
-  use in OS 
+  use in OS
   system calls, or the request SHOULD be rejected with
   '404 Not Found'.
   </P>
   <P>
-  As it is impossible for 
+  As it is impossible for
   scripts to determine the client URI that
   initiated  a
   request without knowledge of the specific server in
@@ -2246,7 +2246,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   tag in the document.
   </P>
   <P>
-  When returning header fields, 
+  When returning header fields,
   scripts SHOULD try to send the CGI
   header fields (see section
   <A HREF="#7.2">7.2</A>) as soon as possible, and
@@ -2254,7 +2254,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   before any HTTP header fields. This may
   help reduce the server's memory requirements.
   </P>
-  
+
   <H2>
    <A NAME="10.0">
     10. System Specifications
@@ -2300,7 +2300,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     </P>
    </DD>
   </DL>
-  
+
   <H3>
    <A NAME="10.2">
     10.2. Unix
@@ -2356,7 +2356,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     </P>
    </DD>
   </DL>
-  
+
   <H2>
    <A NAME="11.0">
     11. Security Considerations
@@ -2371,7 +2371,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   <P>
   As discussed in the security considerations of the HTTP
   specifications [<A HREF="#[3]">3</A>,<A HREF="#[8]">8</A>], the
-  convention has been established that the 
+  convention has been established that the
   GET and HEAD methods should be 'safe'; they should cause no
   side-effects and only have the significance of resource retrieval.
   </P>
@@ -2386,7 +2386,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   requests are those that may be repeated an arbitrary number of times
   and produce side effects identical to a single request.
   </P>
-  
+
   <H3>
    <A NAME="11.2">
     11.2. HTTP Header
@@ -2410,7 +2410,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   HTTP_PROXY_AUTHORIZATION
   metavariable.
   </P>
-  
+
   <H3>
    <A NAME="11.3">
     11.3. Script
@@ -2429,7 +2429,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   SHOULD be taken to protect the core memory of the server, or to
   ensure that untrusted code cannot be executed.
   </P>
-  
+
   <H3>
    <A NAME="11.4">
     11.4. Data Length and Buffering Considerations
@@ -2504,7 +2504,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
   Patrick M<SUP>c</SUP>Manus, Adam Donahue,
   Ross Patterson, and Harald Alvestrand.
   </P>
-  
+
   <H2>
    <A NAME="13.0">
     13. References
@@ -2554,7 +2554,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
    </DD>
    <DT><A NAME="[6]">[6]</A>
    </DT>
-   <DD>Crocker, D.H., 'Standard for the Format of ARPA Internet Text 
+   <DD>Crocker, D.H., 'Standard for the Format of ARPA Internet Text
           Messages', STD 11, RFC 822, University of Delaware, August 1982.
        <P>
        </P>
@@ -2614,7 +2614,7 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
        </P>
    </DD>
   </DL>
-  
+
   <H2>
    <A NAME="14.0">
     14. Authors' Addresses
@@ -2669,6 +2669,6 @@ INTERNET-DRAFT             Expires 1 December 1998                    [Page 2]
     HREF="mailto:drtr@etrade.co.uk"
    ><SAMP>drtr@etrade.co.uk</SAMP></A>
   </ADDRESS>
-  
+
  </BODY>
 </HTML>
diff --git a/include/libbb.h b/include/libbb.h
index 91d458f50..659bfcaa7 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -518,8 +518,8 @@ int chown_main(int argc, char **argv);
 int gunzip_main(int argc, char **argv);
 #endif
 int bbunpack(char **argv,
-        char* (*make_new_name)(char *filename),
-        USE_DESKTOP(long long) int (*unpacker)(void)
+        char* (*make_new_name)(char *filename),
+        USE_DESKTOP(long long) int (*unpacker)(void)
 );
 
 
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 58d657b02..7d85920d9 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -250,11 +250,11 @@ int copy_file(const char *source, const char *dest, int flags)
                     || (flags & FILEUTILS_SET_SECURITY_CONTEXT))
                  && is_selinux_enabled() > 0
                 ) {
-                        security_context_t con;  
+                        security_context_t con;
                         if (getfscreatecon(&con) == -1) {
                                 bb_perror_msg("getfscreatecon");
                                 return -1;
-                        }                               
+                        }
                         if (con) {
                                 if(setfilecon(dest, con) == -1) {
                                         bb_perror_msg("setfilecon:%s,%s", dest, con);
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index d506f0636..4cb85f00f 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -1,7 +1,7 @@
 /*
  * libbb/selinux_common.c
  *   -- common SELinux utility functions
- * 
+ *
  * Copyright 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
  */
 #include "busybox.h"
diff --git a/miscutils/less.c b/miscutils/less.c
index a7041552d..b81430d07 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -51,7 +51,7 @@ enum {
         REAL_KEY_HOME = '7', // vt100? linux vt? or what?
         REAL_KEY_END = '8',
         REAL_KEY_HOME_ALT = '1', // ESC [1~ (vt100? linux vt? or what?)
-        REAL_KEY_END_ALT = '4', // ESC [4~ 
+        REAL_KEY_END_ALT = '4', // ESC [4~
         REAL_KEY_HOME_XTERM = 'H',
         REAL_KEY_END_XTERM = 'F',
 
diff --git a/selinux/chcon.c b/selinux/chcon.c
index de077c380..72cfa93c3 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -2,7 +2,7 @@
  * chcon -- change security context, based on coreutils-5.97-13
  *
  * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp>
- * 
+ *
  * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
  */
 #include "busybox.h"
diff --git a/shell/ash_test/ash-arith/arith-for.right b/shell/ash_test/ash-arith/arith-for.right
index 44941103f..88dbc15fa 100644
--- a/shell/ash_test/ash-arith/arith-for.right
+++ b/shell/ash_test/ash-arith/arith-for.right
@@ -11,8 +11,8 @@
 2
 4
 fx is a function
-fx () 
-{ 
+fx ()
+{
     i=0;
     for ((1; i < 3; i++ ))
     do
diff --git a/shell/ash_test/ash-arith/arith-for.testsx b/shell/ash_test/ash-arith/arith-for.testsx
index 585aa5133..4fa30ff90 100755
--- a/shell/ash_test/ash-arith/arith-for.testsx
+++ b/shell/ash_test/ash-arith/arith-for.testsx
@@ -73,7 +73,7 @@ done
 type fx
 fx
 
-# errors 
+# errors
 for (( i=0; "i < 3" ))
 do
         echo $i
diff --git a/shell/ash_test/ash-arith/arith.tests b/shell/ash_test/ash-arith/arith.tests
index 272fc3487..d65758e7d 100755
--- a/shell/ash_test/ash-arith/arith.tests
+++ b/shell/ash_test/ash-arith/arith.tests
@@ -144,12 +144,12 @@ echo 40 $(( 8 ^ 32 ))
 #ash# echo 10 $(( 32#a ))
 #ash# echo 10 $(( 56#a ))
 #ash# echo 10 $(( 64#a ))
-#ash# 
+#ash#
 #ash# echo 10 $(( 16#A ))
 #ash# echo 10 $(( 32#A ))
 #ash# echo 36 $(( 56#A ))
 #ash# echo 36 $(( 64#A ))
-#ash# 
+#ash#
 #ash# echo 62 $(( 64#@ ))
 #ash# echo 63 $(( 64#_ ))
 
diff --git a/shell/ash_test/ash-heredoc/heredoc.tests b/shell/ash_test/ash-heredoc/heredoc.tests
index 31316a58d..b3cdc3f7b 100755
--- a/shell/ash_test/ash-heredoc/heredoc.tests
+++ b/shell/ash_test/ash-heredoc/heredoc.tests
@@ -1,6 +1,6 @@
 # check order and content of multiple here docs
 
-cat << EOF1 << EOF2 
+cat << EOF1 << EOF2
 hi
 EOF1
 there
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index ba1756e7d..02f6d2a9d 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -18,7 +18,7 @@ do_test()
     cd "$1" || { echo "cannot cd $1!"; exit 1; }
     for x in run-*; do
         test -f "$x" || continue
-        case "$x" in 
+        case "$x" in
             "$0"|run-minimal|run-gprof) ;;
             *.orig|*~) ;;
             #*) echo $x ; sh $x ;;
diff --git a/shell/msh.c b/shell/msh.c
index 89c375380..41f4cc60d 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -50,36 +50,36 @@ static char *find_applet_by_name(const char *applet)
 }
 static void utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 {
-    unsigned i, out, res;
-    assert(sizeof(unsigned) == 4);
-    if (buflen) {
-        out = 0;
-        for (i = 1000000000; i; i /= 10) {
-            res = n / i;
-            if (res || out || i == 1) {
-                if (!--buflen) break;
-                out++;
-                n -= res*i;
-                *buf++ = '0' + res;
-            }
-        }
-        *buf = '\0';
-    }
+        unsigned i, out, res;
+        assert(sizeof(unsigned) == 4);
+        if (buflen) {
+                out = 0;
+                for (i = 1000000000; i; i /= 10) {
+                        res = n / i;
+                        if (res || out || i == 1) {
+                                if (!--buflen) break;
+                                out++;
+                                n -= res*i;
+                                *buf++ = '0' + res;
+                        }
+                }
+                *buf = '\0';
+        }
 }
 static void itoa_to_buf(int n, char *buf, unsigned buflen)
 {
-    if (buflen && n<0) {
-        n = -n;
-        *buf++ = '-';
-        buflen--;
-    }
-    utoa_to_buf((unsigned)n, buf, buflen);
+        if (buflen && n < 0) {
+                n = -n;
+                *buf++ = '-';
+                buflen--;
+        }
+        utoa_to_buf((unsigned)n, buf, buflen);
 }
 static char local_buf[12];
 static char *itoa(int n)
 {
-    itoa_to_buf(n, local_buf, sizeof(local_buf));
-    return local_buf;
+        itoa_to_buf(n, local_buf, sizeof(local_buf));
+        return local_buf;
 }
 #else
 # include <setjmp.h>
diff --git a/testsuite/bunzip2.tests b/testsuite/bunzip2.tests
index 486122174..2b27dd56b 100755
--- a/testsuite/bunzip2.tests
+++ b/testsuite/bunzip2.tests
@@ -73,7 +73,7 @@ HELLO
 prep; >t1; check "$unpack: already exists" "${bb}$unpack t1.$ext t2.$ext; echo \$?; cat t1 t2"
 
 
-# From old testsuite 
+# From old testsuite
 expected="HELLO\n0\n"
 prep; check "$unpack: stream unpack" "cat t1.$ext | ${bb}$unpack; echo $?"
 
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index dbb342886..afb8459a2 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -284,7 +284,7 @@ struct bsd_globals {
 static struct bsd_globals *bsd_globals_ptr;
 
 #define disklabelbuffer (bsd_globals_ptr->disklabelbuffer)
-#define xbsd_dlabel     (bsd_globals_ptr->xbsd_dlabel) 
+#define xbsd_dlabel     (bsd_globals_ptr->xbsd_dlabel)
 
 
 /* Code */