if (archive_names == 0)
FATAL_ERROR ((0, 0, _("No archive name given")));
- current_file_name = 0;
- current_link_name = 0;
+ destroy_stat (¤t_stat_info);
save_name = 0;
real_s_name = 0;
else
strcpy (record_start->header.name, volume_label_option);
- assign_string (¤t_file_name, record_start->header.name);
- current_trailing_slash = strip_trailing_slashes (current_file_name);
+ assign_string (¤t_stat_info.file_name, record_start->header.name);
+ current_stat_info.had_trailing_slash = strip_trailing_slashes (current_stat_info.file_name);
record_start->header.typeflag = GNUTYPE_VOLHDR;
TIME_TO_CHARS (start_time, record_start->header.mtime);
break;
if (! read_full_records_option)
- FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
- (unsigned long) (record_size - left)));
+ {
+ unsigned long rest = record_size - left;
+
+ FATAL_ERROR ((0, 0,
+ ngettext ("Unaligned block (%lu byte) in archive",
+ "Unaligned block (%lu bytes) in archive",
+ rest),
+ rest));
+ }
/* User warned us about this. Fix up. */
if (!read_full_records_option && verbose_option
&& record_start_block == 0 && status > 0)
- WARN ((0, 0, _("Record size = %lu blocks"),
- (unsigned long) ((record_size - left) / BLOCKSIZE)));
+ {
+ unsigned long rsize = (record_size - left) / BLOCKSIZE;
+ WARN ((0, 0,
+ ngettext ("Record size = %lu block",
+ "Record size = %lu blocks",
+ rsize),
+ rsize));
+ }
record_end = record_start + (record_size - left) / BLOCKSIZE;
records_read++;
}
#endif /* !MSDOS */
- if (current_file_name)
- free (current_file_name);
- if (current_link_name)
- free (current_link_name);
+ destroy_stat (¤t_stat_info);
if (save_name)
free (save_name);
if (real_s_name)