summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2010-04-17 22:13:41 +0200
committerJim Meyering <meyering@redhat.com>2010-04-17 22:15:37 +0200
commit340812dc815bfb7579805a866715de3cb386b040 (patch)
tree727b17ff90f46d2ff46baf666909358976eaf9aa
parentfef5e6b4fc847bb1c01a20314effae7cb7828f38 (diff)
downloadgnulib-340812dc815bfb7579805a866715de3cb386b040.tar.gz
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/
-rw-r--r--ChangeLog6
-rw-r--r--top/maint.mk22
2 files changed, 18 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d56e5a3e3..0b90da060e 100644
--- 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 cb8461cdc8..f646e4376e 100644
--- 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)' \