merge with 1.8c

10 files changed, 18 insertions, 18 deletions

diff --git a/src/csplit.c b/src/csplit.c
index a6be8fdbe..f2beb0fc0 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -614,7 +614,7 @@ get_first_line_in_buffer ()
   return head->first_available;
 }
 
-/* Return a pointer to the logical first line in the buffer and make the 
+/* Return a pointer to the logical first line in the buffer and make the
    next line the logical first line.
    Return NULL if there is no more input. */
 
diff --git a/src/cut.c b/src/cut.c
index 1c8e70eaf..9a056c75c 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,6 +1,6 @@
 /* cut - remove parts of lines of files
    Copyright (C) 1984 by David M. Ihnat
- 
+
    This program is a total rewrite of the Bell Laboratories Unix(Tm)
    command of the same name, as of System V.  It contains no proprietary
    code, and therefore may be used without violation of any proprietary
diff --git a/src/expand.c b/src/expand.c
index 4aaaf02db..7acf5fd09 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -241,7 +241,7 @@ validate_tabstops (tabs, entries)
 {
   int prev_tab = 0;
   int i;
-  
+
   for (i = 0; i < entries; i++)
     {
       if (tabs[i] == 0)
diff --git a/src/fold.c b/src/fold.c
index 4de88036f..80fa04711 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -186,7 +186,7 @@ fold_file (filename, width)
 	  allocated_out += 1024;
 	  line_out = xrealloc (line_out, allocated_out);
 	}
-      
+
       if (c == '\n')
 	{
 	  line_out[offset_out++] = c;
diff --git a/src/join.c b/src/join.c
index 7d02e0689..cd9ea211c 100644
--- a/src/join.c
+++ b/src/join.c
@@ -668,7 +668,7 @@ main (argc, argv)
 
   if (show_help)
     usage ();
-  
+
   if (nfiles != 2)
     usage ();
 
diff --git a/src/paste.c b/src/paste.c
index 8639b3407..24c617db5 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -1,6 +1,6 @@
 /* paste - merge lines of files
    Copyright (C) 1984 by David M. Ihnat
- 
+
    This program is a total rewrite of the Bell Laboratories Unix(Tm)
    command of the same name, as of System V.  It contains no proprietary
    code, and therefore may be used without violation of any proprietary
@@ -16,16 +16,16 @@
    this program accepts full responsibility for any effects or loss;
    in particular, the author is not responsible for any losses,
    explicit or incidental, that may be incurred through use of this program.
- 
+
    I ask that any bugs (and, if possible, fixes) be reported to me when
    possible.  -David Ihnat (312) 784-4544 ignatz@homebru.chi.il.us
 
    The list of valid escape sequences has been expanded over the Unix
    version, to include \b, \f, \r, and \v.
- 
+
    POSIX changes, bug fixes, long-named options, and cleanup
    by David MacKenzie <djm@gnu.ai.mit.edu>.
- 
+
    Options:
    --serial
    -s				Paste one file at a time rather than
@@ -333,7 +333,7 @@ paste_parallel (nfiles, fnamptr)
 		      error (0, errno, "%s", fnamptr[i]);
 		      errors = 1;
 		    }
-		      
+
 		  fileptr[i] = CLOSED;
 		  files_open--;
 		}
diff --git a/src/sum.c b/src/sum.c
index 46e672cc3..c625f7d95 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -5,12 +5,12 @@
    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.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
@@ -149,7 +149,7 @@ bsd_sum_file (file, print_name)
 	  return -1;
 	}
     }
- 
+
   /* This algorithm seems to depend on sign extension in `ch' in order to
      give the right results.  Ick.  */
   while ((ch = getc (fp)) != EOF)
diff --git a/src/tac.c b/src/tac.c
index 793cf55c7..d6671e214 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -583,7 +583,7 @@ output (start, past_end)
       bytes_in_buffer = 0;
       return;
     }
-  
+
   /* Write out as many full buffers as possible. */
   while (bytes_to_add >= bytes_available)
     {
diff --git a/src/unexpand.c b/src/unexpand.c
index 68b7073df..7affd88b5 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -243,7 +243,7 @@ validate_tabstops (tabs, entries)
 {
   int prev_tab = 0;
   int i;
-  
+
   for (i = 0; i < entries; i++)
     {
       if (tabs[i] == 0)
@@ -262,7 +262,7 @@ unexpand ()
 {
   FILE *fp;			/* Input stream. */
   int c;			/* Each input character. */
-  /* Index in `tab_list' of next tabstop: */  
+  /* Index in `tab_list' of next tabstop: */
   int tab_index = 0;		/* For calculating width of pending tabs. */
   int print_tab_index = 0;	/* For printing as many tabs as possible. */
   int column = 0;		/* Column on screen of next char. */
diff --git a/src/uniq.c b/src/uniq.c
index 501735654..9323397ba 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -143,11 +143,11 @@ main (argc, argv)
 	case 'u':
 	  mode = output_unique;
 	  break;
-	  
+
 	case 'w':
 	  check_chars = atoi (optarg);
 	  break;
-	  
+
 	default:
 	  usage ();
 	}