mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
split: fix an edge case where -n l/... creates an extra file
* src/split.c (lines_bytes_chunk): Handle the edge case where the file is truncated as we read. * tests/misc/split-lchunk: Cleanup; no functional change.
This commit is contained in:
1 parent
e89c998a9e
commit
d92849fe5a
2 files changed
+8
-7
No files matched your search
+6
-5
@@ -599,6 +599,7 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
|
||||
off_t chunk_end = chunk_size - 1;
|
||||
off_t n_written = 0;
|
||||
bool new_file_flag = true;
|
||||
bool chunk_truncated = false;
|
||||
|
||||
if (k > 1)
|
||||
{
|
||||
@@ -620,6 +621,7 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
|
||||
error (EXIT_FAILURE, errno, "%s", infile);
|
||||
else if (n_read == 0)
|
||||
break; /* eof. */
|
||||
chunk_truncated = false;
|
||||
eob = buf + n_read;
|
||||
|
||||
while (bp != eob)
|
||||
@@ -659,11 +661,7 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
|
||||
if (!next && bp == eob)
|
||||
{
|
||||
/* replenish buf, before going to next chunk. */
|
||||
|
||||
/* If we're going to stop reading,
|
||||
then count the current chunk. */
|
||||
if (n_written >= file_size)
|
||||
chunk_no++;
|
||||
chunk_truncated = true;
|
||||
break;
|
||||
}
|
||||
chunk_no++;
|
||||
@@ -684,6 +682,9 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
|
||||
}
|
||||
}
|
||||
|
||||
if (chunk_truncated)
|
||||
chunk_no++;
|
||||
|
||||
/* Ensure NUMBER files are created, which truncates
|
||||
any existing files or notifies any consumers on fifos.
|
||||
FIXME: Should we do this before EXIT_FAILURE? */
|
||||
|
||||
@@ -74,8 +74,8 @@ for ELIDE_EMPTY in '' '-e'; do
|
||||
rm -f x*
|
||||
|
||||
if test -z "$ELIDE_EMPTY"; then
|
||||
split ---io-blksize=$IO_BLKSIZE $ELIDE_EMPTY -n l/2/$N in > chunk.k
|
||||
stat x* >/dev/null 2>/dev/null && fail=1
|
||||
split ---io-blksize=$IO_BLKSIZE -n l/2/$N in > chunk.k
|
||||
stat x* 2>/dev/null && fail=1
|
||||
fi
|
||||
|
||||
split ---io-blksize=$IO_BLKSIZE $ELIDE_EMPTY -n l/$N in
|
||||
|
||||
Reference in new issue
Block a user