coreutils-8.25HEADcoreutils-8.25master

1 files changed, 178 insertions, 186 deletions

diff --git a/src/expand.c b/src/expand.c
index 5645203..e11f1af 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -1,10 +1,10 @@
 /* expand - convert tabs to spaces
-   Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.
+   Copyright (C) 1989-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/>.  */
 
 /* By default, convert all tabs to spaces.
    Preserves backspace characters in the output; they decrement the
@@ -24,10 +23,10 @@
    --tabs=tab1[,tab2[,...]]
    -t tab1[,tab2[,...]]
    -tab1[,tab2[,...]]	If only one tab stop is given, set the tabs tab1
-			columns apart instead of the default 8.  Otherwise,
-			set the tabs at columns tab1, tab2, etc. (numbered from
-			0); replace any tabs beyond the tab stops given with
-			single spaces.
+                        columns apart instead of the default 8.  Otherwise,
+                        set the tabs at columns tab1, tab2, etc. (numbered from
+                        0); replace any tabs beyond the tab stops given with
+                        single spaces.
    --initial
    -i			Only convert initial tabs on each line to spaces.
 
@@ -40,47 +39,41 @@
 #include <sys/types.h>
 #include "system.h"
 #include "error.h"
+#include "fadvise.h"
 #include "quote.h"
 #include "xstrndup.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 "expand"
 
-#define AUTHORS "David MacKenzie"
-
-/* The number of bytes added at a time to the amount of memory
-   allocated for the output line.  */
-#define OUTPUT_BLOCK 256
-
-/* The name this program was run with.  */
-char *program_name;
+#define AUTHORS proper_name ("David MacKenzie")
 
 /* If true, convert blanks even after nonblank characters have been
    read on the line.  */
 static bool convert_entire_line;
 
-/* If nonzero, the size of all tab stops.  If zero, use `tab_list' instead.  */
+/* If nonzero, the size of all tab stops.  If zero, use 'tab_list' instead.  */
 static uintmax_t tab_size;
 
 /* Array of the explicit column numbers of the tab stops;
-   after `tab_list' is exhausted, each additional tab is replaced
+   after 'tab_list' is exhausted, each additional tab is replaced
    by a space.  The first column is column 0.  */
 static uintmax_t *tab_list;
 
-/* The number of allocated entries in `tab_list'.  */
+/* The number of allocated entries in 'tab_list'.  */
 static size_t n_tabs_allocated;
 
-/* The index of the first invalid element of `tab_list',
+/* The index of the first invalid element of 'tab_list',
    where the next element can be added.  */
 static size_t first_free_tab;
 
 /* Null-terminated array of input filenames.  */
 static char **file_list;
 
-/* Default for `file_list' if no files are given on the command line.  */
+/* Default for 'file_list' if no files are given on the command line.  */
 static char *stdin_argv[] =
 {
-  "-", NULL
+  (char *) "-", NULL
 };
 
 /* True if we have ever read standard input.  */
