diff options
| author | Jim Meyering <jim@meyering.net> | 1993-11-02 22:10:58 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-11-02 22:10:58 +0000 |
| commit | 56deeee42bbd4d1b0070ce77bb87d5f0116a3ee2 (patch) | |
| tree | 373a9439c3f993b45ea812da1e3e9955e98d285a /src | |
| parent | 693e5c427acae56adc00427ad15250373729fc1d (diff) | |
| download | coreutils-56deeee42bbd4d1b0070ce77bb87d5f0116a3ee2.tar.xz | |
merge with 1.8.1b
Diffstat (limited to 'src')
| -rw-r--r-- | src/fold.c | 8 | ||||
| -rw-r--r-- | src/join.c | 6 |
2 files changed, 8 insertions, 6 deletions
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[] = |