[PATCH 1/3] Remove trailing blank lines.

[James Youngman]

* .x-sc_prohibit_empty_lines_at_EOF: Add list of exceptions to the
no-blank-lines-at-EOF syntax check.
* doc/regexprops.texi: Remove empty lines at the end of the file.
* find/finddata.c: Likewise.
* find/fstype.c: Likewise.
* find/testsuite/excuses.txt: Likewise.
* find/testsuite/find.gnu/access.exp: Likewise.
* find/testsuite/find.gnu/exec-one-rtn-fail.exp: Likewise.
* find/testsuite/find.gnu/posix-perminvalid.exp: Likewise.
* find/testsuite/find.gnu/samefile-missing.exp: Likewise.
* find/testsuite/find.gnu/samefile-p-brokenlink.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-17490.exp: Likewise.
* find/testsuite/find.gnu/sv-bug-18222.exp: Likewise.
* find/testsuite/find.posix/bracket-depth.exp: Likewise.
* find/testsuite/find.posix/empty-parens.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/group-empty.exp: Likewise.
* find/testsuite/find.posix/user-empty.exp: Likewise.
* find/testsuite/find.posix/user-missing.exp: Likewise.
* lib/extendbuf.c: Likewise.
* lib/fdleak.c: Likewise.
* lib/fdleak.h: Likewise.
* lib/findutils-version.h: Likewise.
* lib/gnulib-version.h: Likewise.
* lib/printquoted.c: Likewise.
* lib/regextype.c: Likewise.
* lib/safe-atoi.c: Likewise.
* locate/testsuite/config/unix.exp: Likewise.
* locate/testsuite/locate.gnu/exists1.exp: Likewise.
* locate/testsuite/locate.gnu/exists2.exp: Likewise.
* locate/testsuite/locate.gnu/exists3.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case1.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case2.exp: Likewise.
* locate/testsuite/locate.gnu/ignore_case3.exp: Likewise.
* locate/testsuite/locate.gnu/notexists1.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.
* m4/Makefile.am: Likewise.
* m4/nullsort.m4: Likewise.
* xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp: Likewise.
* xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp: Likewise.

Signed-off-by: James Youngman <address@hidden>
---
 .x-sc_prohibit_empty_lines_at_EOF                  |   11 +++++
 ChangeLog                                          |   46 ++++++++++++++++++++
 doc/regexprops.texi                                |    1 -
 find/finddata.c                                    |    1 -
 find/fstype.c                                      |    3 -
 find/testsuite/excuses.txt                         |    1 -
 find/testsuite/find.gnu/access.exp                 |    1 -
 find/testsuite/find.gnu/exec-one-rtn-fail.exp      |    1 -
 find/testsuite/find.gnu/posix-perminvalid.exp      |    1 -
 find/testsuite/find.gnu/samefile-missing.exp       |    2 -
 find/testsuite/find.gnu/samefile-p-brokenlink.exp  |    2 -
 find/testsuite/find.gnu/sv-bug-17490.exp           |    1 -
 find/testsuite/find.gnu/sv-bug-18222.exp           |    1 -
 find/testsuite/find.posix/bracket-depth.exp        |    1 -
 find/testsuite/find.posix/empty-parens.exp         |    1 -
 .../find.posix/files-not-expressions1.exp          |    1 -
 .../find.posix/files-not-expressions2.exp          |    1 -
 .../find.posix/files-not-expressions3.exp          |    1 -
 find/testsuite/find.posix/group-empty.exp          |    1 -
 find/testsuite/find.posix/user-empty.exp           |    1 -
 find/testsuite/find.posix/user-missing.exp         |    1 -
 lib/extendbuf.c                                    |    1 -
 lib/fdleak.c                                       |    1 -
 lib/fdleak.h                                       |    1 -
 lib/findutils-version.h                            |    1 -
 lib/gnulib-version.h                               |    1 -
 lib/printquoted.c                                  |    1 -
 lib/regextype.c                                    |    3 -
 lib/safe-atoi.c                                    |    2 -
 locate/testsuite/config/unix.exp                   |    1 -
 locate/testsuite/locate.gnu/exists1.exp            |    1 -
 locate/testsuite/locate.gnu/exists2.exp            |    1 -
 locate/testsuite/locate.gnu/exists3.exp            |    1 -
 locate/testsuite/locate.gnu/ignore_case1.exp       |    1 -
 locate/testsuite/locate.gnu/ignore_case2.exp       |    1 -
 locate/testsuite/locate.gnu/ignore_case3.exp       |    1 -
 locate/testsuite/locate.gnu/notexists1.exp         |    1 -
 locate/testsuite/locate.gnu/notexists2.exp         |    1 -
 locate/testsuite/locate.gnu/notexists3.exp         |    1 -
 locate/testsuite/locate.gnu/sv-bug-14535.exp       |    1 -
 m4/Makefile.am                                     |    2 -
 m4/nullsort.m4                                     |    1 -
 .../xargs.posix/arg_max_32bit_linux_bug.exp        |    1 -
 .../xargs.posix/arg_max_64bit_linux_bug.exp        |    1 -
 44 files changed, 57 insertions(+), 50 deletions(-)
 create mode 100644 .x-sc_prohibit_empty_lines_at_EOF

