diff options
| -rw-r--r-- | src/chgrp.c | 10 | ||||
| -rw-r--r-- | src/chmod.c | 8 | ||||
| -rw-r--r-- | src/chown.c | 16 | ||||
| -rw-r--r-- | src/cp.c | 36 | ||||
| -rw-r--r-- | src/dd.c | 12 | ||||
| -rw-r--r-- | src/df.c | 10 | ||||
| -rw-r--r-- | src/dircolors.c | 8 | ||||
| -rw-r--r-- | src/du.c | 12 | ||||
| -rw-r--r-- | src/install.c | 18 | ||||
| -rw-r--r-- | src/ln.c | 16 | ||||
| -rw-r--r-- | src/ls.c | 44 | ||||
| -rw-r--r-- | src/rm.c | 12 | ||||
| -rw-r--r-- | src/rmdir.c | 8 | ||||
| -rw-r--r-- | src/shred.c | 12 | ||||
| -rw-r--r-- | src/touch.c | 10 |
15 files changed, 174 insertions, 58 deletions
diff --git a/src/chgrp.c b/src/chgrp.c index 24866fe10..a090b83a5 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -128,23 +128,29 @@ Usage: %s [OPTION]... GROUP FILE...\n\ or: %s [OPTION]... --reference=RFILE FILE...\n\ "), program_name, program_name); - printf (_("\ + fputs (_("\ Change the group membership of each FILE to GROUP.\n\ \n\ -c, --changes like verbose but report only when a change is made\n\ --dereference affect the referent of each symbolic link, rather\n\ than the symbolic link itself\n\ +"), stdout); + fputs (_("\ -h, --no-dereference affect symbolic links instead of any referenced file\n\ (available only on systems that can change the\n\ ownership of a symlink)\n\ +"), stdout); + fputs (_("\ -f, --silent, --quiet suppress most error messages\n\ --reference=RFILE use RFILE's group rather than the specified\n\ GROUP value\n\ -R, --recursive operate on files and directories recursively\n\ +"), stdout); + fputs (_("\ -v, --verbose output a diagnostic for every file processed\n\ --help display this help and exit\n\ --version output version information and exit\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/chmod.c b/src/chmod.c index 859cf4681..371f4cccc 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -1,5 +1,5 @@ /* chmod -- change permission modes of files - Copyright (C) 89, 90, 91, 1995-2000 Free Software Foundation, Inc. + Copyright (C) 89, 90, 91, 1995-2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -246,20 +246,22 @@ Usage: %s [OPTION]... MODE[,MODE]... FILE...\n\ or: %s [OPTION]... --reference=RFILE FILE...\n\ "), program_name, program_name, program_name); - printf (_("\ + fputs (_("\ Change the mode of each FILE to MODE.\n\ \n\ -c, --changes like verbose but report only when a change is made\n\ -f, --silent, --quiet suppress most error messages\n\ -v, --verbose output a diagnostic for every file processed\n\ --reference=RFILE use RFILE's mode instead of MODE values\n\ +"), stdout); + fputs (_("\ -R, --recursive change files and directories recursively\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n\ one or more of the letters rwxXstugo.\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/chown.c b/src/chown.c index d8f642627..6d92888ba 100644 --- a/src/chown.c +++ b/src/chown.c @@ -102,34 +102,42 @@ Usage: %s [OPTION]... OWNER[:[GROUP]] FILE...\n\ or: %s [OPTION]... --reference=RFILE FILE...\n\ "), program_name, program_name, program_name); - printf (_("\ + fputs (_("\ Change the owner and/or group of each FILE to OWNER and/or GROUP.\n\ \n\ -c, --changes like verbose but report only when a change is made\n\ --dereference affect the referent of each symbolic link, rather\n\ than the symbolic link itself\n\ +"), stdout); + fputs (_("\ -h, --no-dereference affect symbolic links instead of any referenced file\n\ (available only on systems that can change the\n\ ownership of a symlink)\n\ +"), stdout); + fputs (_("\ --from=CURRENT_OWNER:CURRENT_GROUP\n\ change the owner and/or group of each file only if\n\ its current owner and/or group match those specified\n\ here. Either may be omitted, in which case a match\n\ is not required for the omitted attribute.\n\ +"), stdout); + fputs (_("\ -f, --silent, --quiet suppress most error messages\n\ --reference=RFILE use RFILE's owner and group rather than\n\ the specified OWNER:GROUP values\n\ -R, --recursive operate on files and directories recursively\n\ +"), stdout); + fputs (_("\ -v, --verbose output a diagnostic for every file processed\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ Owner is unchanged if missing. Group is unchanged if missing, but changed\n\ to login group if implied by a `:'. OWNER and GROUP may be numeric as well\n\ as symbolic.\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -165,78 +165,90 @@ Usage: %s [OPTION]... SOURCE DEST\n\ or: %s [OPTION]... --target-directory=DIRECTORY SOURCE...\n\ "), program_name, program_name, program_name); - printf (_("\ + fputs (_("\ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ \n\ -a, --archive same as -dpR\n\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ -d same as --no-dereference --preserve=link\n\ +"), stdout); + fputs (_("\ --no-dereference never follow symbolic links\n\ -f, --force if an existing destination file cannot be\n\ opened, remove it and try again\n\ -i, --interactive prompt before overwrite\n\ -H follow command-line symbolic links\n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ -l, --link link files instead of copying\n\ -L, --dereference always follow symbolic links\n\ -p same as --preserve=mode,ownership,timestamps\n\ --preserve[=ATTR_LIST] preserve the specified attributes (default:\n\ mode,ownership,timestamps), if possible\n\ additional attributes: links, all\n\ +"), stdout); + fputs (_("\ --no-preserve=ATTR_LIST don't preserve the specified attributes\n\ --parents append source path to DIRECTORY\n\ -P same as `--no-dereference'\n\ +"), stdout); + fputs (_("\ -r copy recursively, non-directories as files\n\ WARNING: use -R instead when you might copy\n\ special files like FIFOs or /dev/zero\n\ --remove-destination remove each existing destination file before\n\ attempting to open it (contrast with --force)\n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ --sparse=WHEN control creation of sparse files\n\ -R, --recursive copy directories recursively\n\ --reply={yes,no,query} specify how to handle the prompt about an\n\ existing destination file\n\ --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ argument\n\ +"), stdout); + fputs (_("\ -s, --symbolic-link make symbolic links instead of copying\n\ -S, --suffix=SUFFIX override the usual backup suffix\n\ --target-directory=DIRECTORY move all SOURCE arguments into DIRECTORY\n\ -u, --update copy only when the SOURCE file is newer\n\ than the destination file or when the\n\ destination file is missing\n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ -v, --verbose explain what is being done\n\ -x, --one-file-system stay on this file system\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ +"), stdout); + fputs (_("\ By default, sparse SOURCE files are detected by a crude heuristic and the\n\ corresponding DEST file is made sparse as well. That is the behavior\n\ selected by --sparse=auto. Specify --sparse=always to create a sparse DEST\n\ file whenever the SOURCE file contains a long enough sequence of zero bytes.\n\ Use --sparse=never to inhibit creation of sparse files.\n\ \n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ The version control method may be selected via the --backup option or through\n\ the VERSION_CONTROL environment variable. Here are the values:\n\ \n\ +"), stdout); + fputs (_("\ none, off never make backups (even if --backup is given)\n\ numbered, t make numbered backups\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ \n\ As a special case, cp makes a backup of SOURCE when the force and backup\n\ options are given and SOURCE and DEST are the same name for an existing,\n\ regular file.\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -289,7 +289,7 @@ usage (int status) else { printf (_("Usage: %s [OPTION]...\n"), program_name); - printf (_("\ + fputs (_("\ Copy a file, converting and formatting according to the options.\n\ \n\ bs=BYTES force ibs=BYTES and obs=BYTES\n\ @@ -297,6 +297,8 @@ Copy a file, converting and formatting according to the options.\n\ conv=KEYWORDS convert the file as per the comma separated keyword list\n\ count=BLOCKS copy only BLOCKS input blocks\n\ ibs=BYTES read BYTES bytes at a time\n\ +"), stdout); + fputs (_("\ if=FILE read from FILE instead of stdin\n\ obs=BYTES write BYTES bytes at a time\n\ of=FILE write to FILE instead of stdout\n\ @@ -304,25 +306,31 @@ Copy a file, converting and formatting according to the options.\n\ skip=BLOCKS skip BLOCKS ibs-sized blocks at start of input\n\ --help display this help and exit\n\ --version output version information and exit\n\ +"), stdout); + fputs (_("\ \n\ BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n\ xM M, c 1, w 2, b 512, kD 1000, k 1024, MD 1,000,000, M 1,048,576,\n\ GD 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y.\n\ Each KEYWORD may be:\n\ \n\ +"), stdout); + fputs (_("\ ascii from EBCDIC to ASCII\n\ ebcdic from ASCII to EBCDIC\n\ ibm from ASCII to alternated EBCDIC\n\ block pad newline-terminated records with spaces to cbs-size\n\ unblock replace trailing spaces in cbs-size records with newline\n\ lcase change upper case to lower case\n\ +"), stdout); + fputs (_("\ notrunc do not truncate the output file\n\ ucase change lower case to upper case\n\ swab swap every pair of input bytes\n\ noerror continue after read errors\n\ sync pad every input block with NULs to ibs-size; when used\n\ with block or unblock, pad with spaces rather than NULs\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -752,7 +752,7 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); - printf (_("\ + fputs (_("\ Show information about the filesystem on which each FILE resides,\n\ or all filesystems by default.\n\ \n\ @@ -760,20 +760,26 @@ or all filesystems by default.\n\ --block-size=SIZE use SIZE-byte blocks\n\ -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n\ -H, --si likewise, but use powers of 1000 not 1024\n\ +"), stdout); + fputs (_("\ -i, --inodes list inode information instead of block usage\n\ -k, --kilobytes like --block-size=1024\n\ -l, --local limit listing to local filesystems\n\ -m, --megabytes like --block-size=1048576\n\ --no-sync do not invoke sync before getting usage info (default)\n\ +"), stdout); + fputs (_("\ -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\ +"), stdout); + fputs (_("\ --help display this help and exit\n\ --version output version information and exit\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/dircolors.c b/src/dircolors.c index 66e9b5535..796e667ea 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -1,5 +1,5 @@ /* dircolors - output commands to set the LS_COLOR environment variable - Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin + Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 H. Peter Anvin Copyright (C) 1996-2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -102,20 +102,22 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name); - printf (_("\ + fputs (_("\ Output commands to set the LS_COLORS environment variable.\n\ \n\ Determine format of output:\n\ -b, --sh, --bourne-shell output Bourne shell code to set LS_COLORS\n\ -c, --csh, --c-shell output C shell code to set LS_COLORS\n\ -p, --print-database output defaults\n\ +"), stdout); + fputs (_("\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ If FILE is specified, read it to determine which colors to use for which\n\ file types and extensions. Otherwise, a precompiled database is used.\n\ For details on the format of these files, run `dircolors --print-database'.\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } @@ -187,7 +187,7 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); - printf (_("\ + fputs (_("\ Summarize disk usage of each FILE, recursively for directories.\n\ \n\ -a, --all write counts for all files, not just directories\n\ @@ -195,14 +195,20 @@ Summarize disk usage of each FILE, recursively for directories.\n\ -b, --bytes print size in bytes\n\ -c, --total produce a grand total\n\ -D, --dereference-args dereference PATHs when symbolic link\n\ +"), stdout); + fputs (_("\ -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n\ -H, --si likewise, but use powers of 1000 not 1024\n\ -k, --kilobytes like --block-size=1024\n\ -l, --count-links count sizes many times if hard linked\n\ +"), stdout); + fputs (_("\ -L, --dereference dereference all symbolic links\n\ -m, --megabytes like --block-size=1048576\n\ -S, --separate-dirs do not include size of subdirectories\n\ -s, --summarize display only a total for each argument\n\ +"), stdout); + fputs (_("\ -x, --one-file-system skip directories on different filesystems\n\ -X FILE, --exclude-from=FILE Exclude files that match any pattern in FILE.\n\ --exclude=PAT Exclude files that match PAT.\n\ @@ -210,9 +216,11 @@ Summarize disk usage of each FILE, recursively for directories.\n\ only if it is N or fewer levels below the command\n\ line argument; --max-depth=0 is the same as\n\ --summarize\n\ +"), stdout); + fputs (_("\ --help display this help and exit\n\ --version output version information and exit\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/install.c b/src/install.c index 35c9d0b0d..842ded2be 100644 --- a/src/install.c +++ b/src/install.c @@ -604,40 +604,50 @@ Usage: %s [OPTION]... SOURCE DEST (1st format)\n\ or: %s -d [OPTION]... DIRECTORY... (3rd format)\n\ "), program_name, program_name, program_name); - printf (_("\ + fputs (_("\ In the first two formats, copy SOURCE to DEST or multiple SOURCE(s) to\n\ the existing DIRECTORY, while setting permission modes and owner/group.\n\ In the third format, create all components of the given DIRECTORY(ies).\n\ \n\ +"), stdout); + fputs (_("\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ -c (ignored)\n\ -d, --directory treat all arguments as directory names; create all\n\ components of the specified directories\n\ +"), stdout); + fputs (_("\ -D create all leading components of DEST except the last,\n\ then copy SOURCE to DEST; useful in the 1st 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 rwxr-xr-x\n\ -o, --owner=OWNER set ownership (super-user only)\n\ +"), stdout); + fputs (_("\ -p, --preserve-timestamps apply access/modification times of SOURCE files\n\ to corresponding destination files\n\ -s, --strip strip symbol tables, only for 1st and 2nd formats\n\ -S, --suffix=SUFFIX override the usual backup suffix\n\ +"), stdout); + fputs (_("\ -v, --verbose print the name of each directory as it is created\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ The version control method may be selected via the --backup option or through\n\ the VERSION_CONTROL environment variable. Here are the values:\n\ \n\ +"), stdout); + fputs (_("\ none, off never make backups (even if --backup is given)\n\ numbered, t make numbered backups\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -342,7 +342,7 @@ Usage: %s [OPTION]... TARGET [LINK_NAME]\n\ or: %s [OPTION]... --target-directory=DIRECTORY TARGET...\n\ "), program_name, program_name, program_name); - printf (_("\ + fputs (_("\ Create a link to the specified TARGET with optional LINK_NAME.\n\ If LINK_NAME is omitted, a link with the same basename as the TARGET is\n\ created in the current directory. When using the second form with more\n\ @@ -350,32 +350,40 @@ than one TARGET, the last argument must be a directory; create links\n\ in DIRECTORY to each TARGET. Create hard links by default, symbolic\n\ links with --symbolic. When creating hard links, each TARGET must exist.\n\ \n\ +"), stdout); + fputs (_("\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ -d, -F, --directory hard link directories (super-user only)\n\ -f, --force remove existing destination files\n\ +"), stdout); + fputs (_("\ -n, --no-dereference treat destination that is a symlink to a\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\ -S, --suffix=SUFFIX override the usual backup suffix\n\ +"), stdout); + fputs (_("\ --target-directory=DIRECTORY specify the DIRECTORY in which to create\n\ the links\n\ -v, --verbose print name of each file before linking\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ -")); - printf (_("\ +"), stdout); + fputs (_("\ The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\ The version control method may be selected via the --backup option or through\n\ the VERSION_CONTROL environment variable. Here are the values:\n\ \n\ +"), stdout); + fputs (_("\ none, off never make backups (even if --backup is given)\n\ numbered, t make numbered backups\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -3561,64 +3561,78 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); - printf (_("\ + fputs (_("\ List information about the FILEs (the current directory by default).\n\ Sort entries alphabetically if none of -cftuSUX nor --sort.\n\ \n\ -a, --all do not hide entries starting with .\n\ -A, --almost-all do not list implied . and ..\n\ -b, --escape print octal escapes for nongraphic characters\n\ +"), stdout); + fputs (_("\ --block-size=SIZE use SIZE-byte blocks\n\ -B, --ignore-backups do not list implied entries ending with ~\n\ -c with -lt: sort by, and show, ctime (time of last\n\ modification of file status information)\n\ with -l: show ctime and sort by name\n\ otherwise: sort by ctime\n\ +"), stdout); + fputs (_("\ -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, --directory list directory entries instead of contents\n\ -D, --dired generate output designed for Emacs' dired mode\n\ +"), stdout); + fputs (_("\ -f do not sort, enable -aU, disable -lst\n\ -F, --classify append indicator (one of */=@|) to entries\n\ --format=WORD across -x, commas -m, horizontal -x, long -l,\n\ single-column -1, verbose -l, vertical -C\n\ - --full-time like -l --time-style=full-iso\n")); - - printf (_("\ + --full-time like -l --time-style=full-iso\n\ +"), stdout); + fputs (_("\ -g like -l, but do not list owner\n\ -G, --no-group inhibit display of group information\n\ -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n\ --si likewise, but use powers of 1000 not 1024\n\ -H, --dereference-command-line follow symbolic links on the command line\n\ +"), stdout); + fputs (_("\ --indicator-style=WORD append indicator with style WORD to entry names:\n\ none (default), classify (-F), file-type (-p)\n\ -i, --inode print index number of each file\n\ -I, --ignore=PATTERN do not list implied entries matching shell PATTERN\n\ -k, --kilobytes like --block-size=1024\n\ +"), stdout); + fputs (_("\ -l use a long listing format\n\ -L, --dereference when showing file information for a symbolic\n\ link, show information for the file the link\n\ references rather than for the link itself\n\ - -m fill width with a comma separated list of entries\n")); - - printf (_("\ + -m fill width with a comma separated list of entries\n\ +"), stdout); + fputs (_("\ -n, --numeric-uid-gid like -l, but list numeric UIDs and GIDs\n\ -N, --literal print raw entry names (don't treat e.g. control\n\ characters specially)\n\ -o like -l, but do not list group information\n\ -p, --file-type append indicator (one of /=@|) to entries\n\ +"), stdout); + fputs (_("\ -q, --hide-control-chars print ? instead of non graphic characters\n\ --show-control-chars show non graphic characters as-is (default\n\ unless program is `ls' and output is a terminal)\n\ -Q, --quote-name enclose entry names in double quotes\n\ --quoting-style=WORD use quoting style WORD for entry names:\n\ literal, locale, shell, shell-always, c, escape\n\ +"), stdout); + fputs (_("\ -r, --reverse reverse order while sorting\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\ +"), stdout); + fputs (_("\ -S sort by file size\n\ --sort=WORD extension -X, none -U, size -S, time -t,\n\ version -v\n\ @@ -3626,28 +3640,36 @@ Sort entries alphabetically if none of -cftuSUX nor --sort.\n\ --time=WORD show time as WORD instead of modification time:\n\ atime, access, use, ctime or status; use\n\ specified time as sort key if --sort=time\n\ +"), stdout); + fputs (_("\ --time-style=WORD show times using style WORD:\n\ full-iso, iso, locale, posix-iso\n\ -t sort by modification time\n\ -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n\ +"), stdout); + fputs (_("\ -u with -lt: sort by, and show, access time\n\ with -l: show access time and sort by name\n\ otherwise: sort by access time\n\ -U do not sort; list entries in directory order\n\ -v sort by version\n\ +"), stdout); + fputs (_("\ -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\ -1 list one file per line\n\ --help display this help and exit\n\ --version output version information and exit\n\ +"), stdout); + fputs (_("\ \n\ By default, color is not used to distinguish types of files. That is\n\ equivalent to using --color=none. Using the --color option without the\n\ optional WHEN argument is equivalent to using --color=always. With\n\ --color=auto, color codes are output only if standard output is connected\n\ to a terminal (tty).\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); @@ -84,7 +84,7 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); - printf (_("\ + fputs (_("\ Remove (unlink) the FILE(s).\n\ \n\ -d, --directory unlink FILE, even if it is a non-empty directory\n\ @@ -92,21 +92,27 @@ Remove (unlink) the FILE(s).\n\ -f, --force ignore nonexistent files, never prompt\n\ -i, --interactive prompt before any removal\n\ -r, -R, --recursive remove the contents of directories recursively\n\ +"), stdout); + fputs (_("\ -v, --verbose explain what is being done\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n\ +"), stdout); + printf (_("\ To remove a file whose name starts with a `-', for example `-foo',\n\ use one of these commands:\n\ %s -- -foo\n\ \n\ %s ./-foo\n\ +"), + program_name, program_name); + fputs (_("\ \n\ Note that if you use rm to remove a file, it is usually possible to recover\n\ the contents of that file. If you want more assurance that the contents are\n\ truly unrecoverable, consider using shred.\n\ -"), - program_name, program_name); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/rmdir.c b/src/rmdir.c index 848a2c699..085a11e68 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -1,5 +1,5 @@ /* rmdir -- remove directories - Copyright (C) 90, 91, 1995-2000 Free Software Foundation, Inc. + Copyright (C) 90, 91, 1995-2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -142,7 +142,7 @@ usage (int status) else { printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name); - printf (_("\ + fputs (_("\ Remove the DIRECTORY(ies), if they are empty.\n\ \n\ --ignore-fail-on-non-empty\n\ @@ -151,10 +151,12 @@ Remove the DIRECTORY(ies), if they are empty.\n\ -p, --parents remove DIRECTORY, then try to remove each directory\n\ component of that path name. E.g., `rmdir -p a/b/c' is\n\ similar to `rmdir a/b/c a/b a'.\n\ +"), stdout); + fputs (_("\ -v, --verbose output a diagnostic for every directory processed\n\ --help display this help and exit\n\ --version output version information and exit\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/shred.c b/src/shred.c index e65b1da2f..9bec7dd13 100644 --- a/src/shred.c +++ b/src/shred.c @@ -471,6 +471,8 @@ for even very expensive hardware probing to recover the data.\n\ -f, --force change permissions to allow writing if necessary\n\ -n, --iterations=N Overwrite N times instead of the default (%d)\n\ -s, --size=N shred this many bytes (suffixes like k, M, G accepted)\n\ +"), DEFAULT_PASSES); + fputs (_("\ -u, --remove truncate and remove file after overwriting\n\ -v, --verbose show progress\n\ -x, --exact do not round file sizes up to the next full block\n\ @@ -479,17 +481,23 @@ for even very expensive hardware probing to recover the data.\n\ --help display this help and exit\n\ --version print version information and exit\n\ \n\ +"), stdout); + fputs (_("\ Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n\ the files because it is common to operate on device files like /dev/hda,\n\ and those files usually should not be removed. When operating on regular\n\ files, most people use the --remove option.\n\ \n\ +"), stdout); + fputs (_("\ CAUTION: Note that shred relies on a very important assumption:\n\ that the filesystem overwrites data in place. This is the traditional\n\ way to do things, but many modern filesystem designs do not satisfy this\n\ assumption. The following are examples of filesystems on which shred is\n\ not effective:\n\ \n\ +"), stdout); + fputs (_("\ * log-structured or journaled filesystems, such as those supplied with\n\ AIX and Solaris (and JFS, ReiserFS, XFS, etc.)\n\ \n\ @@ -498,6 +506,8 @@ not effective:\n\ \n\ * filesystems that make snapshots, such as Network Appliance's NFS server\n\ \n\ +"), stdout); + fputs (_("\ * filesystems that cache in temporary locations, such as NFS\n\ version 3 clients\n\ \n\ @@ -506,7 +516,7 @@ not effective:\n\ In addition, file system backups and remote mirrors may contain copies\n\ of the file that cannot be removed, and that will allow a shredded file\n\ to be recovered later.\n\ -"), DEFAULT_PASSES); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); diff --git a/src/touch.c b/src/touch.c index e3871c6e2..8db0df7f3 100644 --- a/src/touch.c +++ b/src/touch.c @@ -228,7 +228,7 @@ usage (int status) printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); printf (_(" or: %s [-acm] MMDDhhmm[YY] FILE... (obsolescent)\n"), program_name); - printf (_("\ + fputs (_("\ Update the access and modification times of each FILE to the current time.\n\ \n\ -a change only the access time\n\ @@ -236,16 +236,22 @@ Update the access and modification times of each FILE to the 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\ +"), stdout); + fputs (_("\ -r, --reference=FILE use this file's times instead of current time\n\ -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n\ --time=WORD set time given by WORD: access atime use (same as -a)\n\ modify mtime (same as -m)\n\ +"), stdout); + fputs (_("\ --help display this help and exit\n\ --version output version information and exit\n\ +"), stdout); + fputs (_("\ \n\ Note that the three time-date formats recognized for the -d and -t options\n\ and for the obsolescent argument are all different.\n\ -")); +"), stdout); puts (_("\nReport bugs to <bug-fileutils@gnu.org>.")); } exit (status); |