From ce4dbc851343d322a5c7235abe5819ba8ecc2abb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 26 Oct 1993 23:39:04 +0000 Subject: [PATCH] merge with 3.9a --- lib/userspec.c | 2 +- src/df.c | 4 ++-- src/install.c | 6 +++--- src/ln.c | 4 ++-- src/ls.c | 14 ++++++-------- src/mkdir.c | 2 +- src/mkfifo.c | 2 +- src/mknod.c | 2 +- src/mv.c | 4 ++-- src/touch.c | 6 +++--- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/userspec.c b/lib/userspec.c index fc93267f83..37b7980b9f 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -162,7 +162,7 @@ parse_user_spec (name, uid, gid, username, groupname) *groupname = malloc (15); if (*groupname == NULL) return tired; - sprintf (*groupname, "%u", pwd->pw_gid); + sprintf (*groupname, "%u", (unsigned) (pwd->pw_gid)); } else { diff --git a/src/df.c b/src/df.c index c73a739fa4..4a4ff34e94 100644 --- a/src/df.c +++ b/src/df.c @@ -488,8 +488,8 @@ usage (status) -a, --all include filesystems having 0 blocks\n\ -i, --inodes list inode information instead of block usage\n\ -k, --kilobytes use 1024 blocks, not 512 despite POSIXLY_CORRECT\n\ - -t, --type TYPE limit the listing to TYPE filesystems type\n\ - -x, --exclude-type TYPE limit the listing to not TYPE filesystems type\n\ + -t, --type=TYPE limit the listing to TYPE filesystems type\n\ + -x, --exclude-type=TYPE limit the listing to not TYPE filesystems type\n\ -v (ignored)\n\ -P, --portability use the POSIX output format\n\ --help display this help and exit\n\ diff --git a/src/install.c b/src/install.c index a5e795e3f2..7c6a5d2f79 100644 --- a/src/install.c +++ b/src/install.c @@ -555,9 +555,9 @@ Usage: %s [OPTION]... SOURCE DEST (1st format)\n\ \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 0755\n\ - -o, --owner OWNER set ownership (super-user only)\n\ + -g, --group=GROUP set group ownership, instead of process' current group\n\ + -m, --mode=MODE set permission mode (as in chmod), instead of 0755\n\ + -o, --owner=OWNER set ownership (super-user only)\n\ -s, --strip strip symbol tables, only for 1st and 2nd formats\n\ --help display this help and exit\n\ --version output version information and exit\n"); diff --git a/src/ln.c b/src/ln.c index c154913f30..9cc4878612 100644 --- a/src/ln.c +++ b/src/ln.c @@ -371,8 +371,8 @@ Usage: %s [OPTION]... SOURCE [DEST]\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, --version-control WORD override the usual version control\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\ \n\ diff --git a/src/ls.c b/src/ls.c index 412759b775..adfe143fbb 100644 --- a/src/ls.c +++ b/src/ls.c @@ -1905,36 +1905,34 @@ usage (status) -s, --size print block size of each file\n\ -t sort by modification time; with -l: show mtime\n\ -u sort by last access time; with -l: show atime\n\ - -w, --width COLS assume screen width instead of current value\n\ + -w, --width=COLS assume screen width instead of current value\n\ -x list entries by lines instead of by columns\n\ -A, --almost-all do not list implied . and ..\n"); - printf ("\ -B, --ignore-backups do not list implied entries ending with ~\n\ -C list entries by columns\n\ -F, --classify append a character for typing each entry\n\ -G, --no-group inhibit display of group information\n\ - -I, --ignore PATTERN do not list implied entries matching shell PATTERN\n\ + -I, --ignore=PATTERN do not list implied entries matching shell PATTERN\n\ -L, --dereference list entries pointed to by symbolic links\n\ -N, --literal do not quote entry names\n\ -Q, --quote-name enclose entry names in double quotes\n\ -R, --recursive list subdirectories recursively\n\ -S sort by file size\n\ - -T, --tabsize COLS assume tab stops at each COLS instead of 8\n\ + -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n\ -U do not sort; list entries in directory order\n\ -X sort alphabetically by entry extension\n\ -1 list one file per line\n\ --full-time list both full date and full time\n\ --help display this help and exit\n\ - --format WORD across -x, commas -m, horizontal -x, long -l,\n\ + --format=WORD across -x, commas -m, horizontal -x, long -l,\n\ single-column -1, verbose -l, vertical -C\n\ - --sort WORD ctime -c, extension -X, none -U, size -S,\n\ + --sort=WORD ctime -c, extension -X, none -U, size -S,\n\ status -c, time -t\n\ - --time WORD atime -u, access -u, use -u\n\ + --time=WORD atime -u, access -u, use -u\n\ --version output version information and exit\n\ \n\ Sort entries alphabetically if none of -cftuSUX nor --sort.\n"); - } exit (status); } diff --git a/src/mkdir.c b/src/mkdir.c index d0361d2610..234d34f55d 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -154,7 +154,7 @@ usage (status) printf ("\ \n\ -p, --parents no error if existing, make parent directories as needed\n\ - -m, --mode MODE set permission mode (as in chmod), not 0777 - umask\n\ + -m, --mode=MODE set permission mode (as in chmod), not 0777 - umask\n\ --help display this help and exit\n\ --version output version information and exit\n"); } diff --git a/src/mkfifo.c b/src/mkfifo.c index d358e183b1..4977d58acc 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -141,7 +141,7 @@ usage (status) printf ("Usage: %s [OPTION] PATH...\n", program_name); printf ("\ \n\ - -m, --mode MODE set permission mode (as in chmod), not 0666 - umask\n\ + -m, --mode=MODE set permission mode (as in chmod), not 0666 - umask\n\ --help display this help and exit\n\ --version output version information and exit\n"); } diff --git a/src/mknod.c b/src/mknod.c index 30bb7b6f78..d92754c558 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -176,7 +176,7 @@ usage (status) printf ("Usage: %s [OPTION]... PATH TYPE [MAJOR MINOR]\n", program_name); printf ("\ \n\ - -m, --mode MODE set permission mode (as in chmod), not 0666 - umask\n\ + -m, --mode=MODE set permission mode (as in chmod), not 0666 - umask\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ diff --git a/src/mv.c b/src/mv.c index 0cc21d2d38..a79da4b86b 100644 --- a/src/mv.c +++ b/src/mv.c @@ -489,8 +489,8 @@ Usage: %s [OPTION]... SOURCE DEST\n\ -i, --interactive prompt before overwrite\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\ + -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\ \n\ diff --git a/src/touch.c b/src/touch.c index 2b298e763c..b664fae57c 100644 --- a/src/touch.c +++ b/src/touch.c @@ -389,13 +389,13 @@ usage (status) \n\ -a change only the access time\n\ -c do not create any files\n\ - -d, --date STRING parse STRING and use it instead of current time\n\ + -d, --date=STRING parse STRING and use it instead of current time\n\ -f (ignored)\n\ -m change only the modification time\n\ - -r, --file REFERENCE use this file's times instead of current time\n\ + -r, --file=REFERENCE use this file's times instead of current time\n\ -t STAMP use MMDDhhmm[[CC]YY][.ss] instead of current time\n\ --help display this help and exit\n\ - --time WORD access -a, atime -a, mtime -m, modify -m, use -a\n\ + --time=WORD access -a, atime -a, mtime -m, modify -m, use -a\n\ --version output version information and exit\n\ \n\ STAMP may be used without -t if none of -drt, nor --, are used.\n"); -- 2.47.3