@@ -104,22 +97,20 @@ 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 (_("\
 Convert tabs in each FILE to spaces, writing to standard output.\n\
-With no FILE, or when FILE is -, read standard input.\n\
-\n\
-"), stdout);
-      fputs (_("\
-Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
+
+      emit_stdin_note ();
+      emit_mandatory_arg_note ();
+
       fputs (_("\
   -i, --initial       do not convert tabs after non blanks\n\
   -t, --tabs=NUMBER   have tabs NUMBER characters apart, not 8\n\
@@ -129,12 +120,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_ancillary_info (PROGRAM_NAME);
     }
   exit (status);
 }
 
-/* Add tab stop TABVAL to the end of `tab_list'.  */
+/* Add tab stop TABVAL to the end of 'tab_list'.  */
 
 static void
 add_tab_stop (uintmax_t tabval)
@@ -151,45 +142,45 @@ static void
 parse_tab_stops (char const *stops)
 {
   bool have_tabval = false;
-  uintmax_t tabval IF_LINT (= 0);
-  char const *num_start IF_LINT (= NULL);
+  uintmax_t tabval IF_LINT ( = 0);
+  char const *num_start IF_LINT ( = NULL);
   bool ok = true;
 
   for (; *stops; stops++)
     {
       if (*stops == ',' || isblank (to_uchar (*stops)))
-	{
-	  if (have_tabval)
-	    add_tab_stop (tabval);
-	  have_tabval = false;
-	}
+        {
+          if (have_tabval)
+            add_tab_stop (tabval);
+          have_tabval = false;
+        }
       else if (ISDIGIT (*stops))
-	{
-	  if (!have_tabval)
-	    {
-	      tabval = 0;
-	      have_tabval = true;
-	      num_start = stops;
-	    }
-
-	  /* Detect overflow.  */
-	  if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', uintmax_t))
-	    {
-	      size_t len = strspn (num_start, "0123456789");
-	      char *bad_num = xstrndup (num_start, len);
-	      error (0, 0, _("tab stop is too large %s"), quote (bad_num));
-	      free (bad_num);
-	      ok = false;
-	      stops = num_start + len - 1;
-	    }
-	}
+        {
+          if (!have_tabval)
+            {
+              tabval = 0;
+              have_tabval = true;
+              num_start = stops;
+            }
+
+          /* Detect overflow.  */
+          if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', uintmax_t))
+            {
+              size_t len = strspn (num_start, "0123456789");
+              char *bad_num = xstrndup (num_start, len);
+              error (0, 0, _("tab stop is too large %s"), quote (bad_num));
+              free (bad_num);
+              ok = false;
+              stops = num_start + len - 1;
+            }
+        }
       else
-	{
-	  error (0, 0, _("tab size contains invalid character(s): %s"),
-		 quote (stops));
-	  ok = false;
-	  break;
-	}
+        {
+          error (0, 0, _("tab size contains invalid character(s): %s"),
+                 quote (stops));
+          ok = false;
+          break;
+        }
     }
 
   if (!ok)
@@ -211,16 +202,16 @@ validate_tab_stops (uintmax_t const *tabs, size_t entries)
   for (i = 0; i < entries; i++)
     {
       if (tabs[i] == 0)
-	error (EXIT_FAILURE, 0, _("tab size cannot be 0"));
+        error (EXIT_FAILURE, 0, _("tab size cannot be 0"));
       if (tabs[i] <= prev_tab)
-	error (EXIT_FAILURE, 0, _("tab sizes must be ascending"));
+        error (EXIT_FAILURE, 0, _("tab sizes must be ascending"));
       prev_tab = tabs[i];
     }
 }
 
 /* Close the old stream pointer FP if it is non-NULL,
    and return a new one opened to read the next input file.
-   Open a filename of `-' as the standard input.
+   Open a filename of '-' as the standard input.
    Return NULL if there are no more input files.  */
 
 static FILE *
@@ -232,41 +223,42 @@ next_file (FILE *fp)
   if (fp)
     {
       if (ferror (fp))
-	{
-	  error (0, errno, "%s", prev_file);
-	  exit_status = EXIT_FAILURE;
-	}
+        {
+          error (0, errno, "%s", quotef (prev_file));
+          exit_status = EXIT_FAILURE;
+        }
       if (STREQ (prev_file, "-"))
-	clearerr (fp);		/* Also clear EOF.  */
+        clearerr (fp);		/* Also clear EOF.  */
       else if (fclose (fp) != 0)
-	{
-	  error (0, errno, "%s", prev_file);
-	  exit_status = EXIT_FAILURE;
-	}
+        {
+          error (0, errno, "%s", quotef (prev_file));
+          exit_status = EXIT_FAILURE;
+        }
     }
 
   while ((file = *file_list++) != NULL)
     {
       if (STREQ (file, "-"))
-	{
-	  have_read_stdin = true;
-	  prev_file = file;
-	  return stdin;
-	}
-      fp = fopen (file, "r");
+        {
+          have_read_stdin = true;
+          fp = stdin;
+        }
+      else
+        fp = fopen (file, "r");
       if (fp)
-	{
-	  prev_file = file;
-	  return fp;
-	}
-      error (0, errno, "%s", file);
+        {
+          prev_file = file;
+          fadvise (fp, FADVISE_SEQUENTIAL);
+          return fp;
+        }
+      error (0, errno, "%s", quotef (file));
       exit_status = EXIT_FAILURE;
     }
   return NULL;
 }
 
 /* Change tabs to spaces, writing to stdout.
-   Read each file in `file_list', in order.  */
+   Read each file in 'file_list', in order.  */
 
 static void
 expand (void)
@@ -277,7 +269,7 @@ expand (void)
   if (!fp)
     return;
 
-  for (;;)
+  while (true)
     {
       /* Input character, or EOF.  */
       int c;
@@ -287,7 +279,7 @@ expand (void)
 
 
       /* The following variables have valid values only when CONVERT
-	 is true:  */
+         is true:  */
 
       /* Column of next input character.  */
       uintmax_t column = 0;
@@ -299,68 +291,68 @@ expand (void)
       /* Convert a line of text.  */
 
       do
-	{
-	  while ((c = getc (fp)) < 0 && (fp = next_file (fp)))
-	    continue;
-
-	  if (convert)
-	    {
-	      if (c == '\t')
-		{
-		  /* Column the next input tab stop is on.  */
-		  uintmax_t next_tab_column;
-
-		  if (tab_size)
-		    next_tab_column = column + (tab_size - column % tab_size);
-		  else
-		    for (;;)
-		      if (tab_index == first_free_tab)
-			{
-			  next_tab_column = column + 1;
-			  break;
-			}
-		      else
-			{
-			  uintmax_t tab = tab_list[tab_index++];
-			  if (column < tab)
-			    {
-			      next_tab_column = tab;
-			      break;
-			    }
-			}
-
-		  if (next_tab_column < column)
-		    error (EXIT_FAILURE, 0, _("input line is too long"));
-
-		  while (++column < next_tab_column)
-		    if (putchar (' ') < 0)
-		      error (EXIT_FAILURE, errno, _("write error"));
-
-		  c = ' ';
-		}
-	      else if (c == '\b')
-		{
-		  /* Go back one column, and force recalculation of the
-		     next tab stop.  */
-		  column -= !!column;
-		  tab_index -= !!tab_index;
-		}
-	      else
-		{
-		  column++;
-		  if (!column)
-		    error (EXIT_FAILURE, 0, _("input line is too long"));
-		}
-
-	      convert &= convert_entire_line | !! isblank (c);
-	    }
-
-	  if (c < 0)
-	    return;
-
-	  if (putchar (c) < 0)
-	    error (EXIT_FAILURE, errno, _("write error"));
-	}
+        {
+          while ((c = getc (fp)) < 0 && (fp = next_file (fp)))
+            continue;
+
+          if (convert)
+            {
+              if (c == '\t')
+                {
+                  /* Column the next input tab stop is on.  */
+                  uintmax_t next_tab_column;
+
+                  if (tab_size)
+                    next_tab_column = column + (tab_size - column % tab_size);
+                  else
+                    while (true)
+                      if (tab_index == first_free_tab)
+                        {
+                          next_tab_column = column + 1;
+                          break;
+                        }
+                      else
+                        {
+                          uintmax_t tab = tab_list[tab_index++];
+                          if (column < tab)
+                            {
+                              next_tab_column = tab;
+                              break;
+                            }
+                        }
+
+                  if (next_tab_column < column)
+                    error (EXIT_FAILURE, 0, _("input line is too long"));
+
+                  while (++column < next_tab_column)
+                    if (putchar (' ') < 0)
+                      error (EXIT_FAILURE, errno, _("write error"));
+
+                  c = ' ';
+                }
+              else if (c == '\b')
+                {
+                  /* Go back one column, and force recalculation of the
+                     next tab stop.  */
+                  column -= !!column;
+                  tab_index -= !!tab_index;
+                }
+              else
+                {
+                  column++;
+                  if (!column)
+                    error (EXIT_FAILURE, 0, _("input line is too long"));
+                }
+
+              convert &= convert_entire_line || !! isblank (c);
+            }
+
+          if (c < 0)
+            return;
+
+          if (putchar (c) < 0)
+            error (EXIT_FAILURE, errno, _("write error"));
+        }
       while (c != '\n');
     }
 }
