#endif
#include <fnmatch.h>
+#include <human.h>
#include "common.h"
#include "rmt.h"
char *save_name; /* name of the file we are currently writing */
off_t save_totsize; /* total size of file we are writing, only
- valid if save_name is non NULL */
+ valid if save_name is nonzero */
off_t save_sizeleft; /* where we are in the file we are writing,
only valid if save_name is nonzero */
-int write_archive_to_stdout = 0;
+int write_archive_to_stdout;
/* Used by flush_read and flush_write to store the real info about saved
names. */
-static char *real_s_name = NULL;
+static char *real_s_name;
static off_t real_s_totsize;
static off_t real_s_sizeleft;
\f
void
print_total_written (void)
{
- fprintf (stderr, _("Total bytes written: "));
- fprintf (stderr, TARLONG_FORMAT, prev_written + bytes_written);
- fprintf (stderr, "\n");
+ tarlong written = prev_written + bytes_written;
+ char bytes[sizeof (tarlong) * CHAR_BIT];
+ char abbr[LONGEST_HUMAN_READABLE + 1];
+ char rate[LONGEST_HUMAN_READABLE + 1];
+ double seconds;
+
+#if HAVE_CLOCK_GETTIME
+ struct timespec now;
+ if (clock_gettime (CLOCK_REALTIME, &now) == 0)
+ seconds = ((now.tv_sec - start_timespec.tv_sec)
+ + (now.tv_nsec - start_timespec.tv_nsec) / 1e9);
+ else
+#endif
+ seconds = time (0) - start_time;
+
+ sprintf (bytes, TARLONG_FORMAT, written);
+
+ /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
+ fprintf (stderr, _("Total bytes written: %s (%sB, %sB/s)\n"), bytes,
+ human_readable ((uintmax_t) written, abbr, 1, -1024),
+ (0 < seconds && written / seconds < (uintmax_t) -1
+ ? human_readable ((uintmax_t) (written / seconds), rate, 1, -1024)
+ : "?"));
}
/*--------------------------------------------------------.
/*-------------------------------------------------------------------------.
| Return the location of the next available input or output block. |
-| Return NULL for EOF. Once we have returned NULL, we just keep returning |
+| Return zero for EOF. Once we have returned zero, we just keep returning |
| it, to avoid accidentally going on to the next file on the tape. |
`-------------------------------------------------------------------------*/
if (current_block == record_end)
{
if (hit_eof)
- return NULL;
+ return 0;
flush_archive ();
if (current_block == record_end)
{
hit_eof = 1;
- return NULL;
+ return 0;
}
}
return current_block;
}
/*------------------------------------------------------------------.
-| Close file having descriptor FD, and abort if close unsucessful. |
+| Close file having descriptor FD, and abort if close unsuccessful. |
`------------------------------------------------------------------*/
static void
if (archive_names == 0)
FATAL_ERROR ((0, 0, _("No archive name given")));
- current_file_name = NULL;
- current_link_name = NULL;
+ current_file_name = 0;
+ current_link_name = 0;
/* FIXME: According to POSIX.1, PATH_MAX may well not be a compile-time
constant, and the value from sysconf (_SC_PATH_MAX) may well not be any
allocation. (Roland McGrath) */
if (!real_s_name)
- real_s_name = (char *) xmalloc (PATH_MAX);
+ real_s_name = xmalloc (PATH_MAX);
/* FIXME: real_s_name is never freed. */
- save_name = NULL;
+ save_name = 0;
if (multi_volume_option)
{
- record_start
- = (union block *) valloc (record_size + (2 * BLOCKSIZE));
+ record_start = valloc (record_size + (2 * BLOCKSIZE));
if (record_start)
record_start += 2;
}
else
- record_start = (union block *) valloc (record_size);
+ record_start = valloc (record_size);
if (!record_start)
FATAL_ERROR ((0, 0, _("Could not allocate memory for blocking factor %d"),
blocking_factor));
union block *label = find_next_block ();
if (!label)
- FATAL_ERROR ((0, 0, _("Archive not labelled to match `%s'"),
+ FATAL_ERROR ((0, 0, _("Archive not labeled to match `%s'"),
volume_label_option));
if (!check_label_pattern (label))
FATAL_ERROR ((0, 0, _("Volume `%s' does not match `%s'"),
case ACCESS_WRITE:
if (volume_label_option)
{
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (record_start, 0, BLOCKSIZE);
if (multi_volume_option)
sprintf (record_start->header.name, "%s Volume 1",
volume_label_option);
assign_string (¤t_file_name, record_start->header.name);
record_start->header.typeflag = GNUTYPE_VOLHDR;
- TIME_TO_CHARS (time (0), record_start->header.mtime);
+ TIME_TO_CHARS (start_time, record_start->header.mtime);
finish_header (record_start);
#if 0
current_block++;
if (volume_label_option)
{
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (record_start, 0, BLOCKSIZE);
sprintf (record_start->header.name, "%s Volume %d", volume_label_option, volno);
- TIME_TO_CHARS (time (0), record_start->header.mtime);
+ TIME_TO_CHARS (start_time, record_start->header.mtime);
record_start->header.typeflag = GNUTYPE_VOLHDR;
finish_header (record_start);
}
if (volume_label_option)
record_start++;
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (record_start, 0, BLOCKSIZE);
/* FIXME: Michael P Urban writes: [a long name file] is being written
when a new volume rolls around [...] Looks like the wrong value is
if (copy_back)
{
record_start += copy_back;
- memcpy ((void *) current_block,
- (void *) (record_start + blocking_factor - copy_back),
- (size_t) (copy_back * BLOCKSIZE));
+ memcpy (current_block,
+ record_start + blocking_factor - copy_back,
+ copy_back * BLOCKSIZE);
current_block += copy_back;
if (real_s_sizeleft >= copy_back * BLOCKSIZE)
int saved_errno = errno;
/* It might be useful to know how much was written before the error
- occured. Beware that mere printing maybe change errno value. */
+ occurred. */
if (totals_option)
print_total_written ();
static void
read_error (void)
{
- WARN ((0, errno, _("Read error on %s"), *archive_name_cursor));
+ ERROR ((0, errno, _("Read error on %s"), *archive_name_cursor));
if (record_start_block == 0)
FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
}
}
-error_loop:
+ error_loop:
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
return;
global_volno--;
goto try_volume;
}
- s1 = UINTMAX_FROM_CHARS (cursor->header.size);
- s2 = UINTMAX_FROM_CHARS (cursor->oldgnu_header.offset);
+ s1 = UINTMAX_FROM_HEADER (cursor->header.size);
+ s2 = UINTMAX_FROM_HEADER (cursor->oldgnu_header.offset);
if (real_s_totsize != s1 + s2 || s1 + s2 < s2)
{
char totsizebuf[UINTMAX_STRSIZE_BOUND];
goto try_volume;
}
if (real_s_totsize - real_s_sizeleft
- != OFF_FROM_CHARS (cursor->oldgnu_header.offset))
+ != OFF_FROM_HEADER (cursor->oldgnu_header.offset))
{
WARN ((0, 0, _("This volume is out of sequence")));
volno--;
goto error_loop; /* try again */
}
-short_read:
+ short_read:
more = record_start->buffer + status;
left = record_size - status;
-again:
- if (left % BLOCKSIZE == 0)
+ while (left % BLOCKSIZE != 0)
{
- /* FIXME: for size=0, multi-volume support. On the first record, warn
- about the problem. */
-
- if (!read_full_records_option && verbose_option
- && record_start_block == 0 && status > 0)
- WARN ((0, 0, _("Record size = %lu blocks"),
- (unsigned long) (status / BLOCKSIZE)));
+ while ((status = rmtread (archive, more, left)) < 0)
+ read_error ();
- record_end = record_start + (record_size - left) / BLOCKSIZE;
+ if (status == 0)
+ {
+ ERROR ((0, 0, _("%d garbage bytes ignored at end of archive"),
+ (int) ((record_size - left) % BLOCKSIZE)));
+ break;
+ }
- return;
- }
- if (read_full_records_option)
- {
+ if (! read_full_records_option)
+ FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
+ (unsigned long) (record_size - left)));
+
/* User warned us about this. Fix up. */
- if (left > 0)
- {
- error2loop:
- status = rmtread (archive, more, left);
- if (status < 0)
- {
- read_error ();
- goto error2loop; /* try again */
- }
- if (status == 0)
- FATAL_ERROR ((0, 0, _("Archive %s EOF not on block boundary"),
- *archive_name_cursor));
- left -= status;
- more += status;
- goto again;
- }
+ left -= status;
+ more += status;
}
- else
- FATAL_ERROR ((0, 0, _("Only read %lu bytes from archive %s"),
- (unsigned long) status, *archive_name_cursor));
+
+ /* FIXME: for size=0, multi-volume support. On the first record, warn
+ about the problem. */
+
+ 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)));
+
+ record_end = record_start + (record_size - left) / BLOCKSIZE;
}
/*-----------------------------------------------.
if (record_start->buffer != output_start)
memset (record_start->buffer, 0,
- (size_t) (output_start - record_start->buffer));
+ output_start - record_start->buffer);
}
}
}
static int
new_volume (enum access_mode access)
{
- static FILE *read_file = NULL;
- static int looped = 0;
+ static FILE *read_file;
+ static int looped;
int status;
global_volno, *archive_name_cursor);
fflush (stderr);
- if (fgets (input_buffer, sizeof (input_buffer), read_file) == 0)
+ if (fgets (input_buffer, sizeof input_buffer, read_file) == 0)
{
- fprintf (stderr, _("EOF where user reply was expected"));
+ WARN ((0, 0, _("EOF where user reply was expected")));
if (subcommand_option != EXTRACT_SUBCOMMAND
&& subcommand_option != LIST_SUBCOMMAND
case 'q':
/* Quit. */
- fprintf (stdlis, _("No new volume; exiting.\n"));
+ WARN ((0, 0, _("No new volume; exiting.\n")));
if (subcommand_option != EXTRACT_SUBCOMMAND
&& subcommand_option != LIST_SUBCOMMAND
{
const char *shell = getenv ("SHELL");
- if (shell == NULL)
+ if (! shell)
shell = "/bin/sh";
execlp (shell, "-sh", "-i", 0);
FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"),