summaryrefslogtreecommitdiff
path: root/src/sum.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sum.c')
-rw-r--r--src/sum.c124
1 files changed, 65 insertions, 59 deletions
diff --git a/src/sum.c b/src/sum.c
index 92e4126..04e3931 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -1,10 +1,10 @@
/* sum -- checksum and count the blocks in a file
- Copyright (C) 86, 89, 91, 1995-2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1986-2016 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Like BSD sum or SysV sum -r, except like SysV sum if -s option is given. */
@@ -26,16 +25,17 @@
#include <getopt.h>
#include "system.h"
#include "error.h"
+#include "fadvise.h"
#include "human.h"
#include "safe-read.h"
+#include "xfreopen.h"
-/* The official name of this program (e.g., no `g' prefix). */
+/* The official name of this program (e.g., no 'g' prefix). */
#define PROGRAM_NAME "sum"
-#define AUTHORS "Kayvan Aghaiepour", "David MacKenzie"
-
-/* The name this program was run with. */
-char *program_name;
+#define AUTHORS \
+ proper_name ("Kayvan Aghaiepour"), \
+ proper_name ("David MacKenzie")
/* True if any of the files read were the standard input. */
static bool have_read_stdin;
@@ -52,27 +52,27 @@ void
usage (int status)
{
if (status != EXIT_SUCCESS)
- fprintf (stderr, _("Try `%s --help' for more information.\n"),
- program_name);
+ emit_try_help ();
else
{
printf (_("\
Usage: %s [OPTION]... [FILE]...\n\
"),
- program_name);
+ program_name);
fputs (_("\
Print checksum and block counts for each FILE.\n\
+"), stdout);
+
+ emit_stdin_note ();
+
+ fputs (_("\
\n\
- -r defeat -s, use BSD sum algorithm, use 1K blocks\n\
+ -r use BSD sum algorithm, use 1K blocks\n\
-s, --sysv use System V sum algorithm, use 512 bytes blocks\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
- fputs (_("\
-\n\
-With no FILE, or when FILE is -, read standard input.\n\
-"), stdout);
- printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+ emit_ancillary_info (PROGRAM_NAME);
}
exit (status);
}
@@ -98,18 +98,20 @@ bsd_sum_file (const char *file, int print_name)
fp = stdin;
have_read_stdin = true;
if (O_BINARY && ! isatty (STDIN_FILENO))
- freopen (NULL, "rb", stdin);
+ xfreopen (NULL, "rb", stdin);
}
else
{
fp = fopen (file, (O_BINARY ? "rb" : "r"));
if (fp == NULL)
- {
- error (0, errno, "%s", file);
- return false;
- }
+ {
+ error (0, errno, "%s", quotef (file));
+ return false;
+ }
}
+ fadvise (fp, FADVISE_SEQUENTIAL);
+
while ((ch = getc (fp)) != EOF)
{
total_bytes++;
@@ -120,20 +122,20 @@ bsd_sum_file (const char *file, int print_name)
if (ferror (fp))
{
- error (0, errno, "%s", file);
+ error (0, errno, "%s", quotef (file));
if (!is_stdin)
- fclose (fp);
+ fclose (fp);
return false;
}
if (!is_stdin && fclose (fp) != 0)
{
- error (0, errno, "%s", file);
+ error (0, errno, "%s", quotef (file));
return false;
}
printf ("%05d %5s", checksum,
- human_readable (total_bytes, hbuf, human_ceiling, 1, 1024));
+ human_readable (total_bytes, hbuf, human_ceiling, 1, 1024));
if (print_name > 1)
printf (" %s", file);
putchar ('\n');
@@ -166,16 +168,16 @@ sysv_sum_file (const char *file, int print_name)
fd = STDIN_FILENO;
have_read_stdin = true;
if (O_BINARY && ! isatty (STDIN_FILENO))
- freopen (NULL, "rb", stdin);
+ xfreopen (NULL, "rb", stdin);
}
else
{
fd = open (file, O_RDONLY | O_BINARY);
if (fd == -1)
- {
- error (0, errno, "%s", file);
- return false;
- }
+ {
+ error (0, errno, "%s", quotef (file));
+ return false;
+ }
}
while (1)
@@ -184,24 +186,24 @@ sysv_sum_file (const char *file, int print_name)
size_t bytes_read = safe_read (fd, buf, sizeof buf);
if (bytes_read == 0)
- break;
+ break;
if (bytes_read == SAFE_READ_ERROR)
- {
- error (0, errno, "%s", file);
- if (!is_stdin)
- close (fd);
- return false;
- }
+ {
+ error (0, errno, "%s", quotef (file));
+ if (!is_stdin)
+ close (fd);
+ return false;
+ }
for (i = 0; i < bytes_read; i++)
- s += buf[i];
+ s += buf[i];
total_bytes += bytes_read;
}
if (!is_stdin && close (fd) != 0)
{
- error (0, errno, "%s", file);
+ error (0, errno, "%s", quotef (file));
return false;
}
@@ -209,7 +211,7 @@ sysv_sum_file (const char *file, int print_name)
checksum = (r & 0xffff) + (r >> 16);
printf ("%d %s", checksum,
- human_readable (total_bytes, hbuf, human_ceiling, 1, 512));
+ human_readable (total_bytes, hbuf, human_ceiling, 1, 512));
if (print_name)
printf (" %s", file);
putchar ('\n');
@@ -226,34 +228,38 @@ main (int argc, char **argv)
bool (*sum_func) (const char *, int) = bsd_sum_file;
initialize_main (&argc, &argv);
- program_name = argv[0];
+ set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
atexit (close_stdout);
+ /* Line buffer stdout to ensure lines are written atomically and immediately
+ so that processes running in parallel do not intersperse their output. */
+ setvbuf (stdout, NULL, _IOLBF, 0);
+
have_read_stdin = false;
while ((optc = getopt_long (argc, argv, "rs", longopts, NULL)) != -1)
{
switch (optc)
- {
- case 'r': /* For SysV compatibility. */
- sum_func = bsd_sum_file;
- break;
+ {
+ case 'r': /* For SysV compatibility. */
+ sum_func = bsd_sum_file;
+ break;
- case 's':
- sum_func = sysv_sum_file;
- break;
+ case 's':
+ sum_func = sysv_sum_file;
+ break;
- case_GETOPT_HELP_CHAR;
+ case_GETOPT_HELP_CHAR;
- case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
- default:
- usage (EXIT_FAILURE);
- }
+ default:
+ usage (EXIT_FAILURE);
+ }
}
files_given = argc - optind;
@@ -264,6 +270,6 @@ main (int argc, char **argv)
ok &= sum_func (argv[optind], files_given);
if (have_read_stdin && fclose (stdin) == EOF)
- error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ error (EXIT_FAILURE, errno, "%s", quotef ("-"));
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
View Lorry Controller Status