\f
/* Variables. */
-static tarlong total_written; /* bytes written on all volumes */
+static tarlong prev_written; /* bytes written on previous volumes */
static tarlong bytes_written; /* bytes written on this volume */
/* FIXME: The following four variables should ideally be static to this
#endif /* DEBUG FORK */
-void
-init_total_written (void)
-{
- clear_tarlong (total_written);
- clear_tarlong (bytes_written);
-}
-
void
print_total_written (void)
{
fprintf (stderr, _("Total bytes written: "));
- print_tarlong (total_written, stderr);
+ fprintf (stderr, TARLONG_FORMAT, prev_written + bytes_written);
fprintf (stderr, "\n");
}
{
struct stat stbuf;
- if (stat (name, &stbuf) < 0)
- return 1;
-
- if (S_ISREG (stbuf.st_mode))
- return 1;
-
- return 0;
+ if (stat (name, &stbuf) == 0)
+ return S_ISREG (stbuf.st_mode);
+ else
+ return errno == ENOENT;
}
static ssize_t
if (size < BLOCKSIZE)
size = BLOCKSIZE;
- status = full_read (STDIN_FILENO, cursor, size);
+ status = safe_read (STDIN_FILENO, cursor, size);
if (status <= 0)
break;
}
if (backed_up_flag)
undo_last_backup ();
- FATAL_ERROR ((0, saved_errno, _("Cannot open %s"),
- archive_name_array[0]));
+ FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
}
#if !MSDOS
dev_null_output =
(strcmp (archive_name_array[0], dev_null) == 0
|| (! _isrmt (archive)
- && stat (dev_null, &dev_null_stat) == 0
&& S_ISCHR (archive_stat.st_mode)
+ && stat (dev_null, &dev_null_stat) == 0
+ && S_ISCHR (dev_null_stat.st_mode)
&& archive_stat.st_rdev == dev_null_stat.st_rdev));
}
if (checkpoint_option && !(++checkpoint % 10))
WARN ((0, 0, _("Write checkpoint %d"), checkpoint));
- if (!zerop_tarlong (tape_length_option)
- && !lessp_tarlong (bytes_written, tape_length_option))
+ if (tape_length_option && tape_length_option <= bytes_written)
{
errno = ENOSPC; /* FIXME: errno should be read-only */
status = 0;
status = write_archive_buffer ();
if (status != record_size && !multi_volume_option)
write_error (status);
- else if (totals_option)
- add_to_tarlong (total_written, record_size);
if (status > 0)
- add_to_tarlong (bytes_written, status);
+ bytes_written += status;
if (status == record_size)
{
if (!new_volume (ACCESS_WRITE))
return;
- clear_tarlong (bytes_written);
+ if (totals_option)
+ prev_written += bytes_written;
+ bytes_written = 0;
if (volume_label_option && real_s_name[0])
{
status = write_archive_buffer ();
if (status != record_size)
write_error (status);
- else if (totals_option)
- add_to_tarlong (total_written, record_size);
- add_to_tarlong (bytes_written, record_size);
+ bytes_written += status;
+
if (copy_back)
{
record_start += copy_back;
write_error (status);
}
if (multi_volume_option)
- if (save_name)
- {
- char *cursor = save_name;
+ {
+ if (save_name)
+ {
+ char *cursor = save_name;
#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
+ if (cursor[1] == ':')
+ cursor += 2;
#endif
- while (*cursor == '/')
- cursor++;
+ while (*cursor == '/')
+ cursor++;
- strcpy (real_s_name, cursor);
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
- }
- else
- {
- real_s_name[0] = '\0';
- real_s_totsize = 0;
- real_s_sizeleft = 0;
- }
+ strcpy (real_s_name, cursor);
+ real_s_sizeleft = save_sizeleft;
+ real_s_totsize = save_totsize;
+ }
+ else
+ {
+ real_s_name[0] = '\0';
+ real_s_totsize = 0;
+ real_s_sizeleft = 0;
+ }
+ }
error_loop:
status = rmtread (archive, record_start->buffer, record_size);
continue;
if (child != -1)
- if (WIFSIGNALED (wait_status)
+ {
+ if (WIFSIGNALED (wait_status)
#if 0
- && !WIFSTOPPED (wait_status)
+ && !WIFSTOPPED (wait_status)
#endif
- )
- {
- /* SIGPIPE is OK, everything else is a problem. */
+ )
+ {
+ /* SIGPIPE is OK, everything else is a problem. */
- if (WTERMSIG (wait_status) != SIGPIPE)
- ERROR ((0, 0, _("Child died with signal %d%s"),
- WTERMSIG (wait_status),
- WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
- }
- else
- {
- /* Child voluntarily terminated -- but why? /bin/sh returns
- SIGPIPE + 128 if its child, then do nothing. */
+ if (WTERMSIG (wait_status) != SIGPIPE)
+ ERROR ((0, 0, _("Child died with signal %d%s"),
+ WTERMSIG (wait_status),
+ WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
+ }
+ else
+ {
+ /* Child voluntarily terminated -- but why? /bin/sh returns
+ SIGPIPE + 128 if its child, then do nothing. */
- if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
- && WEXITSTATUS (wait_status))
- ERROR ((0, 0, _("Child returned status %d"),
- WEXITSTATUS (wait_status)));
- }
+ if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
+ && WEXITSTATUS (wait_status))
+ ERROR ((0, 0, _("Child returned status %d"),
+ WEXITSTATUS (wait_status)));
+ }
+ }
}
#endif /* !MSDOS */