diff --git a/.x-sc_prohibit_empty_lines_at_EOF 
b/.x-sc_prohibit_empty_lines_at_EOF
new file mode 100644
index 0000000..597a045
--- /dev/null
+++ b/.x-sc_prohibit_empty_lines_at_EOF
@@ -0,0 +1,11 @@
+find/testsuite/find.gnu/name-opt.xo
+find/testsuite/find.gnu/samefile-copy.xo
+locate/testsuite/locate.gnu/ignore_case2.xo
+locate/testsuite/locate.gnu/notexists1.xo
+xargs/testsuite/inputs/blank.xi
+xargs/testsuite/xargs.gnu/r.xo
+xargs/testsuite/xargs.gnu/space-0.xo
+xargs/testsuite/xargs.gnu/space-t-0.xo
+xargs/testsuite/xargs.posix/empty_def.xo
+xargs/testsuite/xargs.sysv/empty_def-t.xo
+COPYING
diff --git a/ChangeLog b/ChangeLog
index 4baf096..b28cb60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,51 @@
 2010-04-11  James Youngman  <address@hidden>
 
+       Remove trailing blank lines.
+       * .x-sc_prohibit_empty_lines_at_EOF: Add list of exceptions to the
+       no-blank-lines-at-EOF syntax check.
+       * doc/regexprops.texi: Remove empty lines at the end of the file.
+       * find/finddata.c: Likewise.
+       * find/fstype.c: Likewise.
+       * find/testsuite/excuses.txt: Likewise.
+       * find/testsuite/find.gnu/access.exp: Likewise.
+       * find/testsuite/find.gnu/exec-one-rtn-fail.exp: Likewise.
+       * find/testsuite/find.gnu/posix-perminvalid.exp: Likewise.
+       * find/testsuite/find.gnu/samefile-missing.exp: Likewise.
+       * find/testsuite/find.gnu/samefile-p-brokenlink.exp: Likewise.
+       * find/testsuite/find.gnu/sv-bug-17490.exp: Likewise.
+       * find/testsuite/find.gnu/sv-bug-18222.exp: Likewise.
+       * find/testsuite/find.posix/bracket-depth.exp: Likewise.
+       * find/testsuite/find.posix/empty-parens.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/group-empty.exp: Likewise.
+       * find/testsuite/find.posix/user-empty.exp: Likewise.
+       * find/testsuite/find.posix/user-missing.exp: Likewise.
+       * lib/extendbuf.c: Likewise.
+       * lib/fdleak.c: Likewise.
+       * lib/fdleak.h: Likewise.
+       * lib/findutils-version.h: Likewise.
+       * lib/gnulib-version.h: Likewise.
+       * lib/printquoted.c: Likewise.
+       * lib/regextype.c: Likewise.
+       * lib/safe-atoi.c: Likewise.
+       * locate/testsuite/config/unix.exp: Likewise.
+       * locate/testsuite/locate.gnu/exists1.exp: Likewise.
+       * locate/testsuite/locate.gnu/exists2.exp: Likewise.
+       * locate/testsuite/locate.gnu/exists3.exp: Likewise.
+       * locate/testsuite/locate.gnu/ignore_case1.exp: Likewise.
+       * locate/testsuite/locate.gnu/ignore_case2.exp: Likewise.
+       * locate/testsuite/locate.gnu/ignore_case3.exp: Likewise.
+       * locate/testsuite/locate.gnu/notexists1.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.
+       * m4/Makefile.am: Likewise.
+       * m4/nullsort.m4: Likewise.
+       * xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp: Likewise.
+       * xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp: Likewise.
+
        After-the-fact change to NEWS for 4.5.8: fixed bug 27974.
        * NEWS: Mention that release 4.5.8 also fixed bug #27974 (Use
        gnulib's xreadlinkat support), though the NEWS file in that
