maint: update all copyright year number ranges

[platform/upstream/coreutils.git] / src / sum.c

diff --git a/src/sum.c b/src/sum.c
index b58336d..9ebcc42 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -1,5 +1,5 @@
 /* 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-2013 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
@@ -25,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;
@@ -51,18 +52,17 @@ 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\
 \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);
@@ -71,7 +71,7 @@ Print checksum and block counts for each FILE.\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      emit_bug_reporting_address ();
+      emit_ancillary_info ();
     }
   exit (status);
 }
@@ -97,18 +97,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", file);
+          return false;
+        }
     }
 
+  fadvise (fp, FADVISE_SEQUENTIAL);
+
   while ((ch = getc (fp)) != EOF)
     {
       total_bytes++;
@@ -121,7 +123,7 @@ bsd_sum_file (const char *file, int print_name)
     {
       error (0, errno, "%s", file);
       if (!is_stdin)
-       fclose (fp);
+        fclose (fp);
       return false;
     }
 
@@ -132,7 +134,7 @@ bsd_sum_file (const char *file, int print_name)
     }
 
   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');
@@ -165,16 +167,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", file);
+          return false;
+        }
     }
 
   while (1)
@@ -183,18 +185,18 @@ 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", 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;
     }
 
@@ -208,7 +210,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');
@@ -225,34 +227,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;