1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-17 17:18:45 +02:00
Commit Graph

279 Commits

Author SHA1 Message Date
Jim Meyering
a6c6e57b71 (add_temp_dir): Use x2nrealloc rather than xrealloc.
(fillbuf): Use x2nrealloc rather than xrealloc.
(sort): Use xnmalloc rather than xmalloc.
(main): Likewise.
2004-01-04 21:12:00 +00:00
Jim Meyering
5506fdeffd (new_key): Use xzalloc, not xcalloc. 2003-11-04 09:28:28 +00:00
Jim Meyering
08fd60e693 (inittables): Use sizeof *var' rather than sizeof EXPLICIT_TYPE'.
The former is more maintainable and usually shorter.
(sort): Split a long line.
2003-11-02 20:16:19 +00:00
Jim Meyering
cf4fdf373f Most .c files (AUTHORS): Revert the WRITTEN_BY/AUTHORS change
of 2003-09-19.  Now, AUTHORS is a comma-separated list of strings.
Update the call to parse_long_options so that `AUTHORS, NULL' are the
last parameters.

* src/true.c (main): Append NULL to version_etc argument list.
* src/sys2.h (case_GETOPT_VERSION_CHAR): Likewise.
2003-10-18 10:05:47 +00:00
Jim Meyering
a9825dd2a6 (parse_field_count): Handle the case where overflow
and invalid suffix char are both reported.
2003-10-15 07:24:39 +00:00
Jim Meyering
793eadf8a9 Remove unnecessary casts of alloca, since now it's guaranteed to be (void *). 2003-09-28 08:21:14 +00:00
Jim Meyering
bafd927f03 (WRITTEN_BY): Rename from AUTHORS.
Begin each WRITTEN_BY string with `Written by ' and end it with `.'.
Mark each WRITTEN_BY string as translatable.
2003-09-18 22:19:03 +00:00
Jim Meyering
c6ec144494 revert previous change 2003-09-18 19:39:12 +00:00
Jim Meyering
3280bf4b55 Update AUTHORS definition to be a comma-separated list of strings and/or update
the call to parse_long_options so that `AUTHORS, NULL' are the last parameters.
2003-09-18 18:22:23 +00:00
Jim Meyering
df1f0a8083 (numcompare): Rename local, logb, to log_b to avoid
shadowing the math function name.  Also rename loga to log_a.
2003-09-18 16:28:47 +00:00
Jim Meyering
1f4715e0e8 Don't ignore -S if input is a pipe. Bug report by Michael McFarland in
<http://mail.gnu.org/archive/html/bug-coreutils/2003-09/msg00008.html>.

(sort_buffer_size): Omit SIZE_BOUND arg.  Compute the
size_bound ourselves. if an input file is a pipe and the user
specified a size, use that size instead of trying to guess the
pipe size.  This has the beneficial side effect of avoiding the
overhead of default_sort_size in that case.  All callers changed.
(sort): Remove static var size; now done by sort_buffer_size.
2003-09-05 20:53:08 +00:00
Jim Meyering
70293df29a (usage): Say "blanks" instead of "whitespace",
Similar fixes for many comments.
(TAB_DEFAULT): New constant, so that we can support NUL as
the field separator.
(tab): Now int, not char.  Initialize to TAB_DEFAULT.
(specify_sort_size): If multiple sizes are specified, use the largest.
(begfield, limfield): Support NUL tab char.
(set_ordering): Do not let -i override -d.
(main): Report an error if incompatible -o or -t options are given.
Report an error for "-t ''".  Allow "-t '\0'" to specify a NUL tab.
2003-09-04 22:12:59 +00:00
Jim Meyering
cf572dd1d0 (main): Use unsigned int instead of int for `nsigs'
and for the indices to iterate through nsigs.
2003-08-04 08:55:44 +00:00
Jim Meyering
801362fc36 Minor code cleanups, mostly to use more accurate
types and to remove unnecessary casts.
(min, max): Remove.  All uses changed to MIN and MAX.
(hard_lc_collate, hard_LC_TIME, struct buffer.eof, struct
keyfield.skipsblanks, struct keyfield.skipeblanks, struct
keyfield.numeric, struct keyfield.general_numeric, struct
keyfield.month, struct keyfield.reverse, reverse, unique,
have_read_stdin): Now bool, not int.  All uses changed.
(eolchar): Now char, not int.
(struct keyfield.ignore): Now bool const *, not int *.
(struct keyfield.translate): Now char const *, not char *.
(struct month.name): Likewise.
(blanks, nonprinting, nondictionary): Now bool[], not int[].
(cleanup, inittables, keycompare, check, mergefps, first_same_file,
check, sort, main): Use const * pointers when possible.
(month_cmp): Rewrite to avoid casts.
(inittables): Initialize tables unconditionally, to avoid branches.
(fillbuf): Return bool, not int.  All uses changed.
(fillbuf, keycompare, new_key, main):
Use SIZE_MAX rather than (size_t) -1.
(trailing_blanks): Renamed from trim_trailing_blanks.
Return the number of blanks to trim.  All uses changed.
(getmonth): Use trailing_blanks rather than open code.
(keycompare): Do not cast char * to unsigned char *; not needed.
CMP_WITH_IGNORE converts args to UCHAR, so no need to convert it
ourselves.
(compare, main): Use | rather than || to avoid jumps.
Replace "diff = NONZERO (alen)" with "diff = 1", since alen must
be nonzero there.
(check, first_same_file, sort, main):
Use bool instead of int local vars when possible.
(check): Merge the old 'checkfp' and 'check' into a single function,
that returns a boolean (true if the file was ordered).
All uses changed.
(main): Use int instead of unsigned for iterating through nsigs.
Rename local var "posix_pedantic" to "posixly_correct".
2003-08-03 10:28:10 +00:00
Jim Meyering
054819d791 (sortlines): Add description and references.
From Paul Eggert.
2003-08-02 06:25:50 +00:00
Jim Meyering
32d9cf7b5b (sortlines_temp): Undo previous change. 2003-07-28 08:31:11 +00:00
Jim Meyering
682d905a29 (sortlines_temp): Declare local swap' to be int', not
`bool'.  Otherwise, at least one buggy compiler (alpha gcc-2.95.4)
would cause lines[-1 - swap] (with swap = false) to evaluate to
lines[4294967295].
2003-07-27 22:05:43 +00:00
Jim Meyering
379405a3a3 remove trailing blanks 2003-07-27 08:58:55 +00:00
Jim Meyering
6013cbabde (sort): Don't require two `struct line's per text line,
the new sort algorithm requires just 1.5.
2003-07-27 08:28:13 +00:00
Jim Meyering
665f7a2d0f This change was inspired by a similar proposal by Stepan Kasal.
(mergelines, sortlines_temp): New functions.
(sortlines): Use them, to reduce the number of times that
we need to copy 'struct line' values.  This improved CPU
performance by about 30% on one 18 MB test.
(sort): Don't invoke sortlines unless we have 2 or more lines.
2003-07-27 08:26:49 +00:00
Jim Meyering
4f4e9aa8e1 Don't include headers already included by system.h:
Don't include closeout.h.
2003-07-23 07:29:54 +00:00
Jim Meyering
fe52d65af0 Include "exitfail.h".
(main): Set exit_failure rather than calling close_stdout_set_status.
2003-07-19 08:16:38 +00:00
Jim Meyering
1d7432c0ef (main): Use close_stdout via atexit.
Now `sort --version' and `sort --help' fail, as they should
when their output is redirected to /dev/full.
2003-07-18 08:53:05 +00:00
Jim Meyering
30d8071d60 Include "exitfail.h".
(main): Set exit_failure, not xalloc_exit_failure and xmemcoll_exit_failure.
2003-07-18 07:23:38 +00:00
Jim Meyering
6bcd4b08ba (main): Call initialize_main. 2003-06-17 18:13:23 +00:00
Jim Meyering
6fc0245123 (sort): Don't apply cast to argument of free. 2003-05-13 14:43:43 +00:00
Jim Meyering
25227196a8 (zaptemp): Don't apply cast to argument of free. 2003-05-13 14:36:29 +00:00
Jim Meyering
12844e5674 fix off-by-one error in last change 2003-05-09 22:16:22 +00:00
Jim Meyering
6476197bcb (main): Don't overrun array bound if argc is 0.
That would happen when invoked via: execl ("/usr/bin/sort", NULL);
2003-05-09 08:50:37 +00:00
Jim Meyering
6c93bdeeaa Remove anachronistic casts of xmalloc,
xrealloc, and xcalloc return values and of xrealloc's first argument.
2003-04-11 10:51:56 +00:00
Jim Meyering
a5f14f167e Remove all uses of `PARAMS'. 2002-12-15 20:54:29 +00:00
Jim Meyering
20282f4992 (main): Also declare `i' to be unsigned, not int. 2002-11-10 10:23:41 +00:00
Jim Meyering
a040c8e428 (sighandler): Use raise, rather than kill+getpid.
(main): Declare `nsigs' to be unsigned, not int.
2002-11-10 09:56:19 +00:00
Jim Meyering
c7a6c9af8b (checkfp): Use primitives from inttostr.h, not human.h,
to print large numbers simply.
2002-11-05 20:34:00 +00:00
Jim Meyering
7a58f340c1 (begfield, limfield): Don't advance the write pointer past the
end of the write buffer.
2002-10-08 06:19:00 +00:00
Jim Meyering
16b4b4f861 (begfield, limfield): Rearrange comparisons to avoid compiler warnings.
(fillbuf, keycompare): Cast literal `-1' to size_t in comparisons,
to avoid compiler warnings.
2002-09-28 16:32:23 +00:00
Jim Meyering
4cb69e11ad Guard inclusion of <langinfo.h> with
`#if HAVE_LANGINFO_CODESET', not `#if HAVE_LANGINFO_H'.
2002-08-08 16:36:33 +00:00
Jim Meyering
c8729cad98 Adjust command examples in comments to use POSIX 1003.1-2001 option syntax.
From Paul Eggert.
2002-07-29 08:40:10 +00:00
Jim Meyering
5a731510b2 (usage): Use the PACKAGE_BUGREPORT e-mail address, rather than hard-coding it. 2002-07-02 09:06:33 +00:00
Jim Meyering
0c4c742189 (keycompare, compare): Replace #ifdef ENABLE_NLS with if (HAVE_SETLOCALE).
(hard_LC_COLLATE): Define even if ! ENABLE_NLS.
(main): Always initialize hard_LC_COLLATE.
Put initialization next to other locale-related stuff.