diff --git a/doc/regexprops.texi b/doc/regexprops.texi
index e94720f..3dd70af 100644
--- a/doc/regexprops.texi
+++ b/doc/regexprops.texi
@@ -643,4 +643,3 @@ The characters @samp{^} and @samp{$} always represent the 
beginning and end of a
 Intervals are specified by @address@hidden and @address@hidden  Invalid 
intervals such as @address@hidden are not accepted.
 
 The longest possible match is returned; this applies to the regular expression 
as a whole and (subject to this constraint) to subexpressions within groups.
-
diff --git a/find/finddata.c b/find/finddata.c
index eb2fdeb..8565aeb 100644
--- a/find/finddata.c
+++ b/find/finddata.c
@@ -32,4 +32,3 @@ char const *starting_dir = ".";
    Doing it this way allows us to work when the i.w.d. has
    unreadable parents.  */
 int starting_desc;
-
diff --git a/find/fstype.c b/find/fstype.c
index dc96068..c6a6d04 100644
--- a/find/fstype.c
+++ b/find/fstype.c
@@ -329,6 +329,3 @@ get_mounted_devices (size_t *n)
     }
   return result;
 }
-
-
-
diff --git a/find/testsuite/excuses.txt b/find/testsuite/excuses.txt
index 2b744e9..4f435d5 100644
--- a/find/testsuite/excuses.txt
+++ b/find/testsuite/excuses.txt
@@ -44,4 +44,3 @@ g
 {ARG_TEST, "-help",                 parse_help,    NULL},       /* GNU */
 {ARG_TEST, "version",               parse_version, NULL},        /* GNU */
 {ARG_TEST, "-version",              parse_version, NULL},        /* GNU */
-
diff --git a/find/testsuite/find.gnu/access.exp 
b/find/testsuite/find.gnu/access.exp
index 18b7aab..867bc80 100644
--- a/find/testsuite/find.gnu/access.exp
+++ b/find/testsuite/find.gnu/access.exp
@@ -12,4 +12,3 @@ if { ! [ fs_superuser ] } {
     find_start p {tmp -readable -printf "r %p\n" , -writable -printf "w %p\n" 
, -executable  -printf "x %p\n"}
     exec rm -rf tmp
 }
-
diff --git a/find/testsuite/find.gnu/exec-one-rtn-fail.exp 
b/find/testsuite/find.gnu/exec-one-rtn-fail.exp
index c3f66fa..8022585 100644
--- a/find/testsuite/find.gnu/exec-one-rtn-fail.exp
+++ b/find/testsuite/find.gnu/exec-one-rtn-fail.exp
@@ -2,4 +2,3 @@
 # 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/posix-perminvalid.exp 
b/find/testsuite/find.gnu/posix-perminvalid.exp
index 7463a4a..b773511 100644
--- a/find/testsuite/find.gnu/posix-perminvalid.exp
+++ b/find/testsuite/find.gnu/posix-perminvalid.exp
@@ -14,4 +14,3 @@ if [info exists oldval] {
 } else {
     unset env(POSIXLY_CORRECT)
 }
-
diff --git a/find/testsuite/find.gnu/samefile-missing.exp 
b/find/testsuite/find.gnu/samefile-missing.exp
index 143f117..2d509c4 100644
--- a/find/testsuite/find.gnu/samefile-missing.exp
+++ b/find/testsuite/find.gnu/samefile-missing.exp
@@ -1,4 +1,2 @@
 # test for diagnosis of the fact that the argument to -samefile is missing
 find_start f ". -samefile"
-
-
diff --git a/find/testsuite/find.gnu/samefile-p-brokenlink.exp 
b/find/testsuite/find.gnu/samefile-p-brokenlink.exp
index 9289516..8ae1fad 100644
--- a/find/testsuite/find.gnu/samefile-p-brokenlink.exp
+++ b/find/testsuite/find.gnu/samefile-p-brokenlink.exp
@@ -9,5 +9,3 @@ exec ln    tmp/broken tmp/blink
 
 find_start p { -P tmp -samefile tmp/broken -print}
 exec rm -rf tmp
