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

125 Commits

Author SHA1 Message Date
Jim Meyering
0b08c38152 Cosmetic: use X2NREALLOC (only two arguments) rather than x2nrealloc (with three). 2005-08-12 07:16:25 +00:00
Paul Eggert
3ca74b36f5 Adjust to the change to DECIMAL_DIGIT_ACCUMULATE: its last arg is now
a type, not a value.
2005-07-05 06:32:54 +00:00
Jim Meyering
44d59bb168 Update FSF postal mail address. 2005-05-14 07:58:31 +00:00
Jim Meyering
c0c815af8d Update FSF postal mail address. 2005-05-14 06:57:06 +00:00
Jim Meyering
94064e8436 (longopts): Use NULL, not `0'. 2005-03-28 18:01:04 +00:00
Jim Meyering
0d22e40caf (set_fields): Update use of DECIMAL_DIGIT_ACCUMULATE. 2005-03-25 20:59:07 +00:00
Jim Meyering
183cba6524 (set_fields): Use DECIMAL_DIGIT_ACCUMULATE macro in
place of nearly-equivalent code.
2005-03-17 14:35:42 +00:00
Jim Meyering
947457a331 Remove `register' keyword. 2005-03-06 16:30:45 +00:00
Jim Meyering
7380cf792a (complement, COMPLEMENT_OPTION): New.
(longopts): Add --complement.
(usage): Say not that -b, -c, and -f `print' fields,
but rather that they `select' fields for printing.
Describe the new --complement option.
(mark_range_start): Extracted from set_fields.
(print_kth): Support --complement.
(compare_ranges): New function.
(set_fields): Rewrite the part that populates range_start_ht,
merging it with the part that populates printable_field.
(main): Handle --complement.

From Paolo Bonzini.
2004-12-04 13:32:48 +00:00
Paul Eggert
6d988bb20d (usage): Improve documentation along the lines suggested
by Debian 5.2.1-2.
2004-11-16 20:47:28 +00:00
Paul Eggert
81ca57a91d Remove unused "case 0". 2004-09-21 22:26:42 +00:00
Paul Eggert
a982e48ca3 (cut_fields): Use to_uchar rather than a cast.
(cut_file, main): Use bool for booleans.
2004-08-03 05:59:14 +00:00
Paul Eggert
2c223a305b (hash_int) [!defined UINTPTR_MAX]: Use size_t instead of uintptr_t. 2004-08-02 05:25:33 +00:00
Jim Meyering
847e066085 Fix a bug in how the --output-delimiter=D option works with
abutting byte or character ranges.  Reported by David Krider in
http://lists.gnu.org/archive/html/bug-coreutils/2004-05/msg00132.html

(print_kth): Remove special case for open-ended range.
(set_fields): Record the range start index for an interval even
when it abuts another interval on its low side.
Also record the range start index of the longest right-open-interval.
2004-06-02 21:20:41 +00:00
Jim Meyering
7f814a5e96 (cut_fields): Adjust to new signature of getndelim2. 2004-05-17 13:16:53 +00:00
Jim Meyering
ffccc03ad8 (cut_fields): Free buffer upon getndelim2 failure. 2004-04-20 06:50:37 +00:00
Jim Meyering
e0261d2e72 (usage): Use EXIT_SUCCESS, not 0, for clarity.
(usage): Don't bother normalizing exit status
since the arg is already the correct exit status now.

(FATAL_ERROR, main): Exit with status EXIT_FAILURE, not 2, on errors.
2004-01-21 22:50:28 +00:00
Jim Meyering
c1f33f59f5 Fix 'cut' problems with size_t overflow and unsigned int.
More generally, resize integer variables to fit use more precisely.

