From 3bc2827212cbdb43d877ae46a5a3713d807411e8 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 24 Oct 1993 20:00:39 +0000 Subject: merge with 1.8h --- old/textutils/ChangeLog | 3 +++ src/csplit.c | 16 ++++++++-------- src/cut.c | 8 ++++---- src/expand.c | 4 ++-- src/fold.c | 2 +- src/head.c | 4 ++-- src/nl.c | 20 ++++++++++---------- src/od.c | 12 ++++++------ src/paste.c | 2 +- src/split.c | 6 +++--- src/tac.c | 2 +- src/tail.c | 4 ++-- src/unexpand.c | 4 ++-- src/uniq.c | 6 +++--- 14 files changed, 48 insertions(+), 45 deletions(-) diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index a2fe8124a..c8f2794ee 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -1,5 +1,8 @@ Sun Oct 24 00:31:02 1993 Jim Meyering (meyering@comco.com) + * tail.c: Don't include . It hasn't been necessary + since the Dec 12, 1992 change. + * join.c (main): Accept `-v 1' again. First adding --version long option had broken it, though -v1 still worked. Call parse_long_options instead of adding "help" and "version" diff --git a/src/csplit.c b/src/csplit.c index d27532629..aad7f3171 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1567,14 +1567,14 @@ Usage: %s [OPTION]... FILE PATTERN...\n\ program_name); printf ("\ \n\ - -b, --suffix=FORMAT use sprintf FORMAT instead of %%d\n\ - -f, --prefix=PREFIX use PREFIX instead of xx\n\ - -k, --keep-files do not remove output files on errors\n\ - -n, --digits=DIGITS use specified number of digits instead of 2\n\ - -s, --quiet, --silent do not print counts of output file sizes\n\ - -z, --elide-empty-files remove empty output files\n\ - --help display this help and exit\n\ - --version output version information and exit\n\ + -b, --suffix=FORMAT use sprintf FORMAT instead of %%d\n\ + -f, --prefix=PREFIX use PREFIX instead of xx\n\ + -k, --keep-files do not remove output files on errors\n\ + -n, --digits=DIGITS use specified number of digits instead of 2\n\ + -s, --quiet, --silent do not print counts of output file sizes\n\ + -z, --elide-empty-files remove empty output files\n\ + --help display this help and exit\n\ + --version output version information and exit\n\ \n\ Read standard input if FILE is -. Each PATTERN may be:\n\ \n\ diff --git a/src/cut.c b/src/cut.c index c53402f63..546b926e8 100644 --- a/src/cut.c +++ b/src/cut.c @@ -610,10 +610,10 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); printf ("\ \n\ - -b, --bytes LIST output only these bytes\n\ - -c, --characters LIST output only these characters\n\ - -d, --delimiter DELIM use DELIM instead of TAB for field delimiter\n\ - -f, --fields LIST output only these fields\n\ + -b, --bytes=LIST output only these bytes\n\ + -c, --characters=LIST output only these characters\n\ + -d, --delimiter=DELIM use DELIM instead of TAB for field delimiter\n\ + -f, --fields=LIST output only these fields\n\ -n (ignored)\n\ -s, --only-delimited do not print lines not containing delimiters\n\ --help display this help and exit\n\ diff --git a/src/expand.c b/src/expand.c index e46e4150b..52b3f0eda 100644 --- a/src/expand.c +++ b/src/expand.c @@ -406,8 +406,8 @@ Usage: %s [OPTION]... [FILE]...\n\ printf ("\ \n\ -i, --initial do not convert TABs after non whitespace\n\ - -t, --tabs NUMBER have tabs NUMBER characters apart, not 8\n\ - -t, --tabs LIST use comma separated list of explicit tab positions\n\ + -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n\ + -t, --tabs=LIST use comma separated list of explicit tab positions\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/fold.c b/src/fold.c index ff151739d..9f9f0c8c5 100644 --- a/src/fold.c +++ b/src/fold.c @@ -89,7 +89,7 @@ Usage: %s [OPTION]... [FILE]...\n\ \n\ -b, --bytes count bytes rather than columns\n\ -s, --spaces break at word boundaries\n\ - -w, --width WIDTH use WIDTH columns instead of 80\n\ + -w, --width=WIDTH use WIDTH columns instead of 80\n\ "); } exit (status); diff --git a/src/head.c b/src/head.c index 2ab70af05..0d1d9c8ea 100644 --- a/src/head.c +++ b/src/head.c @@ -410,8 +410,8 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); printf ("\ \n\ - -c, --bytes SIZE print first SIZE bytes\n\ - -l, -n, --lines NUMBER print first NUMBER lines instead of first 10\n\ + -c, --bytes=SIZE print first SIZE bytes\n\ + -l, -n, --lines=NUMBER print first NUMBER lines instead of first 10\n\ -q, --quiet, --silent never print headers giving file names\n\ -v, --verbose always print headers giving file names\n\ --help display this help and exit\n\ diff --git a/src/nl.c b/src/nl.c index f281d5564..2b707fd34 100644 --- a/src/nl.c +++ b/src/nl.c @@ -577,17 +577,17 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); printf ("\ \n\ - -b, --body-numbering STYLE use STYLE for numbering body lines\n\ - -d, --section-delimiter CC use CC for separating logical pages\n\ - -f, --footer-numbering STYLE use STYLE for numbering footer lines\n\ - -h, --header-numbering STYLE use STYLE for numbering header lines\n\ - -i, --page-increment NUMBER line number increment at each line\n\ - -l, --join-blank-lines NUMBER group of NUMBER empty lines counted as one\n\ - -n, --number-format FORMAT insert line numbers according to FORMAT\n\ + -b, --body-numbering=STYLE use STYLE for numbering body lines\n\ + -d, --section-delimiter=CC use CC for separating logical pages\n\ + -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n\ + -h, --header-numbering=STYLE use STYLE for numbering header lines\n\ + -i, --page-increment=NUMBER line number increment at each line\n\ + -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as one\n\ + -n, --number-format=FORMAT insert line numbers according to FORMAT\n\ -p, --no-renumber do not reset line numbers at logical pages\n\ - -s, --number-separator STRING add STRING after (possible) line number\n\ - -v, --first-page NUMBER first line number on each logical page\n\ - -w, --number-width NUMBER use NUMBER columns for line numbers\n\ + -s, --number-separator=STRING add STRING after (possible) line number\n\ + -v, --first-page=NUMBER first line number on each logical page\n\ + -w, --number-width=NUMBER use NUMBER columns for line numbers\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/od.c b/src/od.c index e92db6ebc..c772fa6c9 100644 --- a/src/od.c +++ b/src/od.c @@ -322,14 +322,14 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name, program_name); printf ("\ \n\ - -A, --address-radix RADIX decide how file offsets are printed\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\ - -t, --format TYPE select output format or formats\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\ + -t, --format=TYPE select output format or formats\n\ -v, --output-duplicates do not use * to mark line suppression\n\ - -w, --width [BYTES] output BYTES bytes per output line\n\ + -w, --width[=BYTES] output BYTES bytes per output line\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/paste.c b/src/paste.c index 76f2d9c45..a8fdd2840 100644 --- a/src/paste.c +++ b/src/paste.c @@ -495,7 +495,7 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); printf ("\ \n\ - -d, --delimiters LIST reuse characters from LIST instead of TABs\n\ + -d, --delimiters=LIST reuse characters from LIST instead of TABs\n\ -s, --serial paste one file at a time instead of in parallel\n\ --help display this help and exit\n\ --version output version information and exit\n\ diff --git a/src/split.c b/src/split.c index 9a1d419b0..323335ee1 100644 --- a/src/split.c +++ b/src/split.c @@ -112,9 +112,9 @@ Usage: %s [OPTION] [INPUT [PREFIX]]\n\ program_name); printf ("\ \n\ - -C, --line-bytes SIZE put at most SIZE bytes of lines per output file\n\ - -b, --bytes SIZE put SIZE bytes per output file\n\ - -l, --lines NUMBER put NUMBER lines per output file\n\ + -C, --line-bytes=SIZE put at most SIZE bytes of lines per output file\n\ + -b, --bytes=SIZE put SIZE bytes per output file\n\ + -l, --lines=NUMBER put NUMBER lines per output file\n\ -NUMBER same as -l NUMBER\n\ --help display this help and exit\n\ --version output version information and exit\n\ diff --git a/src/tac.c b/src/tac.c index fcff73749..40f8c484f 100644 --- a/src/tac.c +++ b/src/tac.c @@ -146,7 +146,7 @@ Usage: %s [OPTION]... [FILE]...\n\ \n\ -b, --before attach the separator before instead of after\n\ -r, --regex intepret the separator as a regular expression\n\ - -s, --separator STRING use STRING as the separator instead of newline\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\ \n\ diff --git a/src/tail.c b/src/tail.c index 51a71c31a..2eb05c7da 100644 --- a/src/tail.c +++ b/src/tail.c @@ -1028,9 +1028,9 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); printf ("\ \n\ - -c, --bytes SIZE print last SIZE bytes\n\ + -c, --bytes=SIZE print last SIZE bytes\n\ -f, --follow print files as they grow\n\ - -l, -n, --lines NUMBER print last NUMBER lines, instead of last 10\n\ + -l, -n, --lines=NUMBER print last NUMBER lines, instead of last 10\n\ -q, --quiet, --silent never print headers giving file names\n\ -v, --verbose always print headers giving file names\n\ --help display this help and exit\n\ diff --git a/src/unexpand.c b/src/unexpand.c index 70078d14c..12762e354 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -461,8 +461,8 @@ Usage: %s [OPTION]... [FILE]...\n\ printf ("\ \n\ -a, --all convert all whitespace, instead of initial whitespace\n\ - -t, --tabs NUMBER have tabs NUMBER characters apart, not 8\n\ - -t, --tabs LIST use comma separated list of explicit tab positions\n\ + -t, --tabs=NUMBER have tabs NUMBER characters apart instead of 8\n\ + -t, --tabs=LIST use comma separated list of explicit tab positions\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/uniq.c b/src/uniq.c index 5cbd4df60..58c77857e 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -361,10 +361,10 @@ Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\ \n\ -c, --count prefix lines by the number of occurrences\n\ -d, --repeated only print duplicate lines\n\ - -f, --skip-fields N avoid comparing the N first fields\n\ - -s, --skip-chars N avoid comparing the N first characters\n\ + -f, --skip-fields=N avoid comparing the N first fields\n\ + -s, --skip-chars=N avoid comparing the N first characters\n\ -u, --unique only print unique lines\n\ - -w, --check-chars N compare no more then N characters in lines\n\ + -w, --check-chars=N compare no more then N characters in lines\n\ -N same as -f N\n\ +N same as -s N\n\ --help display this help and exit\n\ -- cgit v1.2.3-54-g00ecf