diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cut.c | 73 | ||||
| -rw-r--r-- | src/od.c | 4 | ||||
| -rw-r--r-- | src/sort.c | 2 | ||||
| -rw-r--r-- | src/tac.c | 2 |
4 files changed, 46 insertions, 35 deletions
@@ -77,6 +77,14 @@ #include "system.h" #include "version.h" +#define FATAL_ERROR(s) \ + do \ + { \ + error (0, 0, (s)); \ + usage (2); \ + } \ + while (0) + char *xmalloc (); char *xrealloc (); void error (); @@ -87,7 +95,6 @@ static void cut_stream (); static void cut_bytes (); static void cut_fields (); static void enlarge_line (); -static void invalid_list (); static void usage (); /* The number of elements allocated for the input line @@ -109,10 +116,10 @@ static char *inbufptr; /* What can be done about a byte or field. */ enum field_action -{ - FIELD_OMIT, - FIELD_OUTPUT -}; + { + FIELD_OMIT, + FIELD_OUTPUT + }; /* In byte mode, which bytes to output. In field mode, which `delim'-separated fields to output. @@ -121,15 +128,15 @@ enum field_action static enum field_action *fields; enum operating_mode -{ - undefined_mode, + { + undefined_mode, - /* Output characters that are in the given bytes. */ - byte_mode, + /* Output characters that are in the given bytes. */ + byte_mode, - /* Output the given delimeter-separated fields. */ - field_mode -}; + /* Output the given delimeter-separated fields. */ + field_mode + }; /* The name this program was run with. */ char *program_name; @@ -203,27 +210,27 @@ main (argc, argv) case 'c': /* Build the byte list. */ if (operating_mode != undefined_mode) - usage (2); + FATAL_ERROR ("only one type of list may be specified"); operating_mode = byte_mode; if (set_fields (optarg) == 0) - error (2, 0, "no fields given"); + FATAL_ERROR ("missing list of positions"); break; case 'f': /* Build the field list. */ if (operating_mode != undefined_mode) - usage (2); + FATAL_ERROR ("only one type of list may be specified"); operating_mode = field_mode; if (set_fields (optarg) == 0) - error (2, 0, "no fields given"); + FATAL_ERROR ("missing list of fields"); break; case 'd': /* New delimiter. */ if (optarg[0] == '\0') - error (2, 0, "no delimiter given"); + FATAL_ERROR ("missing delimiter argument"); if (optarg[1] != '\0') - error (2, 0, "delimiter must be a single character"); + FATAL_ERROR ("the delimiter must be a single character"); delim = optarg[0]; break; @@ -249,10 +256,10 @@ main (argc, argv) usage (0); if (operating_mode == undefined_mode) - usage (2); + FATAL_ERROR ("you must specify a list of bytes, characters, or fields"); if ((delimited_lines_only || delim != '\0') && operating_mode != field_mode) - usage (2); + FATAL_ERROR ("a delimiter may be specified only when operating on fields"); if (delim == '\0') delim = '\t'; @@ -297,7 +304,7 @@ set_fields (fieldstr) { /* Starting a range. */ if (dash_found) - invalid_list (); + FATAL_ERROR ("invalid byte or field list"); dash_found++; fieldstr++; @@ -330,7 +337,7 @@ set_fields (fieldstr) { /* `m-n' or `-n' (1-n). */ if (value < initial) - invalid_list (); + FATAL_ERROR ("invalid byte or field list"); if (value >= line_size) enlarge_line (value); @@ -401,7 +408,7 @@ set_fields (fieldstr) fieldstr++; } else - invalid_list (); + FATAL_ERROR ("invalid byte or field list"); } } @@ -507,11 +514,14 @@ cut_fields (stream) FILE *stream; { register int c; /* Each character from the file. */ + int last_c; /* The previour character. */ int doneflag = 0; /* Nonzero if EOF reached. */ int char_count; /* Number of chars in line before any delim. */ int fieldfound; /* Nonzero if any fields to print found. */ int curr_field; /* Current index in `fields'. */ + c = EOF; + while (doneflag == 0) { char_count = 0; @@ -522,11 +532,18 @@ cut_fields (stream) do { + last_c = c; c = getc (stream); if (c == EOF) { doneflag++; - break; + if (last_c == '\n' || last_c == EOF) + break; + + /* The last character from the input stream is not a + newline. Pretend that the input was NL terminated. + But do that only if the file is not completely empty. */ + c = '\n'; } if (fields[curr_field] == FIELD_OUTPUT && c != '\n') @@ -552,7 +569,7 @@ cut_fields (stream) enlarge_line (curr_field); } } - while (c != '\n'); + while (c != '\n' && !doneflag); if (fieldfound) { @@ -604,12 +621,6 @@ enlarge_line (new_size) } static void -invalid_list () -{ - error (2, 0, "invalid byte or field list"); -} - -static void usage (status) int status; { @@ -317,13 +317,12 @@ usage (status) { printf ("\ Usage: %s [OPTION]... [FILE]...\n\ - or: %s -C [FILE] [[+]OFFSET [[+]LABEL]]\n\ + or: %s --traditional [FILE] [[+]OFFSET [[+]LABEL]]\n\ ", program_name, program_name); printf ("\ \n\ -A, --address-radix=RADIX decide how file offsets are printed\n\ - -C, --backward-compatible trigger older syntax\n\ -N, --read-bytes=BYTES limit dump to BYTES input bytes per file\n\ -j, --skip-bytes=BYTES skip BYTES input bytes first on each file\n\ -s, --strings[=BYTES] output strings of at least BYTES graphic chars\n\ @@ -331,6 +330,7 @@ Usage: %s [OPTION]... [FILE]...\n\ -v, --output-duplicates do not use * to mark line suppression\n\ -w, --width[=BYTES] output BYTES bytes per output line\n\ --help display this help and exit\n\ + --traditional accept arguments in pre-POSIX form\n\ --version output version information and exit\n\ \n\ Pre-POSIX format specifications may be intermixed, they accumulate:\n\ diff --git a/src/sort.c b/src/sort.c index 74d4b466f..df6e74e54 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1800,7 +1800,7 @@ Usage: %s [OPTION]... [FILE]...\n\ \n\ +POS1 [-POS2] start a key at POS1, end it before POS2\n\ -M compare (unknown) < `JAN' < ... < `DEC', imply -b\n\ - -T DIRECT use DIRECTfor temporary files, not $TEMPDIR nor /tmp\n\ + -T DIRECT use DIRECT for temporary files, not $TMPDIR or /tmp\n\ -b ignore leading blanks in sort fields or keys\n\ -c check if given files already sorted, do not sort\n\ -d consider only [a-zA-Z0-9 ] characters in keys\n\ @@ -145,7 +145,7 @@ Usage: %s [OPTION]... [FILE]...\n\ printf ("\ \n\ -b, --before attach the separator before instead of after\n\ - -r, --regex intepret the separator as a regular expression\n\ + -r, --regex interpret the separator as a regular expression\n\ -s, --separator=STRING use STRING as the separator instead of newline\n\ --help display this help and exit\n\ --version output version information and exit\n\ |