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/ls.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/ls.c') diff --git a/src/ls.c b/src/ls.c index f861df91a..e5da0d797 100644 --- a/src/ls.c +++ b/src/ls.c @@ -2048,7 +2048,8 @@ decode_switches (int argc, char **argv) } } /* Note we leave %5b etc. alone so user widths/flags are honored. */ - if (strstr (long_time_format[0],"%b") || strstr (long_time_format[1],"%b")) + if (strstr (long_time_format[0], "%b") + || strstr (long_time_format[1], "%b")) if (!abmon_init ()) error (0, 0, _("error initializing month strings")); } @@ -4628,15 +4629,18 @@ Mandatory arguments to long options are mandatory for short options too.\n\ --dereference-command-line-symlink-to-dir\n\ follow each command line symbolic link\n\ that points to a directory\n\ - --hide=PATTERN do not list implied entries matching shell PATTERN\n\ + --hide=PATTERN do not list implied entries matching shell PATTERN\ +\n\ (overridden by -a or -A)\n\ "), stdout); fputs (_("\ - --indicator-style=WORD append indicator with style WORD to entry names:\n\ + --indicator-style=WORD append indicator with style WORD to entry names:\ +\n\ none (default), slash (-p),\n\ file-type (--file-type), classify (-F)\n\ -i, --inode print the index number of each file\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\ -k like --block-size=1K\n\ "), stdout); fputs (_("\ @@ -4644,7 +4648,8 @@ Mandatory arguments to long options are mandatory for short options too.\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\ + -m fill width with a comma separated list of entries\ +\n\ "), stdout); fputs (_("\ -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n\ @@ -4660,7 +4665,8 @@ Mandatory arguments to long options are mandatory for short options too.\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\ + literal, locale, shell, shell-always, c, escape\ +\n\ "), stdout); fputs (_("\ -r, --reverse reverse order while sorting\n\ @@ -4671,7 +4677,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -S sort by file size\n\ --sort=WORD sort by WORD instead of name: none -U,\n\ extension -X, size -S, time -t, version -v\n\ - --time=WORD with -l, show time as WORD instead of modification\n\ + --time=WORD with -l, show time as WORD instead of modification\ +\n\ time: atime -u, access -u, use -u, ctime -c,\n\ or status -c; use specified time as sort key\n\ if --sort=time\n\ -- cgit v1.2.3-54-g00ecf