Pass "make distcheck" again.

* src/sort.c (usage): Split a diagnostic that had grown to be
longer than the C89 maximum of 509 bytes.
* .x-sc_cast_of_argument_to_free: New file.  Allow a cast in sort.c.
FIXME: this is just temporary, while we wait to remove the offending
access-calling code.
* Makefile.am (EXTRA_DIST): Add .x-sc_cast_of_argument_to_free.
* Makefile.maint (sc_cast_of_argument_to_free): Use the
canonical, $$($(CVS_LIST_EXCEPT)).
* m4/.gitignore, m4/.cvsignore, lib/.gitignore, lib/.cvsignore: Update.

diff --git a/.x-sc_cast_of_argument_to_free b/.x-sc_cast_of_argument_to_free
new file mode 100644 (file)
index 0000000..5368916
--- /dev/null
+++ b/.x-sc_cast_of_argument_to_free
@@ -0,0 +1 @@
+src/sort.c

diff --git a/ChangeLog b/ChangeLog
index e126ac8b5c2aaa11764bd7b2c7e904f4cc10d1ba..3ab78669f4a4e8c9746f8cfa1fa31857b8811047 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-01-24  Jim Meyering  <jim@meyering.net>
+
+       Pass "make distcheck" again.
+       * src/sort.c (usage): Split a diagnostic that had grown to be
+       longer than the C89 maximum of 509 bytes.
+       * .x-sc_cast_of_argument_to_free: New file.  Allow a cast in sort.c.
+       FIXME: this is just temporary, while we wait to remove the offending
+       access-calling code.
+       * Makefile.am (EXTRA_DIST): Add .x-sc_cast_of_argument_to_free.
+       * Makefile.maint (sc_cast_of_argument_to_free): Use the
+       canonical, $$($(CVS_LIST_EXCEPT)).
+       * m4/.gitignore, m4/.cvsignore, lib/.gitignore, lib/.cvsignore: Update.
+
 2007-01-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: New option sort -C, proposed by XCU ERN 127, which looks

diff --git a/Makefile.am b/Makefile.am
index 9eeeb2037d18fc36d66b8505c341f0e7af712d68..2da8c2037777593d1a93ff4143666c3459eab53a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils.                                      -*-Makefile-*-
 
-# Copyright (C) 1990, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-# 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1990, 1993-2007 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
@@ -27,6 +26,7 @@ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
   .x-po-check \
   .x-sc_file_system .x-sc_obsolete_symbols \
   .x-sc_prohibit_atoi_atof \
+  .x-sc_cast_of_argument_to_free \
   .x-sc_require_config_h \
   .x-sc_space_tab .x-sc_sun_os_names \
   .x-sc_trailing_blank \

diff --git a/Makefile.maint b/Makefile.maint
index 9baafa3d8d3f2face81b88000edefd14058b91c8..d526baacda6edeebc4122d135a3a17c403162262 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -98,7 +98,7 @@ syntax-check: $(syntax-check-rules)
 # FIXME: don't allow `#include .strings\.h' anywhere
 
 sc_cast_of_argument_to_free:
-       @grep -nE '\<free \(\(' $(srcdir)/{lib,src}/*.[chly] &&         \
+       @grep -nE '\<free \(\(' $$($(CVS_LIST_EXCEPT)) &&               \
          { echo '$(ME): don'\''t cast free argument' 1>&2;             \
            exit 1; } || :
 

diff --git a/lib/.cvsignore b/lib/.cvsignore
index fb5f9e0ea05fb32f080588b5cb1566434719c95f..28dc243ee7fbb4384f91292da75006a5e308321f 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -40,6 +40,7 @@ close-stream.c
 close-stream.h
 closeout.c
 closeout.h
+concatpath.c
 config.charset
 config.h
 config.hin
@@ -85,6 +86,8 @@ filemode.c
 filemode.h
 filenamecat.c
 filenamecat.h
+findprog.c
+findprog.h
 fnmatch.c
 fnmatch.h
 fnmatch_.h
@@ -220,6 +223,7 @@ openat-proc.c
 openat.c
 openat.h
 pathmax.h
+pathname.h
 physmem.c
 physmem.h
 pipe-safer.c

diff --git a/lib/.gitignore b/lib/.gitignore
index 1ebe1d47defe08703e08f1d40cdf68f1dcee28de..873c4ce7a7eae00f0308f4a07fbd209a7506d551 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -37,6 +37,7 @@ close-stream.c
 close-stream.h
 closeout.c
 closeout.h
+concatpath.c
 config.charset
 configmake.h
 creat-safer.c
@@ -80,6 +81,8 @@ filemode.c
 filemode.h
 filenamecat.c
 filenamecat.h
+findprog.c
+findprog.h
 fnmatch.c
 fnmatch.h
 fnmatch_.h
@@ -214,6 +217,7 @@ openat-proc.c
 openat.c
 openat.h
 pathmax.h
+pathname.h
 physmem.c
 physmem.h
 pipe-safer.c

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 0311ce8c1f765158d252bdf96400542198b263e1..74c32371b3b809eb77fd21237b2c6619a6f69ee7 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -30,6 +30,7 @@ dirname.m4
 dos.m4
 double-slash-root.m4
 dup2.m4
+eaccess.m4
 eealloc.m4
 eoverflow.m4
 error.m4
@@ -44,6 +45,7 @@ file-type.m4
 fileblocks.m4
 filemode.m4
 filenamecat.m4
+findprog.m4
 flexmember.m4
 fnmatch.m4
 fpending.m4

diff --git a/m4/.gitignore b/m4/.gitignore
index e6ae77991f59983def972002d44a7f7ecebafbe5..1916f1862dc2f2c06ad77a7512fc90c2daccfb1a 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -29,6 +29,7 @@ dirname.m4
 dos.m4
 double-slash-root.m4
 dup2.m4
+eaccess.m4
 eealloc.m4
 eoverflow.m4
 error.m4
@@ -43,6 +44,7 @@ file-type.m4
 fileblocks.m4
 filemode.m4
 filenamecat.m4
+findprog.m4
 flexmember.m4
 fnmatch.m4
 fpending.m4

diff --git a/src/sort.c b/src/sort.c
index f571ecc919b6f16d364ec9dfd2338c8f90381911..bab232b74c5213d1d25e257b2fc63aa074ca4b06 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -341,6 +341,8 @@ Other options:\n\
   -C, --check=quiet, --check=silent  like -c, but do not report first bad line\n\
   -k, --key=POS1[,POS2]     start a key at POS1, end it at POS2 (origin 1)\n\
   -m, --merge               merge already sorted files; do not sort\n\
+"), stdout);
+      fputs (_("\
   -o, --output=FILE         write result to FILE instead of standard output\n\
   -s, --stable              stabilize sort by disabling last-resort comparison\n\
   -S, --buffer-size=SIZE    use SIZE for main memory buffer\n\