mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix appending to archive with changed blocking factor.

Browse Source 
* src/buffer.c (flush_archive): If previous reading attempt resulted
in short read, correctly use the remaining record space.
(backspace_output): Fix position calculation (still has to be
improved).

* tests/append05.at: New test case.
* tests/Makefile.am: Add new test.
* tests/testsuite.at: Likewise.
This commit is contained in:
Sergey Poznyakoff
2016-03-15 00:02:40 +02:00
parent da7845c656
commit 2a7c84b4a9
5 changed files with 115 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/buffer.c
View File

@@ -983,18 +983,28 @@ short_read (size_t status)
void
flush_archive (void)
{
size_t buffer_level = current_block->buffer - record_start->buffer;
record_start_block += record_end - record_start;
current_block = record_start;
record_end = record_start + blocking_factor;
size_t buffer_level;
if (access_mode == ACCESS_READ && time_to_start_writing)
{
access_mode = ACCESS_WRITE;
time_to_start_writing = false;
backspace_output ();
if (record_end - record_start < blocking_factor)
{
memset (record_end, 0,
(blocking_factor - (record_end - record_start))
* BLOCKSIZE);
record_end = record_start + blocking_factor;
return;
}
}
buffer_level = current_block->buffer - record_start->buffer;
record_start_block += record_end - record_start;
current_block = record_start;
record_end = record_start + blocking_factor;
switch (access_mode)
{
case ACCESS_READ:
@@ -1034,7 +1044,7 @@ backspace_output (void)
/* Seek back to the beginning of this record and start writing there. */
position -= record_size;
position -= record_end->buffer - record_start->buffer;
if (position < 0)
position = 0;
if (rmtlseek (archive, position, SEEK_SET) != position)