-
-
diff --git a/find/testsuite/find.gnu/sv-bug-17490.exp 
b/find/testsuite/find.gnu/sv-bug-17490.exp
index b0d522d..f29bebf 100644
--- a/find/testsuite/find.gnu/sv-bug-17490.exp
+++ b/find/testsuite/find.gnu/sv-bug-17490.exp
@@ -2,4 +2,3 @@
 #
 # That bug was a coredump if the argument to -regex was the final argument.
 find_start p {. -maxdepth 0 -regex x }
-
diff --git a/find/testsuite/find.gnu/sv-bug-18222.exp 
b/find/testsuite/find.gnu/sv-bug-18222.exp
index f317448..148010a 100644
--- a/find/testsuite/find.gnu/sv-bug-18222.exp
+++ b/find/testsuite/find.gnu/sv-bug-18222.exp
@@ -6,4 +6,3 @@ exec rm -rf tmp
 exec mkdir tmp
 exec touch tmp/short tmp/longer
 find_start p { tmp/short tmp/longer -printf "%H\n" }
-
diff --git a/find/testsuite/find.posix/bracket-depth.exp 
b/find/testsuite/find.posix/bracket-depth.exp
index 05d659e..e748f06 100644
--- a/find/testsuite/find.posix/bracket-depth.exp
+++ b/find/testsuite/find.posix/bracket-depth.exp
@@ -2,4 +2,3 @@ exec rm -rf tmp
 exec mkdir tmp
 # shoud not result in a fatal error.  
 find_start p { tmp \( -depth \) -false -print }
-
diff --git a/find/testsuite/find.posix/empty-parens.exp 
b/find/testsuite/find.posix/empty-parens.exp
index fc22c54..abe43df 100644
--- a/find/testsuite/find.posix/empty-parens.exp
+++ b/find/testsuite/find.posix/empty-parens.exp
@@ -1,3 +1,2 @@
 # empty parentheses should be rejected as being invalid.
 find_start f { . \( -\)  }
-
diff --git a/find/testsuite/find.posix/files-not-expressions1.exp 
b/find/testsuite/find.posix/files-not-expressions1.exp
index cb5386d..b1de3ac 100644
--- a/find/testsuite/find.posix/files-not-expressions1.exp
+++ b/find/testsuite/find.posix/files-not-expressions1.exp
@@ -6,4 +6,3 @@ foreach file $files { touch $file }
 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 da61124..e6dcef2 100644
--- a/find/testsuite/find.posix/files-not-expressions2.exp
+++ b/find/testsuite/find.posix/files-not-expressions2.exp
@@ -6,4 +6,3 @@ foreach file $files { touch $file }
 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 a85bfe7..4bd454b 100644
--- a/find/testsuite/find.posix/files-not-expressions3.exp
+++ b/find/testsuite/find.posix/files-not-expressions3.exp
@@ -6,4 +6,3 @@ foreach file $files { touch $file }
 find_start p { \) }
 
 foreach file $files { file delete -- $file }
-
diff --git a/find/testsuite/find.posix/group-empty.exp 
b/find/testsuite/find.posix/group-empty.exp
index eb7851a..3e83190 100644
--- a/find/testsuite/find.posix/group-empty.exp
+++ b/find/testsuite/find.posix/group-empty.exp
@@ -1,3 +1,2 @@
 # test for diagnosis of the fact that the argument to -group is empty
 find_start f { . -group "" }
-
diff --git a/find/testsuite/find.posix/user-empty.exp 
b/find/testsuite/find.posix/user-empty.exp
index 136fce0..95a6772 100644
--- a/find/testsuite/find.posix/user-empty.exp
+++ b/find/testsuite/find.posix/user-empty.exp
@@ -1,3 +1,2 @@
 # test for diagnosis of the fact that the argument to -user is empty
 find_start f { . -user "" }
-
diff --git a/find/testsuite/find.posix/user-missing.exp 
b/find/testsuite/find.posix/user-missing.exp
index d038735..e1007fc 100644
--- a/find/testsuite/find.posix/user-missing.exp
+++ b/find/testsuite/find.posix/user-missing.exp
@@ -1,3 +1,2 @@
 # test for diagnosis of the fact that the argument to -user is missing
 find_start f { tmp -user }
-
diff --git a/lib/extendbuf.c b/lib/extendbuf.c
index 6cc52d5..40ac8a5 100644
--- a/lib/extendbuf.c
+++ b/lib/extendbuf.c
@@ -117,4 +117,3 @@ xextendbuf (void* existing, size_t wanted, size_t 
*allocated)
     }
   return p;
 }
