diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2007-04-12 00:21:25 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-04-12 00:21:25 +0200 |
| commit | 395fcee97a358fdfe2d6ca3bc2544cb008fd40f6 (patch) | |
| tree | e967bcf7d0781bf5bc8e82e3864639f71dca79b2 | |
| parent | f839bfad730f49d162213fe313b47319bd74b9d3 (diff) | |
| download | coreutils-395fcee97a358fdfe2d6ca3bc2544cb008fd40f6.tar.xz | |
split --line-bytes=N (-C N): don't create an empty file.
* src/split.c (line_bytes_split): Don't create an empty line
afterwards if the last buffer happens to be exactly full.
* tests/misc/split-fail: Add a test case for this.
* NEWS: mention this.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/split.c | 6 | ||||
| -rwxr-xr-x | tests/misc/split-fail | 8 |
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2007-04-11 Paul Eggert <eggert@cs.ucla.edu> + + split --line-bytes=N (-C N): don't create an empty file. + * src/split.c (line_bytes_split): Don't create an empty line + afterwards if the last buffer happens to be exactly full. + * tests/misc/split-fail: Add a test case for this. + * NEWS: mention this. + 2007-04-10 Jim Meyering <jim@meyering.net> ls: don't form or compute the length of strings that won't be used. @@ -15,6 +15,9 @@ GNU coreutils NEWS -*- outline -*- ln=target attribute) would mistakenly output the string "target" before the name of each symlink. [introduced in coreutils-6.0] + split --line-bytes=N (-C N) no longer creates an empty file + [this bug is present at least as far back as textutils-1.22 (Jan, 1997)] + * Noteworthy changes in release 6.9 (2007-03-22) [stable] diff --git a/src/split.c b/src/split.c index 2fc6ecfcf..207cc13b3 100644 --- a/src/split.c +++ b/src/split.c @@ -336,7 +336,11 @@ line_bytes_split (size_t n_bytes) n_buffered += n_read; if (n_buffered != n_bytes) - eof = true; + { + if (n_buffered == 0) + break; + eof = true; + } /* Find where to end this chunk. */ bp = buf + n_buffered; diff --git a/tests/misc/split-fail b/tests/misc/split-fail index 70435b453..8cdfe6478 100755 --- a/tests/misc/split-fail +++ b/tests/misc/split-fail @@ -1,7 +1,7 @@ #!/bin/sh # split must fail when given length/count of zero. -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # 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 @@ -47,6 +47,12 @@ split -b 0 in 2> /dev/null && fail=1 split -C 0 in 2> /dev/null && fail=1 split -l 0 in 2> /dev/null && fail=1 +# Make sure -C doesn't create empty files. +rm -f x?? || fail=1 +echo x | split -C 1 || fail=1 +test -f xaa && test -f xab || fail=1 +test -f xac && fail=1 + # Make sure that the obsolete -N notation still works split -1 in 2> /dev/null || fail=1 |