diff options
| author | James Youngman <jay@gnu.org> | 2011-06-11 23:13:58 +0100 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2011-06-12 03:21:47 +0100 |
| commit | efe91834434e7d0fdd2c521f4d22dfdeccccda28 (patch) | |
| tree | 7530249b44f2b325191c80d01a9e156a1c96378d | |
| parent | 0897af116e7333083c8b0ce98e8b882032abbf83 (diff) | |
| download | findutils-efe91834434e7d0fdd2c521f4d22dfdeccccda28.tar.gz | |
Enable the sc_trailing_blank check.
* cfg.mk: Enable sc_trailing_blank check.
(exclude_file_name_regexp--sc_trailing_blank): Exclude
xargs test inputs and outputs. Exclude the COPYING file. Exclude
a find test output. Exclude the .po files.
* xargs/xargs.c: Remove trailing blanks.
* xargs/testsuite/config/unix.exp: Likewise.
* find/testsuite/find.posix/bracket-depth.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions1.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions2.exp: Likewise.
* find/testsuite/find.posix/files-not-expressions3.exp: Likewise.
* find/testsuite/find.posix/nameslash.exp: Likewise.
* find/testsuite/find.posix/perm-vanilla.exp: Likewise.
* find/testsuite/find.posix/sizes.exp: Likewise.
* find/testsuite/find.posix/sv-bug-25359.exp: Likewise.
* find/testsuite/find.posix/typesize.exp: Likewise.
* find/testsuite/find.gnu/access.exp: Likewise.
* find/testsuite/find.gnu/deletedir.exp: Likewise.
* find/testsuite/find.gnu/deletefile.exp: Likewise.
* find/testsuite/find.gnu/exec-one-rtn-fail.exp: Likewise.
* find/testsuite/find.gnu/execdir-hier.exp: Likewise.
* find/testsuite/find.gnu/execdir-pwd.exp: Likewise.
* find/testsuite/find.gnu/execdir-root-only.exp: Likewise.
* find/testsuite/find.gnu/follow-arg-parent-symlink.exp: Likewise.
* find/testsuite/find.gnu/ilname.exp: Likewise.
* find/testsuite/find.gnu/lname.exp: Likewise.
* find/testsuite/find.gnu/perm-slash.exp: Likewise.
* find/testsuite/find.gnu/posix-h.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-17782.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-24169.exp: Likewise.
* find/testsuite/find.gnu/used-invarg.exp: Likewise.
* find/testsuite/find.gnu/used-missing.exp: Likewise.
* find/testsuite/excuses.txt: Likewise.
* locate/testsuite/config/unix.exp: Likewise.
* locate/testsuite/locate.gnu/bigendian.exp: Likewise.
* locate/testsuite/locate.gnu/bigprefix1.exp: Likewise.
* locate/testsuite/locate.gnu/exists2.exp: Likewise.
* locate/testsuite/locate.gnu/exists3.exp: Likewise.
* locate/testsuite/locate.gnu/littleendian.exp: Likewise.
* locate/testsuite/locate.gnu/notexists2.exp: Likewise.
* locate/testsuite/locate.gnu/notexists3.exp: Likewise.
* locate/testsuite/locate.gnu/sv-bug-14535.exp: Likewise.
* xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp: Likewise.
* xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp: Likewise.
* xargs/testsuite/xargs.posix/rc-125.exp: Likewise.
* xargs/testsuite/xargs.posix/sv-bug-18714.exp: Likewise.
* xargs/testsuite/xargs.posix/sv-bug-18714b.exp: Likewise.
* po/Makevars (EXTRA_LOCALE_CATEGORIES): Likewise.
* xargs/xargs.1 (SEE ALSO): Likewise.
46 files changed, 141 insertions, 91 deletions
@@ -17,6 +17,56 @@ 2011-06-11 James Youngman <jay@gnu.org> + Enable the sc_trailing_blank check. + * cfg.mk: Enable sc_trailing_blank check. + (exclude_file_name_regexp--sc_trailing_blank): Exclude + xargs test inputs and outputs. Exclude the COPYING file. Exclude + a find test output. Exclude the .po files. + * xargs/xargs.c: Remove trailing blanks. + * xargs/testsuite/config/unix.exp: Likewise. + * find/testsuite/find.posix/bracket-depth.exp: Likewise. + * find/testsuite/find.posix/files-not-expressions1.exp: Likewise. + * find/testsuite/find.posix/files-not-expressions2.exp: Likewise. + * find/testsuite/find.posix/files-not-expressions3.exp: Likewise. + * find/testsuite/find.posix/nameslash.exp: Likewise. + * find/testsuite/find.posix/perm-vanilla.exp: Likewise. + * find/testsuite/find.posix/sizes.exp: Likewise. + * find/testsuite/find.posix/sv-bug-25359.exp: Likewise. + * find/testsuite/find.posix/typesize.exp: Likewise. + * find/testsuite/find.gnu/access.exp: Likewise. + * find/testsuite/find.gnu/deletedir.exp: Likewise. + * find/testsuite/find.gnu/deletefile.exp: Likewise. + * find/testsuite/find.gnu/exec-one-rtn-fail.exp: Likewise. + * find/testsuite/find.gnu/execdir-hier.exp: Likewise. + * find/testsuite/find.gnu/execdir-pwd.exp: Likewise. + * find/testsuite/find.gnu/execdir-root-only.exp: Likewise. + * find/testsuite/find.gnu/follow-arg-parent-symlink.exp: Likewise. + * find/testsuite/find.gnu/ilname.exp: Likewise. + * find/testsuite/find.gnu/lname.exp: Likewise. + * find/testsuite/find.gnu/perm-slash.exp: Likewise. + * find/testsuite/find.gnu/posix-h.exp: Likewise. + * find/testsuite/find.gnu/sv-bug-17782.exp: Likewise. + * find/testsuite/find.gnu/sv-bug-24169.exp: Likewise. + * find/testsuite/find.gnu/used-invarg.exp: Likewise. + * find/testsuite/find.gnu/used-missing.exp: Likewise. + * find/testsuite/excuses.txt: Likewise. + * locate/testsuite/config/unix.exp: Likewise. + * locate/testsuite/locate.gnu/bigendian.exp: Likewise. + * locate/testsuite/locate.gnu/bigprefix1.exp: Likewise. + * locate/testsuite/locate.gnu/exists2.exp: Likewise. + * locate/testsuite/locate.gnu/exists3.exp: Likewise. + * locate/testsuite/locate.gnu/littleendian.exp: Likewise. + * locate/testsuite/locate.gnu/notexists2.exp: Likewise. + * locate/testsuite/locate.gnu/notexists3.exp: Likewise. + * locate/testsuite/locate.gnu/sv-bug-14535.exp: Likewise. + * xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp: Likewise. + * xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp: Likewise. + * xargs/testsuite/xargs.posix/rc-125.exp: Likewise. + * xargs/testsuite/xargs.posix/sv-bug-18714.exp: Likewise. + * xargs/testsuite/xargs.posix/sv-bug-18714b.exp: Likewise. + * po/Makevars (EXTRA_LOCALE_CATEGORIES): Likewise. + * xargs/xargs.1 (SEE ALSO): Likewise. + Enable the sc_space_tab check * cfg.mk: Enable the sc_space_tab check. Exclude various xargs test inputs and outputs from the check. Remove some obsolete @@ -32,9 +32,9 @@ exclude_file_name_regexp--sc_space_tab = \ # any case we don't use help2man at all. local-checks-to-skip += sc_two_space_separator_in_usage -# Problems that have some false positives and some real ones; tease -# apart later. -local-checks-to-skip += sc_trailing_blank +# Some test inputs/outputs have trailing blanks. +exclude_file_name_regexp--sc_trailing_blank = \ + ^COPYING|(po/.*\.po)|(find/testsuite/find.gnu/printf\.xo)|(xargs/testsuite/(inputs/.*\.xi|xargs\.(gnu|posix|sysv)/.*\.(x[oe])))$$ # sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}. exclude_file_name_regexp--sc_texinfo_acronym = doc/perm\.texi diff --git a/find/testsuite/excuses.txt b/find/testsuite/excuses.txt index 4f435d52..07dd8dcb 100644 --- a/find/testsuite/excuses.txt +++ b/find/testsuite/excuses.txt @@ -21,7 +21,7 @@ g "fprintf", fprintf), /* GNU */ "fstype", fstype), /* GNU, Unix */ -## Things that are hard to test because they rely on features of +## Things that are hard to test because they rely on features of ## the environment "gid", gid), /* GNU */ "uid", uid), /* GNU */ @@ -36,7 +36,7 @@ g "noignore_readdir_race", noignore_race), /* GNU */ "noleaf", noleaf), /* GNU */ -## Things that might be testable but which I have not yet thought +## Things that might be testable but which I have not yet thought ## about enough. "nowarn", nowarn), /* GNU */ "warn", warn), /* GNU */ diff --git a/find/testsuite/find.gnu/access.exp b/find/testsuite/find.gnu/access.exp index 867bc806..c6308b9e 100644 --- a/find/testsuite/find.gnu/access.exp +++ b/find/testsuite/find.gnu/access.exp @@ -2,7 +2,7 @@ exec rm -rf tmp exec mkdir tmp if { ! [ fs_superuser ] } { - touch tmp/x tmp/w tmp/r tmp/rw tmp/rwx tmp/0 + touch tmp/x tmp/w tmp/r tmp/rw tmp/rwx tmp/0 exec chmod 400 tmp/r exec chmod 200 tmp/w exec chmod 100 tmp/x diff --git a/find/testsuite/find.gnu/deletedir.exp b/find/testsuite/find.gnu/deletedir.exp index 0d849d9e..88097474 100644 --- a/find/testsuite/find.gnu/deletedir.exp +++ b/find/testsuite/find.gnu/deletedir.exp @@ -1,7 +1,7 @@ global FTSFIND global FINDFLAGS exec rm -rf tmp -exec mkdir tmp tmp/top +exec mkdir tmp tmp/top proc createdir {} { exec mkdir tmp/top/dir } diff --git a/find/testsuite/find.gnu/deletefile.exp b/find/testsuite/find.gnu/deletefile.exp index 5473a262..552cf67c 100644 --- a/find/testsuite/find.gnu/deletefile.exp +++ b/find/testsuite/find.gnu/deletefile.exp @@ -1,7 +1,7 @@ global FTSFIND global FINDFLAGS exec rm -rf tmp -exec mkdir tmp tmp/top +exec mkdir tmp tmp/top proc touchfile {} { exec touch tmp/top/file } diff --git a/find/testsuite/find.gnu/exec-one-rtn-fail.exp b/find/testsuite/find.gnu/exec-one-rtn-fail.exp index 80225850..91ec2268 100644 --- a/find/testsuite/find.gnu/exec-one-rtn-fail.exp +++ b/find/testsuite/find.gnu/exec-one-rtn-fail.exp @@ -1,4 +1,4 @@ -# If -exec \; fails, it should return false. The return +# If -exec \; fails, it should return false. The return # value of find shoudl stil; be 0, unless another error has # happened. find_start p { /tmp -exec false \; -o \( -printf "yep\n" -quit \) } diff --git a/find/testsuite/find.gnu/execdir-hier.exp b/find/testsuite/find.gnu/execdir-hier.exp index 8b43c559..59d877bb 100644 --- a/find/testsuite/find.gnu/execdir-hier.exp +++ b/find/testsuite/find.gnu/execdir-hier.exp @@ -1,4 +1,4 @@ -# tests for -execdir ... \+ +# tests for -execdir ... \+ # Specifically, ensure that output for separate directoires is not mixed. if { [ safe_path ] } { exec rm -rf tmp diff --git a/find/testsuite/find.gnu/execdir-pwd.exp b/find/testsuite/find.gnu/execdir-pwd.exp index 7726f6ee..740785f9 100644 --- a/find/testsuite/find.gnu/execdir-pwd.exp +++ b/find/testsuite/find.gnu/execdir-pwd.exp @@ -14,7 +14,7 @@ if { [ safe_path ] } { # built up by -execdir in the wrong directory. set SKIP_OLD 1 - find_start p {tmp -name foo -execdir sh ./foo \{\} + } "" + find_start p {tmp -name foo -execdir sh ./foo \{\} + } "" set SKIP_OLD 0 exec rm -rf tmp } diff --git a/find/testsuite/find.gnu/execdir-root-only.exp b/find/testsuite/find.gnu/execdir-root-only.exp index a957e7e3..c57fd31a 100644 --- a/find/testsuite/find.gnu/execdir-root-only.exp +++ b/find/testsuite/find.gnu/execdir-root-only.exp @@ -1,17 +1,17 @@ # Bug report by Bas van Gompel: -# +# # This appears to work well. However when the rootdir is passed, # something looks fishy: -# +# # find / -mindepth 0 -maxdepth 0 -execdir echo {} \; # .// -# +# # I also spotted, when `+' is used: -# +# # find / -mindepth 0 -maxdepth 0 -execdir echo == {} + # == # == .// -# +# # (Notice the first line of output, which should not be there.) diff --git a/find/testsuite/find.gnu/follow-arg-parent-symlink.exp b/find/testsuite/find.gnu/follow-arg-parent-symlink.exp index 52f374ac..0ab9e474 100644 --- a/find/testsuite/find.gnu/follow-arg-parent-symlink.exp +++ b/find/testsuite/find.gnu/follow-arg-parent-symlink.exp @@ -1,5 +1,5 @@ exec rm -rf tmp -exec mkdir tmp tmp/dir1 tmp/dir1/dir2 +exec mkdir tmp tmp/dir1 tmp/dir1/dir2 exec touch tmp/dir1/dir2/foo exec ln -s dir1 tmp/link1 find_start p {tmp/link1/dir2 -type f -print } diff --git a/find/testsuite/find.gnu/ilname.exp b/find/testsuite/find.gnu/ilname.exp index 9b77b6a1..2d276171 100644 --- a/find/testsuite/find.gnu/ilname.exp +++ b/find/testsuite/find.gnu/ilname.exp @@ -1,6 +1,6 @@ # tests for -ilname exec rm -rf tmp -exec mkdir tmp +exec mkdir tmp exec touch tmp/one exec ln -s one tmp/two find_start p {tmp -ilname One -print} diff --git a/find/testsuite/find.gnu/lname.exp b/find/testsuite/find.gnu/lname.exp index ada635ff..65f88788 100644 --- a/find/testsuite/find.gnu/lname.exp +++ b/find/testsuite/find.gnu/lname.exp @@ -1,6 +1,6 @@ # tests for -lname exec rm -rf tmp -exec mkdir tmp +exec mkdir tmp exec touch tmp/one exec ln -s one tmp/two find_start p {tmp -lname one -print} diff --git a/find/testsuite/find.gnu/perm-slash.exp b/find/testsuite/find.gnu/perm-slash.exp index a5be0ab4..252d91aa 100644 --- a/find/testsuite/find.gnu/perm-slash.exp +++ b/find/testsuite/find.gnu/perm-slash.exp @@ -1,8 +1,8 @@ # tests for -perm /nnn # The slash is a GNU extension -exec rm -rf tmp -exec mkdir tmp +exec rm -rf tmp +exec mkdir tmp ## set up a selection of test files foreach perm { 400 200 555 700 000 050 } { @@ -10,10 +10,10 @@ foreach perm { 400 200 555 700 000 050 } { exec chmod $perm "tmp/$perm" } -# +# # The -o operator normally has a short-circuit effect, # so we have to use "-exec false \;" to make sure that # all the parenthesised expression actually fail. -# +# find_start p {tmp -mindepth 1 -perm /555 -printf "p/555 %p\n" } # exec rm -rf tmp tmp2 diff --git a/find/testsuite/find.gnu/posix-h.exp b/find/testsuite/find.gnu/posix-h.exp index 4023b257..0ecbabef 100644 --- a/find/testsuite/find.gnu/posix-h.exp +++ b/find/testsuite/find.gnu/posix-h.exp @@ -6,8 +6,8 @@ exec mkdir tmp exec ln -s /etc/passwd tmp/LINK exec ln -s /NOSUCHFILE tmp/BROKEN -# If the file is not on the command line, the link is not +# If the file is not on the command line, the link is not # dereferenced, and so tmp/LINK should appear at depth 1 -# but as type "l". tmp itself appears first at depth 0 as +# but as type "l". tmp itself appears first at depth 0 as # a directory. find_start p { -H tmp/LINK tmp/BROKEN tmp -printf "H1: %y %d %p\n" } diff --git a/find/testsuite/find.gnu/sv-bug-17782.exp b/find/testsuite/find.gnu/sv-bug-17782.exp index 6771f285..db6dba28 100644 --- a/find/testsuite/find.gnu/sv-bug-17782.exp +++ b/find/testsuite/find.gnu/sv-bug-17782.exp @@ -1,9 +1,9 @@ # Savannah bug #17782. # While -execdir echo blah {} works, -execdir echo "blah {}" doesn't. -# The bug is that the ./ prefix is prepended to the argument containing the -# braces, not to the expansion of the braces, so you get output like +# The bug is that the ./ prefix is prepended to the argument containing the +# braces, not to the expansion of the braces, so you get output like # ./blah foo -# instead of +# instead of # blah ./foo # if { [ safe_path ] } { diff --git a/find/testsuite/find.gnu/sv-bug-24169.exp b/find/testsuite/find.gnu/sv-bug-24169.exp index 349e8233..120a18b8 100644 --- a/find/testsuite/find.gnu/sv-bug-24169.exp +++ b/find/testsuite/find.gnu/sv-bug-24169.exp @@ -2,7 +2,7 @@ # # The command: # find -neweraa -# is not valid because there is a missing argument. +# is not valid because there is a missing argument. # The result should be a clean exit with nonzero status. # However, it segfaults in 4.4.0. # @@ -15,11 +15,11 @@ if {[which $FTSFIND] == 0} then { set scriptname [info script] set testbase [file rootname $scriptname] -set test [file tail $testbase] +set test [file tail $testbase] set testname "$test.generic" set cmd "$FTSFIND -neweraa" -set expected 1 +set expected 1 send_log "$cmd\n" eval spawn -noecho $cmd @@ -31,17 +31,17 @@ if { [ lindex $result 2 ] == 0 } then { set status [ lindex $result 3] if { [llength $result] > 4 } then { if { [lindex $result 4] == "CHILDKILLED" } then { - fail "$testname, $cmd was killed: [lrange $result 5 end]" + fail "$testname, $cmd was killed: [lrange $result 5 end]" } else { - unresolved "$testname, $cmd had unexpected extended status $result" + unresolved "$testname, $cmd had unexpected extended status $result" } } else { if { $status != 1 } then { - unresolved "$testname, $cmd had unexpected status $status" + unresolved "$testname, $cmd had unexpected status $status" } else { pass "$testname" } } } else { - unresolved "$testname, failed to run $cmd" + unresolved "$testname, failed to run $cmd" } diff --git a/find/testsuite/find.gnu/used-invarg.exp b/find/testsuite/find.gnu/used-invarg.exp index be5eed14..966341f7 100644 --- a/find/testsuite/find.gnu/used-invarg.exp +++ b/find/testsuite/find.gnu/used-invarg.exp @@ -1,2 +1,2 @@ -# tests for invalid argument to -used +# tests for invalid argument to -used find_start f {. -used ZZ} diff --git a/find/testsuite/find.gnu/used-missing.exp b/find/testsuite/find.gnu/used-missing.exp index b8b86745..6218433c 100644 --- a/find/testsuite/find.gnu/used-missing.exp +++ b/find/testsuite/find.gnu/used-missing.exp @@ -1,2 +1,2 @@ -# tests for missing argument to -used +# tests for missing argument to -used find_start f {. -used } diff --git a/find/testsuite/find.posix/bracket-depth.exp b/find/testsuite/find.posix/bracket-depth.exp index e748f06e..8ebadcdd 100644 --- a/find/testsuite/find.posix/bracket-depth.exp +++ b/find/testsuite/find.posix/bracket-depth.exp @@ -1,4 +1,4 @@ exec rm -rf tmp exec mkdir tmp -# shoud not result in a fatal error. +# shoud not result in a fatal error. find_start p { tmp \( -depth \) -false -print } diff --git a/find/testsuite/find.posix/files-not-expressions1.exp b/find/testsuite/find.posix/files-not-expressions1.exp index b1de3aca..b54ff8ca 100644 --- a/find/testsuite/find.posix/files-not-expressions1.exp +++ b/find/testsuite/find.posix/files-not-expressions1.exp @@ -2,7 +2,7 @@ set files "\(1 " foreach file $files { touch $file } -# shoud not result in a fatal error. +# shoud not result in a fatal error. find_start p { \(1 } foreach file $files { file delete -- $file } diff --git a/find/testsuite/find.posix/files-not-expressions2.exp b/find/testsuite/find.posix/files-not-expressions2.exp index e6dcef23..b699a24f 100644 --- a/find/testsuite/find.posix/files-not-expressions2.exp +++ b/find/testsuite/find.posix/files-not-expressions2.exp @@ -2,7 +2,7 @@ set files "!2" foreach file $files { touch $file } -# shoud not result in a fatal error. +# shoud not result in a fatal error. find_start p { !2 } foreach file $files { file delete -- $file } diff --git a/find/testsuite/find.posix/files-not-expressions3.exp b/find/testsuite/find.posix/files-not-expressions3.exp index 4bd454b0..96749e04 100644 --- a/find/testsuite/find.posix/files-not-expressions3.exp +++ b/find/testsuite/find.posix/files-not-expressions3.exp @@ -2,7 +2,7 @@ set files "\)" foreach file $files { touch $file } -# shoud not result in a fatal error. +# shoud not result in a fatal error. find_start p { \) } foreach file $files { file delete -- $file } diff --git a/find/testsuite/find.posix/nameslash.exp b/find/testsuite/find.posix/nameslash.exp index 1aaf2206..a8b91ab2 100644 --- a/find/testsuite/find.posix/nameslash.exp +++ b/find/testsuite/find.posix/nameslash.exp @@ -1,6 +1,6 @@ # tests for -name and trailing slashes. # See http://www.opengroup.org/austin/interps/uploads/40/14959/AI-186.txt -# This is a test for Savannah bug #20970. +# This is a test for Savannah bug #20970. exec rm -rf tmp exec mkdir tmp tmp/foo tmp/bar find_start p {tmp/foo/// tmp/bar/// -name foo -o -name 'bar?*'} diff --git a/find/testsuite/find.posix/perm-vanilla.exp b/find/testsuite/find.posix/perm-vanilla.exp index c6b551fa..d4b9f78b 100644 --- a/find/testsuite/find.posix/perm-vanilla.exp +++ b/find/testsuite/find.posix/perm-vanilla.exp @@ -1,6 +1,6 @@ # tests for -perm -exec rm -rf tmp -exec mkdir tmp +exec rm -rf tmp +exec mkdir tmp ## set up a selection of test files foreach perm { 400 555 700 } { @@ -9,10 +9,10 @@ foreach perm { 400 555 700 } { } exec ls -l tmp -# +# # The -o operator normally has a short-circuit effect, # so we have to use "-exec false \;" to make sure that # all the parenthesised expression actually fail. -# +# find_start p {tmp/400 tmp/555 tmp/700 \( -perm 400 -exec echo p400 \{\} \; -exec false \; \) -o \( -perm -400 -exec echo p-400 \{\} \; -exec false \; \) } # exec rm -rf tmp tmp2 diff --git a/find/testsuite/find.posix/sizes.exp b/find/testsuite/find.posix/sizes.exp index 1fdea48e..272498e8 100644 --- a/find/testsuite/find.posix/sizes.exp +++ b/find/testsuite/find.posix/sizes.exp @@ -2,14 +2,14 @@ exec rm -rf tmp exec mkdir tmp exec true > tmp/0-bytes -exec dd if=/dev/zero bs=1 count=511 of=tmp/511-bytes > /dev/null 2>/dev/null -exec dd if=/dev/zero bs=1 count=512 of=tmp/512-bytes > /dev/null 2>/dev/null -exec dd if=/dev/zero bs=1 count=513 of=tmp/513-bytes > /dev/null 2>/dev/null -exec dd if=/dev/zero bs=1 count=1024 of=tmp/1024-bytes > /dev/null 2>/dev/null +exec dd if=/dev/zero bs=1 count=511 of=tmp/511-bytes > /dev/null 2>/dev/null +exec dd if=/dev/zero bs=1 count=512 of=tmp/512-bytes > /dev/null 2>/dev/null +exec dd if=/dev/zero bs=1 count=513 of=tmp/513-bytes > /dev/null 2>/dev/null +exec dd if=/dev/zero bs=1 count=1024 of=tmp/1024-bytes > /dev/null 2>/dev/null find_start p {tmp -mindepth 1 ( -size -1 -printf "A size -1: %s %p\n" ) , ( -size 1 -printf "B size 1: %s %p\n" ) , ( -size +1 -printf "C size +1: %s %p\n" ) , ( -size -2 -printf "G size -2: %s %p\n" ) , ( -size 2 -printf "H size 2: %s %p\n" ) , ( -size +2 -printf "I size +2: %s %p\n" ) } -# ( -size =1 -printf "E size =1: %s %p\n" ) +# ( -size =1 -printf "E size =1: %s %p\n" ) # ( -size >1 -printf "F size >1: %s %p\n" ) , # ( -size <2 -printf "J size <2: %s %p\n" ) , # ( -size =2 -printf "K size =2: %s %p\n" ) , -# ( -size >2 -printf "L size >2: %s %p\n" ) +# ( -size >2 -printf "L size >2: %s %p\n" ) exec rm -rf tmp diff --git a/find/testsuite/find.posix/sv-bug-25359.exp b/find/testsuite/find.posix/sv-bug-25359.exp index 84231d0d..6bfb715d 100644 --- a/find/testsuite/find.posix/sv-bug-25359.exp +++ b/find/testsuite/find.posix/sv-bug-25359.exp @@ -1,7 +1,7 @@ # Test for Savannah bug 25359 # (ftsfind -H thinks that non-argument symlinks are files) # Affecting findutils -# from acb82fe44369c108b43ec3e805aa94bf28352d0a +# from acb82fe44369c108b43ec3e805aa94bf28352d0a # to 0b1acd3358466b02f32baf9423665113dc933492 exec rm -rf tmp exec mkdir tmp diff --git a/find/testsuite/find.posix/typesize.exp b/find/testsuite/find.posix/typesize.exp index 596b2da2..cf91c004 100644 --- a/find/testsuite/find.posix/typesize.exp +++ b/find/testsuite/find.posix/typesize.exp @@ -1,4 +1,4 @@ -# tests for -type -size +# tests for -type -size exec rm -rf tmp exec mkdir tmp exec true > tmp/empty diff --git a/locate/testsuite/config/unix.exp b/locate/testsuite/config/unix.exp index 76b557bf..2c0f0159 100644 --- a/locate/testsuite/config/unix.exp +++ b/locate/testsuite/config/unix.exp @@ -7,12 +7,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -23,8 +23,8 @@ # use the local version of find for updatedb # -# We normalise (normalize for those over the water) pathnames -# because the updatedb shell script uses "cd", which means that +# We normalise (normalize for those over the water) pathnames +# because the updatedb shell script uses "cd", which means that # any relative paths no longer point where we thought they did. # Because "file normalize" requires tcl 8.4, we have a plan B # for normalising the name of a directory, but it is slower. @@ -41,7 +41,7 @@ set fulldir [ normalize_dir "../../find" ] set env{find} "$fulldir/find" # use the local help commands for updatedb -set env(LIBEXECDIR) [ normalize_dir .. ] +set env(LIBEXECDIR) [ normalize_dir .. ] # use our local version of find, too. # do not ignore any file systems for this test @@ -208,7 +208,7 @@ proc locate_start { passfail updatedb_options locate_options if $verbose>1 then { send_user "$comp_output\n" } - # If fail_good is set, that refers to the exit + # If fail_good is set, that refers to the exit # status of locate, not updatedb... fail "$testname: updatedb is supposed to be silent, $comp_output" return @@ -218,7 +218,7 @@ proc locate_start { passfail updatedb_options locate_options eval $between_hook - + set locate_cmd "$LOCATE $LOCATEFLAGS $locate_options < $locate_infile > locate.out" send_log "$locate_cmd\n" if $verbose>1 then { diff --git a/locate/testsuite/locate.gnu/bigendian.exp b/locate/testsuite/locate.gnu/bigendian.exp index 08a3cae9..32f711df 100644 --- a/locate/testsuite/locate.gnu/bigendian.exp +++ b/locate/testsuite/locate.gnu/bigendian.exp @@ -1,2 +1,2 @@ # Make sure we can read a big-endian old-format database. -locate_from_db p "-r ." "locateddb.old.powerpc.xi" +locate_from_db p "-r ." "locateddb.old.powerpc.xi" diff --git a/locate/testsuite/locate.gnu/bigprefix1.exp b/locate/testsuite/locate.gnu/bigprefix1.exp index f9df434c..f776d748 100644 --- a/locate/testsuite/locate.gnu/bigprefix1.exp +++ b/locate/testsuite/locate.gnu/bigprefix1.exp @@ -9,4 +9,4 @@ ________________________________________________________________________________ ________________________________________________________________________________________________________________________________________________________________________________________________________abcF\n" -locate_roundtrip 1 $text +locate_roundtrip 1 $text diff --git a/locate/testsuite/locate.gnu/exists2.exp b/locate/testsuite/locate.gnu/exists2.exp index ca02f17d..a775543e 100644 --- a/locate/testsuite/locate.gnu/exists2.exp +++ b/locate/testsuite/locate.gnu/exists2.exp @@ -5,4 +5,4 @@ exec mkdir $tmp exec mkdir $tmp/subdir exec touch $tmp/subdir/fred1 exec touch $tmp/subdir/fred2 -locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -e fred" {} {} { exec rm "tmp/subdir/fred2" } +locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -e fred" {} {} { exec rm "tmp/subdir/fred2" } diff --git a/locate/testsuite/locate.gnu/exists3.exp b/locate/testsuite/locate.gnu/exists3.exp index 022ad074..89c27a52 100644 --- a/locate/testsuite/locate.gnu/exists3.exp +++ b/locate/testsuite/locate.gnu/exists3.exp @@ -5,4 +5,4 @@ exec mkdir $tmp exec mkdir $tmp/subdir exec touch $tmp/subdir/fred1 exec touch $tmp/subdir/fred2 -locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -e fred" {} {} { exec rm "tmp/subdir/fred1" } +locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -e fred" {} {} { exec rm "tmp/subdir/fred1" } diff --git a/locate/testsuite/locate.gnu/littleendian.exp b/locate/testsuite/locate.gnu/littleendian.exp index 96f5055f..9b73154e 100644 --- a/locate/testsuite/locate.gnu/littleendian.exp +++ b/locate/testsuite/locate.gnu/littleendian.exp @@ -1,2 +1,2 @@ # Make sure we can read a little-endian old-format database. -locate_from_db p "-r ." "locateddb.old.x86.xi" +locate_from_db p "-r ." "locateddb.old.x86.xi" diff --git a/locate/testsuite/locate.gnu/notexists2.exp b/locate/testsuite/locate.gnu/notexists2.exp index 79d3c7cd..1ff42f69 100644 --- a/locate/testsuite/locate.gnu/notexists2.exp +++ b/locate/testsuite/locate.gnu/notexists2.exp @@ -5,4 +5,4 @@ exec mkdir $tmp exec mkdir $tmp/subdir exec touch $tmp/subdir/fred1 exec touch $tmp/subdir/fred2 -locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -E fred" {} {} { exec rm "tmp/subdir/fred2" } +locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -E fred" {} {} { exec rm "tmp/subdir/fred2" } diff --git a/locate/testsuite/locate.gnu/notexists3.exp b/locate/testsuite/locate.gnu/notexists3.exp index a391e029..06652d15 100644 --- a/locate/testsuite/locate.gnu/notexists3.exp +++ b/locate/testsuite/locate.gnu/notexists3.exp @@ -5,4 +5,4 @@ exec mkdir $tmp exec mkdir $tmp/subdir exec touch $tmp/subdir/fred1 exec touch $tmp/subdir/fred2 -locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -E fred" {} {} { exec rm "tmp/subdir/fred1" } +locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" "--database=$tmp/locatedb -E fred" {} {} { exec rm "tmp/subdir/fred1" } diff --git a/locate/testsuite/locate.gnu/sv-bug-14535.exp b/locate/testsuite/locate.gnu/sv-bug-14535.exp index 3d5d697f..3f3056ca 100644 --- a/locate/testsuite/locate.gnu/sv-bug-14535.exp +++ b/locate/testsuite/locate.gnu/sv-bug-14535.exp @@ -30,15 +30,15 @@ proc select_any_locale { patternlist } { # locales in which we want to perform part of this test. If we can # use any locale matching any of the patterns, we run an extra four # tests. Otherwise, we skip them and issue a warning message. -set localeoptions { +set localeoptions { "hu_HU.UTF-8" - "hu_*.UTF-8" + "hu_*.UTF-8" "en_IE.utf8" "en_GB.utf8" "en_US.utf8" "en_*.utf8" "*.utf8" -} +} diff --git a/po/Makevars b/po/Makevars index 8ac3f44f..e2b1e1dd 100644 --- a/po/Makevars +++ b/po/Makevars @@ -38,4 +38,4 @@ MSGID_BUGS_ADDRESS = bug-findutils@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = +EXTRA_LOCALE_CATEGORIES = diff --git a/xargs/testsuite/config/unix.exp b/xargs/testsuite/config/unix.exp index 9d04ac9a..1d9cea6e 100644 --- a/xargs/testsuite/config/unix.exp +++ b/xargs/testsuite/config/unix.exp @@ -2,17 +2,17 @@ # Test-specific TCL procedures required by DejaGNU. # Copyright (C) 1994, 2005, 2007, 2010, 2011 Free Software Foundation, # Inc. -# +# # 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 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp b/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp index 786ceb10..106f7697 100644 --- a/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp +++ b/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp @@ -6,7 +6,7 @@ # limit is ARG_MAX - sizeof (void*)). The difference between 32- and # 64-bit systems is because sizeof (void*) differs (4 vs. 8). # -# Tue Nov 22 19:36:49 2005: Use 'true' rather than 'echo', otherwise the -# differences in the value of ARG_MAX on various platforms will cause the +# Tue Nov 22 19:36:49 2005: Use 'true' rather than 'echo', otherwise the +# differences in the value of ARG_MAX on various platforms will cause the # test to fail. xargs_start p { true } 32767-ys.xi diff --git a/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp b/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp index 8a7be595..90a8622d 100644 --- a/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp +++ b/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp @@ -6,7 +6,7 @@ # limit is ARG_MAX - sizeof (void*)). The difference between 32- and # 64-bit systems is because sizeof (void*) differs (4 vs. 8). # -# Tue Nov 22 19:36:49 2005: Use 'true' rather than 'echo', otherwise the -# differences in the value of ARG_MAX on various platforms will cause the +# Tue Nov 22 19:36:49 2005: Use 'true' rather than 'echo', otherwise the +# differences in the value of ARG_MAX on various platforms will cause the # test to fail. xargs_start p { true } 16383-ys.xi diff --git a/xargs/testsuite/xargs.posix/rc-125.exp b/xargs/testsuite/xargs.posix/rc-125.exp index 6624880b..4284ac5d 100644 --- a/xargs/testsuite/xargs.posix/rc-125.exp +++ b/xargs/testsuite/xargs.posix/rc-125.exp @@ -3,9 +3,9 @@ # on MacOS X, the child just exits with a nonzero status. # This works better but is harder to use in a DejaGnu test: # yes | xargs -I{} echo | true -# Part of the problem here of course is that the exit status of the +# Part of the problem here of course is that the exit status of the # pipeline is the exit status of its last compinent. # # This problem is recorded as Savannah bug# 19969. -# +# xargs_start 125 {-n1 -IARG sh -c ARG} stt.xi skip diff --git a/xargs/testsuite/xargs.posix/sv-bug-18714.exp b/xargs/testsuite/xargs.posix/sv-bug-18714.exp index b40e1050..68739ed0 100644 --- a/xargs/testsuite/xargs.posix/sv-bug-18714.exp +++ b/xargs/testsuite/xargs.posix/sv-bug-18714.exp @@ -1,10 +1,10 @@ # Form feed is not a separator. # -# POSIX specifies that <blank> is the serarator +# POSIX specifies that <blank> is the serarator # in the POSIX locale, and <blank> is defined -# as <SPC> or <TAB>. +# as <SPC> or <TAB>. # -# On the other hand, <space> includes Form Feed and +# On the other hand, <space> includes Form Feed and # Vertical Tab. By default, those should not be # separators. xargs_start p {printf "\[%s\]\n"} formfeeds.xi diff --git a/xargs/testsuite/xargs.posix/sv-bug-18714b.exp b/xargs/testsuite/xargs.posix/sv-bug-18714b.exp index f110daf8..9e9c4d56 100644 --- a/xargs/testsuite/xargs.posix/sv-bug-18714b.exp +++ b/xargs/testsuite/xargs.posix/sv-bug-18714b.exp @@ -1,10 +1,10 @@ # Vertical tab is not a separator. # -# POSIX specifies that <blank> is the serarator +# POSIX specifies that <blank> is the serarator # in the POSIX locale, and <blank> is defined -# as <SPC> or <TAB>. +# as <SPC> or <TAB>. # -# On the other hand, <space> includes Form Feed and +# On the other hand, <space> includes Form Feed and # Vertical Tab. By default, those should not be # separators. xargs_start p {printf "\[%s\]\n"} verticaltabs.xi diff --git a/xargs/xargs.1 b/xargs/xargs.1 index 6541c52d..ebcb1e0b 100644 --- a/xargs/xargs.1 +++ b/xargs/xargs.1 @@ -405,7 +405,7 @@ current system. .SH "SEE ALSO" \fBfind\fP(1), \fBlocate\fP(1), \fBlocatedb\fP(5), \fBupdatedb\fP(1), -\fBfork\fP(2), \fBexecvp\fP(3), +\fBfork\fP(2), \fBexecvp\fP(3), \fBkill\fP(1), \fBsignal\fP(7), \fBFinding Files\fP (on-line in Info, or printed) .SH "BUGS" diff --git a/xargs/xargs.c b/xargs/xargs.c index 1b668a97..e64cc99d 100644 --- a/xargs/xargs.c +++ b/xargs/xargs.c @@ -1420,8 +1420,8 @@ wait_for_proc (bool all, unsigned int minreap) { /* Receipt of SIGUSR1 gave us an extra slot and we * don't need to wait for all processes to finish. - * We can stop reaping now, but in any case check for - * further dead children without waiting for another + * We can stop reaping now, but in any case check for + * further dead children without waiting for another * to exit. */ wflags = WNOHANG; @@ -1518,7 +1518,7 @@ wait_for_proc_all (void) /* Increment or decrement the number of processes we can start simultaneously, when we receive a signal from the outside world. - + We must take special care around proc_max == 0 (unlimited children), proc_max == 1 (don't decrement to zero). */ static void |