From b0097f3d2180352896a4434fb8eaeb076f12794c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 28 Dec 2010 12:28:48 -0800 Subject: coreutils: keep lines within 80-column limits * cfg.mk (LINE_LEN_MAX, FILTER_LONG_LINES): New macros. (sc_long_lines): New rule. * HACKING: Use shorter URLs to the same material. * doc/Makefile.am, doc/coreutils.texi, m4/boottime.m4: * man/help2man, man/stdbuf.x, src/Makefile.am, src/cat.c, src/copy.c: * src/cp.c, src/dd.c, src/df.c, src/du.c, src/groups.c, src/install.c: * src/ls.c, src/md5sum.c, src/mv.c, src/od.c, src/pinky.c, src/ptx.c: * src/readlink.c, src/remove.c, src/rmdir.c, src/setuidgid.c: * src/sort.c, src/tail.c, src/touch.c, tests/Coreutils.pm: * tests/cp/existing-perm-race, tests/cp/perm, tests/cp/preserve-gid: * tests/du/2g, tests/du/long-from-unreadable, tests/init.sh: * tests/install/basic-1, tests/ls/nameless-uid: * tests/ls/readdir-mountpoint-inode, tests/misc/chroot-credentials: * tests/misc/cut, tests/misc/date, tests/misc/join, tests/misc/md5sum: * tests/misc/sha1sum, tests/misc/sha224sum, tests/misc/sort: * tests/misc/sort-continue, tests/misc/sort-files0-from: * tests/misc/sort-rand, tests/misc/stdbuf, tests/misc/tr: * tests/misc/uniq, tests/mv/atomic, tests/mv/part-fail: * tests/mv/part-symlink, tests/mv/sticky-to-xpart, tests/pr/pr-tests: * tests/rm/fail-2eperm, tests/rm/interactive-always: Reformat to fit within 80 columns. * doc/Makefile.am (BAD_POSIX_PERL): New macro. * doc/coreutils.texi: Reword slightly, to make menus and index lines shorter. * src/md5sum.c: Redo --help output so that it fits within 79 columns, since that's a bit more portable and all the other --help strings fit in 79 columns. --- src/cp.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/cp.c') diff --git a/src/cp.c b/src/cp.c index 3d00b5f7f..c103a82a9 100644 --- a/src/cp.c +++ b/src/cp.c @@ -170,16 +170,19 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (_("\ -a, --archive same as -dR --preserve=all\n\ --attributes-only don't copy the file data, just the attributes\n\ - --backup[=CONTROL] make a backup of each existing destination file\n\ + --backup[=CONTROL] make a backup of each existing destination file\ +\n\ -b like --backup but does not accept an argument\n\ --copy-contents copy contents of special files when recursive\n\ -d same as --no-dereference --preserve=links\n\ "), stdout); fputs (_("\ -f, --force if an existing destination file cannot be\n\ - opened, remove it and try again (redundant if\n\ + opened, remove it and try again (redundant if\ +\n\ the -n option is used)\n\ - -i, --interactive prompt before overwrite (overrides a previous -n\n\ + -i, --interactive prompt before overwrite (overrides a previous -n\ +\n\ option)\n\ -H follow command-line symbolic links in SOURCE\n\ "), stdout); @@ -196,7 +199,8 @@ Mandatory arguments to long options are mandatory for short options too.\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: context, links, xattr,\n\ + additional attributes: context, links, xattr,\ +\n\ all\n\ "), stdout); fputs (_("\ @@ -207,8 +211,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -R, -r, --recursive copy directories recursively\n\ --reflink[=WHEN] control clone/CoW copies. See below\n\ --remove-destination remove each existing destination file before\n\ - attempting to open it (contrast with --force)\n\ -"), stdout); + attempting to open it (contrast with --force)\ +\n"), stdout); fputs (_("\ --sparse=WHEN control creation of sparse files. See below\n\ --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ @@ -948,7 +952,8 @@ main (int argc, char **argv) reflink_type_string, reflink_type); break; - case 'a': /* Like -dR --preserve=all with reduced failure diagnostics. */ + case 'a': + /* Like -dR --preserve=all with reduced failure diagnostics. */ x.dereference = DEREF_NEVER; x.preserve_links = true; x.preserve_ownership = true; -- cgit v1.2.3-54-g00ecf