finish_header (st, header, -1);
header = find_next_block ();
-
+
bufsize = available_space_after (header);
while (bufsize < size)
return write_short_name (st);
}
-static union block *
-write_extended (struct tar_stat_info *st, union block *old_header)
+union block *
+write_extended (bool global, struct tar_stat_info *st, union block *old_header)
{
union block *header, hp;
char *p;
-
+ int type;
+
if (extended_header.buffer || extended_header.stk == NULL)
return old_header;
xheader_finish (&extended_header);
memcpy (hp.buffer, old_header, sizeof (hp));
- p = xheader_xhdr_name (st);
- xheader_write (XHDTYPE, p, &extended_header);
+ if (global)
+ {
+ type = XGLTYPE;
+ p = xheader_ghdr_name ();
+ }
+ else
+ {
+ type = XHDTYPE;
+ p = xheader_xhdr_name (st);
+ }
+ xheader_write (type, p, &extended_header);
free (p);
header = find_next_block ();
memcpy (header, &hp.buffer, sizeof (hp.buffer));
print_header (st, block_ordinal);
}
- header = write_extended (st, header);
+ header = write_extended (false, st, header);
simple_finish_header (header);
}
\f
union block *blk;
while (size_left > 0)
{
- save_sizeleft = size_left;
+ mv_size_left (size_left);
blk = find_next_block ();
memset (blk->buffer, 0, BLOCKSIZE);
set_next_block_after (blk);
finish_header (st, blk, block_ordinal);
+ mv_begin (st);
while (size_left > 0)
{
size_t bufsize, count;
- if (multi_volume_option)
- {
- assign_string (&save_name, st->orig_file_name);
- save_sizeleft = size_left;
- save_totsize = st->stat.st_size;
- }
+ mv_size_left (size_left);
+
blk = find_next_block ();
bufsize = available_space_after (blk);
const char *buffer, *p_buffer;
block_ordinal = current_block_ordinal ();
- buffer = gnu_list_name->dir_contents; /* FOO */
+ buffer = gnu_list_name->dir_contents;
if (buffer)
totsize = dumpdir_size (buffer);
else
finish_header (st, blk, block_ordinal);
p_buffer = buffer;
size_left = totsize;
+
+ mv_begin (st);
+ mv_total_size (totsize);
while (size_left > 0)
{
- if (multi_volume_option)
- {
- assign_string (&save_name, st->orig_file_name);
- save_sizeleft = size_left;
- save_totsize = totsize;
- }
+ mv_size_left (size_left);
blk = find_next_block ();
bufsize = available_space_after (blk);
if (size_left < bufsize)
p_buffer += bufsize;
set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE);
}
- if (multi_volume_option)
- assign_string (&save_name, 0);
+ mv_end ();
}
return;
}
switch (status)
{
case dump_status_ok:
- if (multi_volume_option)
- assign_string (&save_name, 0);
+ mv_end ();
dump_regular_finish (fd, st, original_ctime);
break;
case dump_status_short:
- if (multi_volume_option)
- assign_string (&save_name, 0);
+ mv_end ();
close (fd);
break;