You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "system.h"
+#include <system.h>
#include "common.h"
-#include "rmt.h"
+#include <rmt.h>
static union block *new_record;
static int new_blocks;
}
}
+static void
+write_recent_bytes (char *data, size_t bytes)
+{
+ size_t blocks = bytes / BLOCKSIZE;
+ size_t rest = bytes - blocks * BLOCKSIZE;
+
+ write_recent_blocks ((union block *)data, blocks);
+ memcpy (new_record[new_blocks].buffer, data + blocks * BLOCKSIZE, rest);
+ if (rest < BLOCKSIZE)
+ memset (new_record[new_blocks].buffer + rest, 0, BLOCKSIZE - rest);
+ new_blocks++;
+ if (new_blocks == blocking_factor)
+ write_record (1);
+}
+
void
delete_archive_members (void)
{
do
{
- enum read_header status = read_header (1);
+ enum read_header status = read_header (true);
switch (status)
{
abort ();
case HEADER_SUCCESS:
- if (name = name_scan (current_stat_info.file_name), !name)
+ if ((name = name_scan (current_stat_info.file_name, false)) == NULL)
+ {
+ skip_member ();
+ break;
+ }
+ name->found_count++;
+ if (!ISFOUND(name))
{
skip_member ();
break;
}
- name->found = 1;
+
/* Fall through. */
case HEADER_SUCCESS_EXTENDED:
logical_status = status;
/* Fall through. */
case HEADER_SUCCESS:
+ case HEADER_SUCCESS_EXTENDED:
case HEADER_ZERO_BLOCK:
ERROR ((0, 0, _("Skipping to next header")));
/* Fall through. */
if (logical_status == HEADER_SUCCESS
|| logical_status == HEADER_SUCCESS_EXTENDED)
{
- write_archive_to_stdout = 0;
+ write_archive_to_stdout = false;
/* Save away blocks before this one in this record. */
if (current_block == record_end)
flush_archive ();
- status = read_header (0);
-
+ status = read_header (false);
+
+ xheader_decode (¤t_stat_info);
+
if (status == HEADER_ZERO_BLOCK && ignore_zeros_option)
{
set_next_block_after (current_header);
/* Found another header. */
- if (name = name_scan (current_stat_info.file_name), name)
+ if ((name = name_scan (current_stat_info.file_name, false)) != NULL)
{
- name->found = 1;
- flush_file:
- set_next_block_after (current_header);
- blocks_to_skip = (current_stat_info.stat.st_size + BLOCKSIZE - 1) / BLOCKSIZE;
-
- while (record_end - current_block <= blocks_to_skip)
+ name->found_count++;
+ if (ISFOUND(name))
{
- blocks_to_skip -= (record_end - current_block);
- flush_archive ();
+ flush_file:
+ set_next_block_after (current_header);
+ blocks_to_skip = (current_stat_info.stat.st_size
+ + BLOCKSIZE - 1) / BLOCKSIZE;
+
+ while (record_end - current_block <= blocks_to_skip)
+ {
+ blocks_to_skip -= (record_end - current_block);
+ flush_archive ();
+ }
+ current_block += blocks_to_skip;
+ blocks_to_skip = 0;
+ continue;
}
- current_block += blocks_to_skip;
- blocks_to_skip = 0;
- continue;
}
-
/* Copy header. */
- write_recent_blocks (recent_long_name, recent_long_name_blocks);
- write_recent_blocks (recent_long_link, recent_long_link_blocks);
+ if (extended_header.size)
+ {
+ write_recent_bytes (extended_header.buffer,
+ extended_header.size);
+ }
+ else
+ {
+ write_recent_blocks (recent_long_name, recent_long_name_blocks);
+ write_recent_blocks (recent_long_link, recent_long_link_blocks);
+ }
new_record[new_blocks] = *current_header;
new_blocks++;
blocks_to_keep
write_record (1);
}
}
- }
- if (logical_status == HEADER_END_OF_FILE)
- {
- /* Write the end of tape. FIXME: we can't use write_eot here,
- as it gets confused when the input is at end of file. */
+ if (logical_status == HEADER_END_OF_FILE)
+ {
+ /* Write the end of tape. FIXME: we can't use write_eot here,
+ as it gets confused when the input is at end of file. */
+
+ int total_zero_blocks = 0;
- int total_zero_blocks = 0;
+ do
+ {
+ int zero_blocks = blocking_factor - new_blocks;
+ memset (new_record + new_blocks, 0, BLOCKSIZE * zero_blocks);
+ total_zero_blocks += zero_blocks;
+ write_record (total_zero_blocks < 2);
+ }
+ while (total_zero_blocks < 2);
+ }
- do
+ if (! acting_as_filter && ! _isrmt (archive))
{
- int zero_blocks = blocking_factor - new_blocks;
- memset (new_record + new_blocks, 0, BLOCKSIZE * zero_blocks);
- total_zero_blocks += zero_blocks;
- write_record (total_zero_blocks < 2);
+ if (sys_truncate (archive))
+ truncate_warn (archive_name_array[0]);
}
- while (total_zero_blocks < 2);
}
-
free (new_record);
- if (! acting_as_filter && ! _isrmt (archive))
- {
-#if MSDOS
- int status = write (archive, "", 0);
-#else
- off_t pos = lseek (archive, (off_t) 0, SEEK_CUR);
- int status = pos < 0 ? -1 : ftruncate (archive, pos);
-#endif
- if (status != 0)
- truncate_warn (archive_name_array[0]);
- }
-
close_archive ();
names_notfound ();
}