Include <langinfo.h> even if ! ENABLE_NLS.
(decimal_point, th_sep): Depend on HAVE_SETLOCALE, not ENABLE_NLS.
(main): Likewise.
(MONTHTAB_CONST): Remove; all uses removed.
(struct_month_cmp, inittables): Do not depend on ENABLE_NLS.
(main): hard_LC_TIME locale does not depend on ENABLE_NLS.
2002-04-30 09:29:45 +00:00
Jim Meyering
e98b44e829 Include posixver.h.
(usage): Document only the intersection of the old and new behaviors,
to encourage portability.
(short_options): Remove; no longer needed.
(COMMON_SHORT_OPTIONS): New macro.
(main): Parse options using POSIX 1003.1-2001 rules if
conforming to that standard.  Do not warn of obsolete options.
2002-02-16 07:44:20 +00:00
Jim Meyering
5e2bb11618 Add more support for POSIX 1003.1-2001, which requires removal for
support of obsolete "-N" option syntax in expand, head, fold,
split, tail, unexpand, uniq, and which prohibits options with
optional arguments in od and pr.

(main): Check for obsolete options.
(short_options): New constant.
2002-02-02 09:37:12 +00:00
Jim Meyering
026c2017b1 Include xmemcoll.h, not memcoll.h.
Use xmemcoll instead of memcoll.

