From bded355394ffd94db180575c068f2a6a7d131930 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 23 Nov 1996 22:13:00 +0000 Subject: [PATCH] (usage): Alphabetize option descriptions the way sort -f would. --- src/chgrp.c | 2 +- src/chown.c | 2 +- src/df.c | 6 +++--- src/install.c | 2 +- src/ln.c | 2 +- src/ls.c | 30 +++++++++++++++--------------- src/mkdir.c | 14 ++------------ src/mv.c | 2 +- src/rm.c | 2 +- 9 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/chgrp.c b/src/chgrp.c index 7d1f8b0..97374ce 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -282,8 +282,8 @@ Change the group membership of each FILE to GROUP.\n\ -h, --no-dereference affect symbolic links instead of any referenced file\n\ (available only on systems with lchown system call)\n\ -f, --silent, --quiet suppress most error messages\n\ - -v, --verbose output a diagnostic for every file processed\n\ -R, --recursive change files and directories recursively\n\ + -v, --verbose output a diagnostic for every file processed\n\ --help display this help and exit\n\ --version output version information and exit\n\ ")); diff --git a/src/chown.c b/src/chown.c index 21ef882..bd10f7f 100644 --- a/src/chown.c +++ b/src/chown.c @@ -243,8 +243,8 @@ Change the owner and/or group of each FILE to OWNER and/or GROUP.\n\ -h, --no-dereference affect symbolic links instead of any referenced file\n\ (available only on systems with lchown system call)\n\ -f, --silent, --quiet suppress most error messages\n\ - -v, --verbose explain what is being done\n\ -R, --recursive operate on files and directories recursively\n\ + -v, --verbose explain what is being done\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/df.c b/src/df.c index 0abb5a5..89cabb4 100644 --- a/src/df.c +++ b/src/df.c @@ -465,17 +465,17 @@ Show information about the filesystem on which each FILE resides,\n\ or all filesystems by default.\n\ \n\ -a, --all include filesystems having 0 blocks\n\ - -h, --human-readable print sizes in human readable format (e.g. 1K 234M 2G)\n\ + -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n\ -i, --inodes list inode information instead of block usage\n\ -k, --kilobytes use 1024-byte blocks, not 512 despite POSIXLY_CORRECT\n\ -m, --megabytes use 1024K-byte blocks, not 512 despite POSIXLY_CORRECT\n\ --no-sync do not invoke sync before getting usage info (default)\n\ + -P, --portability use the POSIX output format\n\ --sync invoke sync before getting usage info\n\ -t, --type=TYPE limit listing to filesystems of type TYPE\n\ + -T, --print-type print filesystem type\n\ -x, --exclude-type=TYPE limit listing to filesystems not of type TYPE\n\ -v (ignored)\n\ - -P, --portability use the POSIX output format\n\ - -T, --print-type print filesystem type\n\ --help display this help and exit\n\ --version output version information and exit\n\ ")); diff --git a/src/install.c b/src/install.c index 2c915ee..914cd63 100644 --- a/src/install.c +++ b/src/install.c @@ -598,13 +598,13 @@ In first two formats, copy SOURCE to DEST or multiple SOURCE(s) to\n\ DIRECTORY, while setting permission modes and owner/group. In third\n\ format, make all components of the given DIRECTORY(ies).\n\ \n\ + -b, --backup make backup before removal\n\ -c (ignored)\n\ -d, --directory create [leading] directories, mandatory for 3rd format\n\ -g, --group=GROUP set group ownership, instead of process' current group\n\ -m, --mode=MODE set permission mode (as in chmod), instead of rw-r--r--\n\ -o, --owner=OWNER set ownership (super-user only)\n\ -s, --strip strip symbol tables, only for 1st and 2nd formats\n\ - -b, --backup make backup before removal\n\ -S, --suffix=SUFFIX override the usual backup suffix\n\ -V, --version-control=WORD override the usual version control\n\ --help display this help and exit\n\ diff --git a/src/ln.c b/src/ln.c index 0d2ff77..62b4e8e 100644 --- a/src/ln.c +++ b/src/ln.c @@ -329,8 +329,8 @@ Makes hard links by default, symbolic links with -s.\n\ directory as if it were a normal file\n\ -i, --interactive prompt whether to remove destinations\n\ -s, --symbolic make symbolic links instead of hard links\n\ - -v, --verbose print name of each file before linking\n\ -S, --suffix=SUFFIX override the usual backup suffix\n\ + -v, --verbose print name of each file before linking\n\ -V, --version-control=WORD override the usual version control\n\ --help display this help and exit\n\ --version output version information and exit\n\ diff --git a/src/ls.c b/src/ls.c index 908a904..5b9c9de 100644 --- a/src/ls.c +++ b/src/ls.c @@ -2702,52 +2702,52 @@ usage (int status) List information about the FILEs (the current directory by default).\n\ Sort entries alphabetically if none of -cftuSUX nor --sort.\n\ \n\ - -A, --almost-all do not list implied . and ..\n\ -a, --all do not hide entries starting with .\n\ - -B, --ignore-backups do not list implied entries ending with ~\n\ + -A, --almost-all do not list implied . and ..\n\ -b, --escape print octal escapes for nongraphic characters\n\ - -C list entries by columns\n\ + -B, --ignore-backups do not list implied entries ending with ~\n\ -c sort by change time; with -l: show ctime\n\ + -C list entries by columns\n\ --color[=WHEN] control whether color is used to distinguish file\n\ types. WHEN may be `never', `always', or `auto'\n\ - -D, --dired generate output designed for Emacs' dired mode\n\ -d, --directory list directory entries instead of contents\n\ - -F, --classify append a character for typing each entry\n\ + -D, --dired generate output designed for Emacs' dired mode\n\ -f do not sort, enable -aU, disable -lst\n\ + -F, --classify append a character for typing each entry\n\ --format=WORD across -x, commas -m, horizontal -x, long -l,\n\ single-column -1, verbose -l, vertical -C\n\ --full-time list both full date and full time\n")); printf (_("\ - -G, --no-group inhibit display of group information\n\ -g (ignored)\n\ - -I, --ignore=PATTERN do not list implied entries matching shell PATTERN\n\ + -G, --no-group inhibit display of group information\n\ -i, --inode print index number of each file\n\ + -I, --ignore=PATTERN do not list implied entries matching shell PATTERN\n\ -k, --kilobytes use 1024 blocks, not 512 despite POSIXLY_CORRECT\n\ - -L, --dereference list entries pointed to by symbolic links\n\ -l use a long listing format\n\ + -L, --dereference list entries pointed to by symbolic links\n\ -m fill width with a comma separated list of entries\n\ + -n, --numeric-uid-gid list numeric UIDs and GIDs instead of names\n\ -N, --literal print raw entry names (don't treat e.g. control\n\ characters specially)\n\ - -n, --numeric-uid-gid list numeric UIDs and GIDs instead of names\n\ -o use long listing format without group info\n\ -p append a character for typing each entry\n\ - -Q, --quote-name enclose entry names in double quotes\n\ -q, --hide-control-chars print ? instead of non graphic characters\n\ - -R, --recursive list subdirectories recursively\n\ + -Q, --quote-name enclose entry names in double quotes\n\ -r, --reverse reverse order while sorting\n\ - -S sort by file size\n")); + -R, --recursive list subdirectories recursively\n\ + -s, --size print size of each file, in blocks\n")); printf (_("\ - -s, --size print size of each file, in blocks\n\ + -S sort by file size\n\ --sort=WORD ctime -c, extension -X, none -U, size -S,\n\ status -c, time -t, atime -u, access -u, use -u\n\ --time=WORD show time as WORD instead of modification time:\n\ atime, access, use, ctime or status\n\ - -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n\ -t sort by modification time; with -l: show mtime\n\ - -U do not sort; list entries in directory order\n\ + -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n\ -u sort by last access time; with -l: show atime\n\ + -U do not sort; list entries in directory order\n\ -w, --width=COLS assume screen width instead of current value\n\ -x list entries by lines instead of by columns\n\ -X sort alphabetically by entry extension\n\ diff --git a/src/mkdir.c b/src/mkdir.c index 33c4f45..9f1ae18 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -15,17 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Options: - -p, --parent Ensure that the given path(s) exist: - Make any missing parent directories for each argument. - Parent dirs default to umask modified by `u+wx'. - Do not consider an argument directory that already - exists to be an error. - -m, --mode=mode Set the mode of created directories to `mode', which is - symbolic as in chmod and uses the umask as a point of - departure. - - David MacKenzie */ +/* David MacKenzie */ #include #include @@ -71,8 +61,8 @@ usage (int status) printf (_("\ Create the DIRECTORY(ies), if they do not already exist.\n\ \n\ - -p, --parents no error if existing, make parent directories as needed\n\ -m, --mode=MODE set permission mode (as in chmod), not rwxrwxrwx - umask\n\ + -p, --parents no error if existing, make parent directories as needed\n\ --verbose print a message for each created directory\n\ --help display this help and exit\n\ --version output version information and exit\n\ diff --git a/src/mv.c b/src/mv.c index 1f3a631..7b81c00 100644 --- a/src/mv.c +++ b/src/mv.c @@ -388,9 +388,9 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\ -b, --backup make backup before removal\n\ -f, --force remove existing destinations, never prompt\n\ -i, --interactive prompt before overwrite\n\ + -S, --suffix=SUFFIX override the usual backup suffix\n\ -u, --update move only older or brand new files\n\ -v, --verbose explain what is being done\n\ - -S, --suffix=SUFFIX override the usual backup suffix\n\ -V, --version-control=WORD override the usual version control\n\ --help display this help and exit\n\ --version output version information and exit\n\ diff --git a/src/rm.c b/src/rm.c index ca50f39..6789c24 100644 --- a/src/rm.c +++ b/src/rm.c @@ -535,8 +535,8 @@ Remove (unlink) the FILE(s).\n\ -d, --directory unlink directory, even if non-empty (super-user only)\n\ -f, --force ignore nonexistent files, never prompt\n\ -i, --interactive prompt before any removal\n\ - -v, --verbose explain what is being done\n\ -r, -R, --recursive remove the contents of directories recursively\n\ + -v, --verbose explain what is being done\n\ --help display this help and exit\n\ --version output version information and exit\n\ ")); -- 2.7.4