-
diff --git a/lib/fdleak.c b/lib/fdleak.c
index 47f9579..5252066 100644
--- a/lib/fdleak.c
+++ b/lib/fdleak.c
@@ -393,4 +393,3 @@ complain_about_leaky_fds (void)
     }
   assert (no_leaks);
 }
-
diff --git a/lib/fdleak.h b/lib/fdleak.h
index 550abc2..1ea8c8d 100644
--- a/lib/fdleak.h
+++ b/lib/fdleak.h
@@ -20,4 +20,3 @@ void forget_non_cloexec_fds (void);
 void complain_about_leaky_fds (void);
 
 int open_cloexec(const char *path, int flags, ...);
-
diff --git a/lib/findutils-version.h b/lib/findutils-version.h
index 780502a..65006c2 100644
--- a/lib/findutils-version.h
+++ b/lib/findutils-version.h
@@ -25,4 +25,3 @@
  *
  */
 void display_findutils_version(const char *official_name);
-
diff --git a/lib/gnulib-version.h b/lib/gnulib-version.h
index de4e2ac..73466c3 100644
--- a/lib/gnulib-version.h
+++ b/lib/gnulib-version.h
@@ -16,4 +16,3 @@
 */
 
 extern const char * const gnulib_version;
-
diff --git a/lib/printquoted.c b/lib/printquoted.c
index 068ea4d..f2f11a4 100644
--- a/lib/printquoted.c
+++ b/lib/printquoted.c
@@ -78,4 +78,3 @@ print_quoted (FILE *fp,
     }
   return rv;
 }
-
diff --git a/lib/regextype.c b/lib/regextype.c
index e848811..cc16b6e 100644
--- a/lib/regextype.c
+++ b/lib/regextype.c
@@ -157,6 +157,3 @@ get_regex_type_synonym (unsigned int ix)
     }
   return -1;
 }
-
-
-
diff --git a/lib/safe-atoi.c b/lib/safe-atoi.c
index 296ee3b..70350f7 100644
--- a/lib/safe-atoi.c
+++ b/lib/safe-atoi.c
@@ -84,5 +84,3 @@ safe_atoi (const char *s, enum quoting_style style)
     }
   return (int)lval;
 }
-
-
diff --git a/locate/testsuite/config/unix.exp b/locate/testsuite/config/unix.exp
index 8771b03..dccffd1 100644
--- a/locate/testsuite/config/unix.exp
+++ b/locate/testsuite/config/unix.exp
@@ -339,4 +339,3 @@ proc updatedb_version {} {
        warning "$UPDATEDB, program does not exist"
     }
 }
-
diff --git a/locate/testsuite/locate.gnu/exists1.exp 
b/locate/testsuite/locate.gnu/exists1.exp
index 4341950..a3185c4 100644
--- a/locate/testsuite/locate.gnu/exists1.exp
+++ b/locate/testsuite/locate.gnu/exists1.exp
@@ -5,4 +5,3 @@ exec mkdir $tmp
 exec mkdir $tmp/subdir
 exec touch $tmp/subdir/fred
 locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" 
"--database=$tmp/locatedb -e fred" {}
-
diff --git a/locate/testsuite/locate.gnu/exists2.exp 
b/locate/testsuite/locate.gnu/exists2.exp
index 699903f..ca02f17 100644
--- a/locate/testsuite/locate.gnu/exists2.exp
+++ b/locate/testsuite/locate.gnu/exists2.exp
@@ -6,4 +6,3 @@ 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" } 
-
diff --git a/locate/testsuite/locate.gnu/exists3.exp 
b/locate/testsuite/locate.gnu/exists3.exp
index 6735602..022ad07 100644
--- a/locate/testsuite/locate.gnu/exists3.exp
+++ b/locate/testsuite/locate.gnu/exists3.exp
@@ -6,4 +6,3 @@ 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" } 
-
diff --git a/locate/testsuite/locate.gnu/ignore_case1.exp 
b/locate/testsuite/locate.gnu/ignore_case1.exp
index 0cc4369..ee7abb2 100644
--- a/locate/testsuite/locate.gnu/ignore_case1.exp
+++ b/locate/testsuite/locate.gnu/ignore_case1.exp
@@ -5,4 +5,3 @@ exec mkdir $tmp
 exec mkdir $tmp/subdir
 exec touch $tmp/subdir/fred
 locate_start p "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" 
