diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2010-12-28 12:28:48 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2010-12-28 12:30:42 -0800 |
commit | b0097f3d2180352896a4434fb8eaeb076f12794c (patch) | |
tree | eb605f5d69d8c346278db1ccbec82d1a594403e1 /src/md5sum.c | |
parent | 01211e9af728a5123b9cced19b7dfdc02b019f5b (diff) | |
download | coreutils-b0097f3d2180352896a4434fb8eaeb076f12794c.tar.xz |
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.
Diffstat (limited to 'src/md5sum.c')
-rw-r--r-- | src/md5sum.c | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/md5sum.c b/src/md5sum.c index a660e3b2c..50bb0a1b4 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -1,4 +1,4 @@ -/* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings +/* Compute checksums of files or strings. Copyright (C) 1995-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -162,29 +162,29 @@ With no FILE, or when FILE is -, read standard input.\n\ DIGEST_BITS); if (O_BINARY) fputs (_("\ - -b, --binary read in binary mode (default unless reading tty stdin)\n\ + -b, --binary read in binary mode (default unless reading tty stdin)\n\ "), stdout); else fputs (_("\ - -b, --binary read in binary mode\n\ + -b, --binary read in binary mode\n\ "), stdout); printf (_("\ - -c, --check read %s sums from the FILEs and check them\n"), + -c, --check read %s sums from the FILEs and check them\n"), DIGEST_TYPE_STRING); if (O_BINARY) fputs (_("\ - -t, --text read in text mode (default if reading tty stdin)\n\ + -t, --text read in text mode (default if reading tty stdin)\n\ "), stdout); else fputs (_("\ - -t, --text read in text mode (default)\n\ + -t, --text read in text mode (default)\n\ "), stdout); fputs (_("\ \n\ The following three options are useful only when verifying checksums:\n\ - --quiet don't print OK for each successfully verified file\n\ - --status don't output anything, status code shows success\n\ - -w, --warn warn about improperly formatted checksum lines\n\ + --quiet don't print OK for each successfully verified file\n\ + --status don't output anything, status code shows success\n\ + -w, --warn warn about improperly formatted checksum lines\n\ \n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); @@ -209,7 +209,8 @@ text), and name for each FILE.\n"), name. S is modified. Return true if successful. */ static bool -bsd_split_3 (char *s, size_t s_len, unsigned char **hex_digest, char **file_name) +bsd_split_3 (char *s, size_t s_len, unsigned char **hex_digest, + char **file_name) { size_t i; @@ -576,23 +577,26 @@ digest_check (const char *checkfile_name) { if (n_misformatted_lines != 0) error (0, 0, - ngettext ("WARNING: %" PRIuMAX " line is improperly formatted", - "WARNING: %" PRIuMAX " lines are improperly formatted", - select_plural (n_misformatted_lines)), + (ngettext + ("WARNING: %" PRIuMAX " line is improperly formatted", + "WARNING: %" PRIuMAX " lines are improperly formatted", + select_plural (n_misformatted_lines))), n_misformatted_lines); if (n_open_or_read_failures != 0) error (0, 0, - ngettext ("WARNING: %" PRIuMAX " listed file could not be read", - "WARNING: %" PRIuMAX " listed files could not be read", - select_plural (n_open_or_read_failures)), + (ngettext + ("WARNING: %" PRIuMAX " listed file could not be read", + "WARNING: %" PRIuMAX " listed files could not be read", + select_plural (n_open_or_read_failures))), n_open_or_read_failures); if (n_mismatched_checksums != 0) error (0, 0, - ngettext ("WARNING: %" PRIuMAX " computed checksum did NOT match", - "WARNING: %" PRIuMAX " computed checksums did NOT match", - select_plural (n_mismatched_checksums)), + (ngettext + ("WARNING: %" PRIuMAX " computed checksum did NOT match", + "WARNING: %" PRIuMAX " computed checksums did NOT match", + select_plural (n_mismatched_checksums))), n_mismatched_checksums); } } |