From 56deeee42bbd4d1b0070ce77bb87d5f0116a3ee2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 2 Nov 1993 22:10:58 +0000 Subject: merge with 1.8.1b --- src/fold.c | 8 ++++++++ src/join.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/fold.c b/src/fold.c index 9f9f0c8c5..eda7e039f 100644 --- a/src/fold.c +++ b/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; diff --git a/src/join.c b/src/join.c index 0b323ec4a..21ed852a6 100644 --- a/src/join.c +++ b/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[] = -- cgit v1.2.3-70-g09d2