"--database=$tmp/locatedb -i FRed" {}
-
diff --git a/locate/testsuite/locate.gnu/ignore_case2.exp 
b/locate/testsuite/locate.gnu/ignore_case2.exp
index bd04c3a..1fd0628 100644
--- a/locate/testsuite/locate.gnu/ignore_case2.exp
+++ b/locate/testsuite/locate.gnu/ignore_case2.exp
@@ -5,4 +5,3 @@ exec mkdir tmp
 exec mkdir tmp/subdir
 exec touch tmp/subdir/fred
 locate_start f {--changecwd=. --output=tmp/locatedb --localpaths=tmp/subdir/} 
{--database=tmp/locatedb FRed} {}
-
diff --git a/locate/testsuite/locate.gnu/ignore_case3.exp 
b/locate/testsuite/locate.gnu/ignore_case3.exp
index cf2dc01..b4c0a9e 100644
--- a/locate/testsuite/locate.gnu/ignore_case3.exp
+++ b/locate/testsuite/locate.gnu/ignore_case3.exp
@@ -8,4 +8,3 @@ locate_start p {--changecwd=. --output=tmp/locatedb 
--localpaths=tmp/subdir/} {-
 #updatedb --output=locatedb
 #locate --database=locatedb FRed
 #locate --database=locatedb -i FRed
-
diff --git a/locate/testsuite/locate.gnu/notexists1.exp 
b/locate/testsuite/locate.gnu/notexists1.exp
index ba7f297..0b07a31 100644
--- a/locate/testsuite/locate.gnu/notexists1.exp
+++ b/locate/testsuite/locate.gnu/notexists1.exp
@@ -7,4 +7,3 @@ exec mkdir $tmp
 exec mkdir $tmp/subdir
 exec touch $tmp/subdir/fred
 locate_start f "--changecwd=. --output=$tmp/locatedb --localpaths=tmp/subdir/" 
"--database=$tmp/locatedb -E fred" {}
-
diff --git a/locate/testsuite/locate.gnu/notexists2.exp 
b/locate/testsuite/locate.gnu/notexists2.exp
index e809088..79d3c7c 100644
--- a/locate/testsuite/locate.gnu/notexists2.exp
+++ b/locate/testsuite/locate.gnu/notexists2.exp
@@ -6,4 +6,3 @@ 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" } 
-
diff --git a/locate/testsuite/locate.gnu/notexists3.exp 
b/locate/testsuite/locate.gnu/notexists3.exp
index dc46c09..a391e02 100644
--- a/locate/testsuite/locate.gnu/notexists3.exp
+++ b/locate/testsuite/locate.gnu/notexists3.exp
@@ -6,4 +6,3 @@ 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" } 
-
diff --git a/locate/testsuite/locate.gnu/sv-bug-14535.exp 
b/locate/testsuite/locate.gnu/sv-bug-14535.exp
index cc86b18..3d5d697 100644
--- a/locate/testsuite/locate.gnu/sv-bug-14535.exp
+++ b/locate/testsuite/locate.gnu/sv-bug-14535.exp
@@ -58,4 +58,3 @@ if { [ string length $locale ] } {
 } else {
     warning "Four tests have been skipped because I cannot find a UTF-8 locale 
configured on your system"
 }
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 1b13304..0e513fd 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1 @@
 EXTRA_DIST = findlib.m4 nullsort.m4 order-bad.bin order-good.bin withfts.m4
-
-
diff --git a/m4/nullsort.m4 b/m4/nullsort.m4
index 1f82c69..5f592f7 100644
--- a/m4/nullsort.m4
+++ b/m4/nullsort.m4
@@ -42,4 +42,3 @@ else
         AC_SUBST(SORT_SUPPORTS_Z,[false])
 fi
 ])
-
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 101c442..786ceb1 100644
--- a/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp
+++ b/xargs/testsuite/xargs.posix/arg_max_32bit_linux_bug.exp
@@ -10,4 +10,3 @@
 # 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 84f2985..8a7be59 100644
--- a/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp
+++ b/xargs/testsuite/xargs.posix/arg_max_64bit_linux_bug.exp
@@ -10,4 +10,3 @@
 # differences in the value of ARG_MAX on various platforms will cause the 
 # test to fail.
 xargs_start p { true } 16383-ys.xi
-
-- 
1.7.0