aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-26 01:49:12 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-26 01:49:12 +0200
commitba2dcccd799963ac74ee92300df494947820608b (patch)
treee27140083f1f4faebe86cde97a3dabbff5ac7f9e
parent0f8960542f6f5ae258e72e56ba7296a01a9c10af (diff)
downloadbusybox-w32-ba2dcccd799963ac74ee92300df494947820608b.tar.gz
busybox-w32-ba2dcccd799963ac74ee92300df494947820608b.tar.bz2
busybox-w32-ba2dcccd799963ac74ee92300df494947820608b.zip
*: trailing empty lines removed
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libunarchive/unxz/README1
-rw-r--r--debianutils/Config.src1
-rw-r--r--docs/busybox_footer.pod1
-rw-r--r--docs/cgi/cl.html2
-rw-r--r--docs/cgi/env.html2
-rw-r--r--docs/cgi/in.html2
-rw-r--r--docs/cgi/interface.html2
-rw-r--r--docs/cgi/out.html2
-rw-r--r--docs/contributing.txt2
-rw-r--r--docs/posix_conformance.txt1
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.h2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2p/ostype.c2
-rw-r--r--examples/bootfloppy/display.txt1
-rw-r--r--examples/bootfloppy/etc/fstab1
-rw-r--r--examples/bootfloppy/etc/inittab1
-rw-r--r--examples/bootfloppy/etc/profile1
-rwxr-xr-xexamples/bootfloppy/mkrootfs.sh1
-rw-r--r--examples/inittab1
-rw-r--r--init/reboot.h1
-rw-r--r--libbb/README1
-rw-r--r--libbb/selinux_common.c1
-rw-r--r--networking/libiproute/ll_proto.c1
-rw-r--r--scripts/Makefile.host1
-rw-r--r--scripts/Makefile.lib2
-rw-r--r--scripts/basic/docproc.c1
-rwxr-xr-xscripts/find_stray_empty_lines10
-rwxr-xr-xscripts/kconfig/check.sh1
-rw-r--r--scripts/kconfig/lex.zconf.c_shipped1
-rw-r--r--scripts/kconfig/menu.c1
-rw-r--r--scripts/kconfig/util.c1
-rw-r--r--scripts/kconfig/zconf.hash.c_shipped1
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped2
-rwxr-xr-xscripts/showasm1
-rw-r--r--selinux/Config.src1
-rwxr-xr-xshell/hush_test/hush-misc/break1.tests1
-rw-r--r--sysklogd/Config.src1
-rw-r--r--testsuite/basename/basename-works1
-rw-r--r--testsuite/dirname/dirname-works1
-rw-r--r--testsuite/expr/expr-works1
-rw-r--r--testsuite/ln/ln-preserves-soft-links1
-rwxr-xr-xtestsuite/readlink.tests1
-rw-r--r--testsuite/uptime/uptime-works1
42 files changed, 15 insertions, 46 deletions
diff --git a/archival/libunarchive/unxz/README b/archival/libunarchive/unxz/README
index f79b0a404..c5972f6b8 100644
--- a/archival/libunarchive/unxz/README
+++ b/archival/libunarchive/unxz/README
@@ -133,4 +133,3 @@ Specifying the calling convention
133 For example, on Windows, you may make all functions use the stdcall 133 For example, on Windows, you may make all functions use the stdcall
134 calling convention by defining XZ_FUNC=__stdcall when building and 134 calling convention by defining XZ_FUNC=__stdcall when building and
135 using the functions from XZ Embedded. 135 using the functions from XZ Embedded.
136
diff --git a/debianutils/Config.src b/debianutils/Config.src
index 838d8f00c..cbc09b5ce 100644
--- a/debianutils/Config.src
+++ b/debianutils/Config.src
@@ -83,4 +83,3 @@ config WHICH
83 print out their pathnames. 83 print out their pathnames.
84 84
85endmenu 85endmenu
86
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>
253 devfsd and size optimizations in strings, openvt and deallocvt. 253 devfsd and size optimizations in strings, openvt and deallocvt.
254 254
255=cut 255=cut
256
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
43</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address> 43</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
44 44
45 45
46</body></html> \ No newline at end of file 46</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>
146CGI - Common Gateway Interface 146CGI - Common Gateway Interface
147</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address> 147</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
148 148
149</body></html> \ No newline at end of file 149</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>
30CGI - Common Gateway Interface 30CGI - Common Gateway Interface
31</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address> 31</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
32 32
33</body></html> \ No newline at end of file 33</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>
26 26
27CGI - Common Gateway Interface 27CGI - Common Gateway Interface
28</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address> 28</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
29</body></html> \ No newline at end of file 29</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>
123 123
124CGI - Common Gateway Interface 124CGI - Common Gateway Interface
125</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address> 125</p><address><a href="http://hoohoo.ncsa.uiuc.edu/cgi/mailtocgi.html">cgi@ncsa.uiuc.edu</a></address>
126</body></html> \ No newline at end of file 126</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
426document don't worry, the folks on the Busybox mailing list are a fairly 426document don't worry, the folks on the Busybox mailing list are a fairly
427good-natured bunch and will work with you to help get your patches into shape 427good-natured bunch and will work with you to help get your patches into shape
428or help you make contributions. 428or help you make contributions.
429
430
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:
739 739
740zcat POSIX options: None 740zcat POSIX options: None
741zcat Busybox specific options: None 741zcat Busybox specific options: None
742
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.h b/e2fsprogs/old_e2fsprogs/e2fsck.h
index 73d398ff4..fdfa2d84a 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.h
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.h
@@ -636,5 +636,3 @@ static inline int tid_geq(tid_t x, tid_t y)
636 int difference = (x - y); 636 int difference = (x - y);
637 return (difference >= 0); 637 return (difference >= 0);
638} 638}
639
640
diff --git a/e2fsprogs/old_e2fsprogs/e2p/ostype.c b/e2fsprogs/old_e2fsprogs/e2p/ostype.c
index 1abe2ba91..6a2f178f3 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/ostype.c
+++ b/e2fsprogs/old_e2fsprogs/e2p/ostype.c
@@ -70,5 +70,3 @@ int main(int argc, char **argv)
70 exit(0); 70 exit(0);
71} 71}
72#endif 72#endif
73
74
diff --git a/examples/bootfloppy/display.txt b/examples/bootfloppy/display.txt
index 399d326d9..7cae48bb3 100644
--- a/examples/bootfloppy/display.txt
+++ b/examples/bootfloppy/display.txt
@@ -1,4 +1,3 @@
1 1
2This boot floppy is made with Busybox, uClibc, and the Linux kernel. 2This boot floppy is made with Busybox, uClibc, and the Linux kernel.
3Hit RETURN to boot or enter boot parameters at the prompt below. 3Hit RETURN to boot or enter boot parameters at the prompt below.
4
diff --git a/examples/bootfloppy/etc/fstab b/examples/bootfloppy/etc/fstab
index ef14ca2cc..b31f60217 100644
--- a/examples/bootfloppy/etc/fstab
+++ b/examples/bootfloppy/etc/fstab
@@ -1,2 +1 @@
1proc /proc proc defaults 0 0 proc /proc proc defaults 0 0
2
diff --git a/examples/bootfloppy/etc/inittab b/examples/bootfloppy/etc/inittab
index eb3e979ce..1ac9f68ce 100644
--- a/examples/bootfloppy/etc/inittab
+++ b/examples/bootfloppy/etc/inittab
@@ -2,4 +2,3 @@
2::respawn:-/bin/sh 2::respawn:-/bin/sh
3tty2::askfirst:-/bin/sh 3tty2::askfirst:-/bin/sh
4::ctrlaltdel:/bin/umount -a -r 4::ctrlaltdel:/bin/umount -a -r
5
diff --git a/examples/bootfloppy/etc/profile b/examples/bootfloppy/etc/profile
index 8a7c77d78..cf68d3393 100644
--- a/examples/bootfloppy/etc/profile
+++ b/examples/bootfloppy/etc/profile
@@ -5,4 +5,3 @@ echo -n "Processing /etc/profile... "
5# no-op 5# no-op
6echo "Done" 6echo "Done"
7echo 7echo
8
diff --git a/examples/bootfloppy/mkrootfs.sh b/examples/bootfloppy/mkrootfs.sh
index 5cdff21a0..a7fc48b13 100755
--- a/examples/bootfloppy/mkrootfs.sh
+++ b/examples/bootfloppy/mkrootfs.sh
@@ -102,4 +102,3 @@ then
102 rmdir $TARGET_DIR 102 rmdir $TARGET_DIR
103 gzip -9 rootfs 103 gzip -9 rootfs
104fi 104fi
105
diff --git a/examples/inittab b/examples/inittab
index 64fc4fce1..c4e0af514 100644
--- a/examples/inittab
+++ b/examples/inittab
@@ -87,4 +87,3 @@ tty5::respawn:/sbin/getty 38400 tty6
87::ctrlaltdel:/sbin/reboot 87::ctrlaltdel:/sbin/reboot
88::shutdown:/bin/umount -a -r 88::shutdown:/bin/umount -a -r
89::shutdown:/sbin/swapoff -a 89::shutdown:/sbin/swapoff -a
90
diff --git a/init/reboot.h b/init/reboot.h
index ff045fdd1..949763949 100644
--- a/init/reboot.h
+++ b/init/reboot.h
@@ -28,4 +28,3 @@
28# define RB_POWER_OFF RB_HALT_SYSTEM 28# define RB_POWER_OFF RB_HALT_SYSTEM
29# endif 29# endif
30#endif 30#endif
31
diff --git a/libbb/README b/libbb/README
index 4f28f7e34..6e63dc5f2 100644
--- a/libbb/README
+++ b/libbb/README
@@ -8,4 +8,3 @@ that you wrote that is mis-attributed, do let me know so we can fix that up.
8 8
9 Erik Andersen 9 Erik Andersen
10 <andersen@codepoet.org> 10 <andersen@codepoet.org>
11
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index 7b5696754..2acb50e96 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -53,4 +53,3 @@ void FAST_FUNC selinux_preserve_fcontext(int fdesc)
53 setfscreatecon_or_die(context); 53 setfscreatecon_or_die(context);
54 freecon(context); 54 freecon(context);
55} 55}
56
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 145902b2e..1cd576f1d 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -126,4 +126,3 @@ int FAST_FUNC ll_proto_a2n(unsigned short *id, char *buf)
126 *id = htons(i); 126 *id = htons(i);
127 return 0; 127 return 0;
128} 128}
129
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 23bd9ff10..2e628508d 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -153,4 +153,3 @@ $(host-cshlib): %: $(host-cshobjs) FORCE
153 153
154targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ 154targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
155 $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 155 $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
156
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index be679b624..3e54ea712 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -168,5 +168,3 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
168 168
169quiet_cmd_gzip = GZIP $@ 169quiet_cmd_gzip = GZIP $@
170cmd_gzip = gzip -f -9 < $< > $@ 170cmd_gzip = gzip -f -9 < $< > $@
171
172
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 50ef37157..db30019d8 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -397,4 +397,3 @@ int main(int argc, char **argv)
397 fflush(stdout); 397 fflush(stdout);
398 return exitstatus; 398 return exitstatus;
399} 399}
400
diff --git a/scripts/find_stray_empty_lines b/scripts/find_stray_empty_lines
index 58daf2f0c..60873dac1 100755
--- a/scripts/find_stray_empty_lines
+++ b/scripts/find_stray_empty_lines
@@ -5,3 +5,13 @@ grep -n -A1 -r $'^\t*{$' . | grep -B1 '.[ch]-[0-9]*-$'
5# or (less surefire ones): 5# or (less surefire ones):
6grep -n -B1 -r $'^\t*}' . | grep -A1 '.[ch]-[0-9]*-$' 6grep -n -B1 -r $'^\t*}' . | grep -A1 '.[ch]-[0-9]*-$'
7grep -n -A1 -r $'^\t*{' . | grep -B1 '.[ch]-[0-9]*-$' 7grep -n -A1 -r $'^\t*{' . | grep -B1 '.[ch]-[0-9]*-$'
8
9# find trailing empty lines
10find -type f | xargs tail -1 | while read file; do
11 test x"$file" = x"" && continue
12 read lastline
13 #echo "|$file|$lastline"
14 if test x"$lastline" = x""; then
15 echo "$file"
16 fi
17done
diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh
index fa59cbf9d..15fc29421 100755
--- a/scripts/kconfig/check.sh
+++ b/scripts/kconfig/check.sh
@@ -11,4 +11,3 @@ EOF
11if [ ! "$?" -eq "0" ]; then 11if [ ! "$?" -eq "0" ]; then
12 echo -DKBUILD_NO_NLS; 12 echo -DKBUILD_NO_NLS;
13fi 13fi
14
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 5fc323de3..4837bbf64 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2322,4 +2322,3 @@ char *zconf_curname(void)
2322{ 2322{
2323 return current_pos.file ? current_pos.file->name : "<none>"; 2323 return current_pos.file ? current_pos.file->name : "<none>";
2324} 2324}
2325
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 0fce20cb7..14cf2ead0 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -394,4 +394,3 @@ struct menu *menu_get_parent_menu(struct menu *menu)
394 } 394 }
395 return menu; 395 return menu;
396} 396}
397
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index ef4c83228..263091945 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -112,4 +112,3 @@ const char *str_get(struct gstr *gs)
112{ 112{
113 return gs->s; 113 return gs->s;
114} 114}
115
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index 345f0fc07..d39cf189a 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -228,4 +228,3 @@ kconf_id_lookup (register const char *str, register unsigned int len)
228 } 228 }
229 return 0; 229 return 0;
230} 230}
231
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index b62724da0..a27d256d6 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -2169,5 +2169,3 @@ void zconfdump(FILE *out)
2169#include "expr.c" 2169#include "expr.c"
2170#include "symbol.c" 2170#include "symbol.c"
2171#include "menu.c" 2171#include "menu.c"
2172
2173
diff --git a/scripts/showasm b/scripts/showasm
index 046442653..dc2cd705d 100755
--- a/scripts/showasm
+++ b/scripts/showasm
@@ -18,4 +18,3 @@ then
18fi 18fi
19 19
20objdump -d $1 | sed -n -e '/./{H;$!d}' -e "x;/^.[0-9a-fA-F]* <$2>:/p" 20objdump -d $1 | sed -n -e '/./{H;$!d}' -e "x;/^.[0-9a-fA-F]* <$2>:/p"
21
diff --git a/selinux/Config.src b/selinux/Config.src
index 64a99203e..47d15b6af 100644
--- a/selinux/Config.src
+++ b/selinux/Config.src
@@ -122,4 +122,3 @@ config SESTATUS
122 Displays the status of SELinux. 122 Displays the status of SELinux.
123 123
124endmenu 124endmenu
125
diff --git a/shell/hush_test/hush-misc/break1.tests b/shell/hush_test/hush-misc/break1.tests
index 912f149c1..3a6b060d9 100755
--- a/shell/hush_test/hush-misc/break1.tests
+++ b/shell/hush_test/hush-misc/break1.tests
@@ -1,3 +1,2 @@
1while true; do echo A; break; echo B; done 1while true; do echo A; break; echo B; done
2echo OK:$? 2echo OK:$?
3
diff --git a/sysklogd/Config.src b/sysklogd/Config.src
index bfe2d1cc3..41c0d286b 100644
--- a/sysklogd/Config.src
+++ b/sysklogd/Config.src
@@ -128,4 +128,3 @@ config LOGGER
128 problems that occur within programs and scripts. 128 problems that occur within programs and scripts.
129 129
130endmenu 130endmenu
131
diff --git a/testsuite/basename/basename-works b/testsuite/basename/basename-works
index 38907d4c1..7140e9988 100644
--- a/testsuite/basename/basename-works
+++ b/testsuite/basename/basename-works
@@ -1,2 +1 @@
1test x$(basename $(pwd)) = x$(busybox basename $(pwd)) test x$(basename $(pwd)) = x$(busybox basename $(pwd))
2
diff --git a/testsuite/dirname/dirname-works b/testsuite/dirname/dirname-works
index f339c8f73..d673dd937 100644
--- a/testsuite/dirname/dirname-works
+++ b/testsuite/dirname/dirname-works
@@ -1,2 +1 @@
1test x$(dirname $(pwd)) = x$(busybox dirname $(pwd)) test x$(dirname $(pwd)) = x$(busybox dirname $(pwd))
2
diff --git a/testsuite/expr/expr-works b/testsuite/expr/expr-works
index af49ac4d5..5a0fffbdc 100644
--- a/testsuite/expr/expr-works
+++ b/testsuite/expr/expr-works
@@ -56,4 +56,3 @@ busybox expr 0 \>= 1
56if [ $? != 1 ] ; then 56if [ $? != 1 ] ; then
57 exit 1; 57 exit 1;
58fi; 58fi;
59
diff --git a/testsuite/ln/ln-preserves-soft-links b/testsuite/ln/ln-preserves-soft-links
index a8123ece3..3a49bedf4 100644
--- a/testsuite/ln/ln-preserves-soft-links
+++ b/testsuite/ln/ln-preserves-soft-links
@@ -6,4 +6,3 @@ if [ $? != 0 ] ; then
6 exit 0; 6 exit 0;
7fi 7fi
8exit 1; 8exit 1;
9
diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests
index e6822dff1..ecc3ad03e 100755
--- a/testsuite/readlink.tests
+++ b/testsuite/readlink.tests
@@ -29,4 +29,3 @@ testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$PWD/$
29 29
30# clean up 30# clean up
31rm -r "$TESTLINK" "$TESTDIR" 31rm -r "$TESTLINK" "$TESTDIR"
32
diff --git a/testsuite/uptime/uptime-works b/testsuite/uptime/uptime-works
index 80e578778..6b168ab0e 100644
--- a/testsuite/uptime/uptime-works
+++ b/testsuite/uptime/uptime-works
@@ -1,2 +1 @@
1busybox uptime busybox uptime
2