@@ -371,7 +363,7 @@ main (int argc, char **argv)
   int c;
 
   initialize_main (&argc, &argv);
-  program_name = argv[0];
+  set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -387,35 +379,35 @@ main (int argc, char **argv)
   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
     {
       switch (c)
-	{
-	case 'i':
-	  convert_entire_line = false;
-	  break;
-
-	case 't':
-	  parse_tab_stops (optarg);
-	  break;
-
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-	  if (optarg)
-	    parse_tab_stops (optarg - 1);
-	  else
-	    {
-	      char tab_stop[2];
-	      tab_stop[0] = c;
-	      tab_stop[1] = '\0';
-	      parse_tab_stops (tab_stop);
-	    }
-	  break;
-
-	case_GETOPT_HELP_CHAR;
-
-	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
-
-	default:
-	  usage (EXIT_FAILURE);
-	}
+        {
+        case 'i':
+          convert_entire_line = false;
+          break;
+
+        case 't':
+          parse_tab_stops (optarg);
+          break;
+
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+          if (optarg)
+            parse_tab_stops (optarg - 1);
+          else
+            {
+              char tab_stop[2];
+              tab_stop[0] = c;
+              tab_stop[1] = '\0';
+              parse_tab_stops (tab_stop);
+            }
+          break;
+
+        case_GETOPT_HELP_CHAR;
+
+        case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+
+        default:
+          usage (EXIT_FAILURE);
+        }
     }
 
   validate_tab_stops (tab_list, first_free_tab);
@@ -434,5 +426,5 @@ main (int argc, char **argv)
   if (have_read_stdin && fclose (stdin) != 0)
     error (EXIT_FAILURE, errno, "-");
 
-  exit (exit_status);
+  return exit_status;
 }