(ADD_RANGE_PAIR): Remove unnecessary parens.
(struct range_pair): Make members to be of type size_t, not unsigned.
(max_range_endpoint, eol_range_start): Now size_t, not unsigned.
(suppress_non_delimited, output_delimiter_specified,
have_read_stdin, print_kth, set_fields): Now bool, nt int.
(delim): Now unsigned char, not int.
(mark_printable_field, is_printable_field, is_range_start_index,
set_fields, set_fields, cut_bytes, cut_fields):
Use size_t, not unsigned, for field and byte counts.
(hash_int): Use uintptr_t, not unsigned, for pointers converted
to integers.  This squeezes more info out of them.
(set_fields, cut_bytes, cut_fields, main):
Use bool, not int, for booleans.
(set_fields): Allocate zeroed byte array with xzalloc, not xcalloc.
2003-11-06 08:37:55 +00:00
Jim Meyering
6ffc95a9e3 (ADD_RANGE_PAIR): Use x2nrealloc rather than xrealloc,
to avoid potential overflow in pointer arithmetic.
(set_fields): Use not `1', but rather `sizeof *printable_field' as
second argument to xcalloc.
2003-11-04 06:28:01 +00:00
Jim Meyering
24a7d395e3 (hash_int): Adjust to reflect
type changes (unsigned int -> size_t) in hash.c.
2003-10-25 15:33:28 +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
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
00f84b1e64 Include getndelim2.h rather than getdelim2.h.
(cut_fields): Invoke getndelim2 rather than getdelim2.
2003-08-07 09:33:48 +00:00
Jim Meyering
aca28ca9ac (cut_fields): Don't read again after encountering EOF.
E.g., `cut -f2' would do so.
2003-08-02 19:53:52 +00:00
Jim Meyering
9ee5095608 (is_printable_field): Simplify bit arithmetic. 2003-07-27 06:45:56 +00:00
Jim Meyering
df1bfa25aa Use only one bit per field/offset in array, not one `int'.
(printable_field): Change type to `unsigned char'.
(mark_printable_field, is_printable_field): New functions.
Use them in place of all direct accesses of `printable_field'.
2003-07-26 09:40:14 +00:00
Jim Meyering
421680e11c (set_fields): Detect overflow properly. 2003-07-26 09:12:30 +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
a19486436f tweak comment 2003-07-22 21:56:23 +00:00
Jim Meyering
9239223865 (set_fields): Use xcalloc in place of xmalloc+memset. 2003-07-22 21:53:39 +00:00
Jim Meyering
4457508c7a don't include stdboo.h. it's already included via system.h 2003-07-22 14:18:58 +00:00
Jim Meyering
6dc75c643b (main) [lint]: Initialize spec_list_string to avoid warning. 2003-07-22 14:15:31 +00:00
Jim Meyering
3fe298f13f (set_fields): Mark all selected indices before trying to
determine range endpoints.
2003-07-22 13:00:45 +00:00
Jim Meyering
bf2cf0b7ba Begin to address this comment: What if someone wants to
extract the 1,000,000-th field of some huge input file?
The first step is to rearrange things so that the values
in the printable_field array are all 0/1 rather than 0/1/2.

(RANGE_START_SENTINEL): Remove.
Store range-start indices in a hash table, rather than
overloading the `printable_field' array.
(range_start_ht): New global.
(hash_int, hash_compare_ints, is_range_start_index): New functions.
(print_kth): Use is_range_start_index; don't test printable_field.
(set_fields): Detect overflow.
(set_fields): Insert each range-start index into range_start_ht.
(main): Call set_fields only once, and only after
output_delimiter_specified and (if required) range_start_ht have
been defined.
2003-07-22 11:56:24 +00:00
Jim Meyering
91c698cb2f Include "getdelim2.h", not "getstr.h".
Reflect renaming: getstr -> getdelim2.
2003-06-18 07:59:14 +00:00
Jim Meyering
6bcd4b08ba (main): Call initialize_main. 2003-06-17 18:13:23 +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
322ee6e302 When selecting ranges of byte offsets (as opposed to ranges of fields)
and when --output-delimiter=STRING is specified, output STRING between
ranges of selected bytes.

(RANGE_START_SENTINEL): Define.
(output_delimiter_specified): New global.
(print_kth): Add parameter.  Adjust all callers.
(set_fields): Mark each range-start index with RANGE_START_SENTINEL.
(cut_bytes): When requested, output STRING between ranges of
selected bytes.
(main): Make a diagnostic a little clearer.
Based on a patch from Jan Nieuwenhuizen.
2003-01-09 20:16:58 +00:00
Jim Meyering
e66ab953ef (set_fields): Make code agree with comment:
Don't merge abutting ranges like 4- and 2-3.  This makes no
difference currently, but is required to support an upcoming change.
2003-01-09 19:30:22 +00:00
Jim Meyering
7d1c764098 (set_fields): Fix typo in comment. 2003-01-07 17:12:11 +00:00
Jim Meyering
0b7a5a2391 (cut_fields): Add a temporary size_t variable, n_bytes, to avoid warnings. 2002-10-12 09:40:02 +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
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
Jim Meyering
afa12bc912 (usage): Use new macros, EMIT_HELP_DESCRIPTION and EMIT_VERSION_DESCRIPTION
instead of hard-coding --help and --version descriptions.
2001-12-01 17:21:56 +00:00
Jim Meyering
909dc8c01d Factor out some common strings to make translation easier.
Split usage strings so that --help and --version descriptions are alone
in their own string.
Likewise for the one that says:
  Mandatory arguments to long options are mandatory for short options too.
2001-11-23 19:58:23 +00:00
Jim Meyering
69b3ea263d (usage): Split --help output into smaller pieces.
Use fputs, not printf.
2001-11-11 20:04:57 +00:00
Jim Meyering
ff4121e50e (usage): Say that
``Mandatory arguments to long options are mandatory for short options too.\n\''
2001-11-04 09:43:16 +00:00
Jim Meyering
41a201e991 (AUTHORS): Mark string for translation, since it contains the English word `and'. 2001-08-13 10:33:28 +00:00