(die): Do not invoke cleanup; atexit does this now.
(main): Use atexit to invoke cleanup on exit.
Set xmemcoll_exit_failure to SORT_FAILURE.
2002-01-22 08:12:51 +00:00
Jim Meyering
2d1ec93821 (CMP_WITH_IGNORE): Don't assume that the difference
between two size_t values can be stored in an int; this doesn't
work, for example, on 64-bit Solaris.
2002-01-21 22:02:28 +00:00
Jim Meyering
ee6911b745 Don't include "xalloc.h", as system.h already does that via sys2.h. 2002-01-21 19:49:51 +00:00
Jim Meyering
36a16de45c (main): Issue a warning for obsolete usage, unless POSIXLY_CORRECT. 2002-01-18 23:39:06 +00:00
Jim Meyering
2bea3939c6 Add support for POSIX 1003.1-2001, which requires removal for
support of obsolete "+" option syntax in sort, tail, and uniq.

(usage, main): Implement this.
2002-01-16 22:56:33 +00:00
Jim Meyering
98ad587709 (mergefps): Fix bug when eliminating empty files. 2002-01-14 08:36:48 +00:00
Jim Meyering
3c20276087 (usage, specify_sort_size): Accept 'K' (which is
now preferred, as it connotes 1024) as well as 'k'.
2001-12-20 16:53:50 +00:00
Jim Meyering
3a0a028c8c Reflect renaming to, and new usage of these macros:
HELP_OPTION_DESCRIPTION and VERSION_OPTION_DESCRIPTION.
2001-12-01 17:41:25 +00:00