From a16f807d7ee7fe3e2fca65ce63f5e1889e9fbfb4 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 24 Jan 2007 09:32:56 +0100 Subject: 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. --- .x-sc_cast_of_argument_to_free | 1 + ChangeLog | 13 +++++++++++++ Makefile.am | 4 ++-- Makefile.maint | 2 +- lib/.cvsignore | 4 ++++ lib/.gitignore | 4 ++++ m4/.cvsignore | 2 ++ m4/.gitignore | 2 ++ src/sort.c | 2 ++ 9 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 .x-sc_cast_of_argument_to_free diff --git a/.x-sc_cast_of_argument_to_free b/.x-sc_cast_of_argument_to_free new file mode 100644 index 000000000..5368916a3 --- /dev/null +++ b/.x-sc_cast_of_argument_to_free @@ -0,0 +1 @@ +src/sort.c diff --git a/ChangeLog b/ChangeLog index e126ac8b5..3ab78669f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-01-24 Jim Meyering + + 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 * NEWS: New option sort -C, proposed by XCU ERN 127, which looks diff --git a/Makefile.am b/Makefile.am index 9eeeb2037..2da8c2037 100644 --- 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 9baafa3d8..d526baacd 100644 --- 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 '\&2; \ exit 1; } || : diff --git a/lib/.cvsignore b/lib/.cvsignore index fb5f9e0ea..28dc243ee 100644 --- 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 1ebe1d47d..873c4ce7a 100644 --- 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 0311ce8c1..74c32371b 100644 --- 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 e6ae77991..1916f1862 100644 --- 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 f571ecc91..bab232b74 100644 --- 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\ -- cgit v1.2.3-54-g00ecf