Merge branch 'origin/master' (early part)

10 files changed, 19 insertions, 24 deletions

diff --git a/docs/busybox_footer.pod b/docs/busybox_footer.pod
index 5ed937991..47eabaeeb 100644
--- a/docs/busybox_footer.pod
+++ b/docs/busybox_footer.pod
@@ -253,4 +253,3 @@ Tito Ragusa <farmatito@tiscali.it>
     devfsd and size optimizations in strings, openvt and deallocvt.
 
 =cut
-
diff --git a/docs/busybox_header.pod b/docs/busybox_header.pod
index 2a99636b1..85a173e82 100644
--- a/docs/busybox_header.pod
+++ b/docs/busybox_header.pod
@@ -80,4 +80,3 @@ been enabled, more detailed usage information will also be available.
 =head1 COMMANDS
 
 Currently available applets include:
-
diff --git a/docs/cgi/cl.html b/docs/cgi/cl.html
index 5779d623e..4f8faae9f 100644
--- a/docs/cgi/cl.html
+++ b/docs/cgi/cl.html
@@ -43,4 +43,4 @@ CGI - Common Gateway Interface
 </p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/cgi/env.html b/docs/cgi/env.html
index 924026b3e..b83c750bf 100644
--- a/docs/cgi/env.html
+++ b/docs/cgi/env.html
@@ -146,4 +146,4 @@ interface specification</a> <p>
 CGI - Common Gateway Interface
 </p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/cgi/in.html b/docs/cgi/in.html
index 679306aaa..7ee5fe601 100644
--- a/docs/cgi/in.html
+++ b/docs/cgi/in.html
@@ -30,4 +30,4 @@ interface specification</a> <p>
 CGI - Common Gateway Interface
 </p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/cgi/interface.html b/docs/cgi/interface.html
index ea73ce3a2..0be016b4c 100644
--- a/docs/cgi/interface.html
+++ b/docs/cgi/interface.html
@@ -26,4 +26,4 @@ the following is a hotlink to graphic detail.</p><p>
 
 CGI - Common Gateway Interface
 </p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/cgi/out.html b/docs/cgi/out.html
index 2203ee5a0..5266985b5 100644
--- a/docs/cgi/out.html
+++ b/docs/cgi/out.html
@@ -123,4 +123,4 @@ interface specification</a> <p>
 
 CGI - Common Gateway Interface
 </p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/contributing.txt b/docs/contributing.txt
index d06e4a2da..39aaef1b5 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -426,5 +426,3 @@ you're having difficulty following some of the steps outlined in this
 document don't worry, the folks on the Busybox mailing list are a fairly
 good-natured bunch and will work with you to help get your patches into shape
 or help you make contributions.
-
-
diff --git a/docs/ifupdown_design.txt b/docs/ifupdown_design.txt
index 8008e4507..8ab4e51ad 100644
--- a/docs/ifupdown_design.txt
+++ b/docs/ifupdown_design.txt
@@ -10,27 +10,27 @@ for that.
 We are doomed to have problems with ifup/ifdown. Just look as this code:
 
 static const struct dhcp_client_t ext_dhcp_clients[] = {
-       { "dhcpcd", "<up cmd>", "<down cmd>" },
-       { "dhclient", ........ },
-       { "pump", ........ },
-       { "udhcpc", ........ },
+        { "dhcpcd", "<up cmd>", "<down cmd>" },
+        { "dhclient", ........ },
+        { "pump", ........ },
+        { "udhcpc", ........ },
 };
 
 static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
 #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-       int i ;
-       for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
-               if (exists_execable(ext_dhcp_clients[i].name))
-                       return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
-       }
-       bb_error_msg("no dhcp clients found, using static interface shutdown");
-       return static_down(ifd, exec);
+        int i ;
+        for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
+                if (exists_execable(ext_dhcp_clients[i].name))
+                        return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
+        }
+        bb_error_msg("no dhcp clients found, using static interface shutdown");
+        return static_down(ifd, exec);
 #elif ENABLE_UDHCPC
-       return execute("kill "
-                      "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+        return execute("kill "
+                        "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
 #else
-       return 0; /* no dhcp support */
+        return 0; /* no dhcp support */
 #endif
 }
 
diff --git a/docs/posix_conformance.txt b/docs/posix_conformance.txt
index d9fa116b8..5b616d701 100644
--- a/docs/posix_conformance.txt
+++ b/docs/posix_conformance.txt
@@ -739,4 +739,3 @@ xargs Busybox specific options:
 
 zcat POSIX options: None
 zcat Busybox specific options: None
-