merge with 1.8.1b

old/textutils/ChangeLog

@@ -1,3 +1,12 @@
+Tue Nov 02 00:53:41 1993  Jim Meyering  (meyering@comco.com)
+
+	* fold.c (fold_file): Don't get stuck in an endless loop when
+	width is smaller than 8 and there are TABs in the input.
+
+Sat Oct 30 15:31:28 1993  Jim Meyering  (meyering@comco.com)
+
+	* join.c: Remove now-unused dcls of show_help and show_version.
+
 Fri Oct 29 13:58:50 1993  Jim Meyering  (meyering@comco.com)
 
 	* csplit.c [INT_MAX]: Make sure it's defined.

old/textutils/NEWS

@@ -1,4 +1,6 @@
 Major changes in release 1.9:
+* the command `printf '\t\n' |fold -w n' now terminates.
+  Before, it wouldn't stop for n less than 8.
 * sort accepts and ignores -y[string] options for compatibilty with Solaris.
 * cat -v /dev/null works on more systems
 * od's --compatible (-C) flag renamed to --traditional (no short option)

src/fold.c

@@ -254,6 +254,14 @@ fold_file (filename, width)
 		  goto rescan;
 		}
 	    }
+	  else
+	    {
+	      if (offset_out == 0)
+		{
+		  line_out[offset_out++] = c;
+		  continue;
+		}
+	    }
 	  line_out[offset_out++] = '\n';
 	  fwrite (line_out, sizeof (char), offset_out, stdout);
 	  column = offset_out = 0;

src/join.c

@@ -105,12 +105,6 @@ static struct outlist *outlist_end;
    tab character. */
 static char tab;
 
-/* If non-zero, display usage information and exit.  */
-static int show_help;
-
-/* If non-zero, print the version on standard output then exit.  */
-static int show_version;
-
 /* When using getopt_long_only, no long option can start with
    a character that is a short option. */
 static struct option const longopts[] =