X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=d60eaea55c1755368ba79ad29312621a19a4425b;hb=3495d84e27c42c0619daf43c2b546d35e3ecbba6;hp=a369b83f1f62614102da4d10c4bf46d2b2f4b60f;hpb=b8ae0938a445f5233a3a3d4f79300e2af33ca69f;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index a369b83..d60eaea 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -38,6 +38,7 @@ time_t time (); #endif #include +#include #include "common.h" #include "rmt.h" @@ -152,9 +153,29 @@ myfork (void) 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) + : "?")); } /*--------------------------------------------------------. @@ -866,7 +887,7 @@ open_archive (enum access_mode access) 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++; @@ -961,7 +982,7 @@ flush_write (void) { 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); } @@ -1059,7 +1080,7 @@ write_error (ssize_t status) 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"))); @@ -1118,7 +1139,7 @@ flush_read (void) } } -error_loop: + error_loop: status = rmtread (archive, record_start->buffer, record_size); if (status == record_size) return; @@ -1190,8 +1211,8 @@ error_loop: 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]; @@ -1208,7 +1229,7 @@ error_loop: 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--; @@ -1226,49 +1247,41 @@ error_loop: 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; } /*-----------------------------------------------. @@ -1547,7 +1560,7 @@ new_volume (enum access_mode access) 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 @@ -1577,7 +1590,7 @@ new_volume (enum access_mode access) 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