maint.mk: use gnu-style indentation in an embedded perl script

* top/maint.mk (detect_empty_lines_at_EOF_): Clean up formatting.
Rename variable: s/two/last_two_bytes/

diff --git a/ChangeLog b/ChangeLog
index 4d56e5a3e3fc3133711a131664666a79b332dd0f..0b90da060efbba3373ec4393c998587cf47a7ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-17  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: use gnu-style indentation in an embedded perl script
+       * top/maint.mk (detect_empty_lines_at_EOF_): Clean up formatting.
+       Rename variable: s/two/last_two_bytes/
+
 2010-04-16  Eric Blake  <eblake@redhat.com>
 
        test-stdbool: skip test that fails with Solaris CC

diff --git a/top/maint.mk b/top/maint.mk
index cb8461cdc879d1a59296e3f598aad5a0e9da24a9..f646e4376ec77dc3d78248158c867da3c90fae92 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -694,16 +694,18 @@ sc_prohibit_cvs_keyword:
 #   perl -pi -0777 -e 's/\n\n+$/\n/' files...
 #
 detect_empty_lines_at_EOF_ =                                           \
-  foreach my $$f (@ARGV) {                                             \
-    open F, "<", $$f or (warn "failed to open $$f: $$!\n"), next;      \
-    my $$p = sysseek (F, -2, 2);                                       \
-    my $$c = "seek failure probably means file has < 2 bytes; ignore"; \
-    my $$two;                                                          \
-    defined $$p and $$p = sysread F, $$two, 2;                         \
-    close F;                                                           \
-    $$c = "ignore read failure";                                       \
-    $$p && $$two eq "\n\n" and (print $$f), $$fail=1;                  \
-    } END { exit defined $$fail }
+  foreach my $$f (@ARGV)                                               \
+    {                                                                  \
+      open F, "<", $$f or (warn "failed to open $$f: $$!\n"), next;    \
+      my $$p = sysseek (F, -2, 2);                                     \
+      my $$c = "seek failure probably means file has < 2 bytes; ignore"; \
+      my $$last_two_bytes;                                             \
+      defined $$p and $$p = sysread F, $$last_two_bytes, 2;            \
+      close F;                                                         \
+      $$c = "ignore read failure";                                     \
+      $$p && $$last_two_bytes eq "\n\n" and (print $$f), $$fail=1;     \
+    }                                                                  \
+  END { exit defined $$fail }
 sc_prohibit_empty_lines_at_EOF:
        @perl -le '$(detect_empty_lines_at_EOF_)' $$($(VC_LIST_EXCEPT)) \
           || { echo '$(ME): the above files end with empty line(s)'     \