X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fbuffer.c;h=f99dcca1b2829bb978073d12657829fb5277df8b;hb=40ece6bf4dbf3f20bfbd8d26f4ce1c63dac80fa5;hp=06b6901a58efc23f0b4dae90ed3729cd152e3f07;hpb=729b91adb1607a329be9b886b425874c04f38fbd;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index 06b6901..f99dcca 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,13 +1,13 @@ /* Buffer management for tar. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-25. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any later + Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, but @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -56,6 +55,8 @@ union block *current_block; /* current block of archive */ enum access_mode access_mode; /* how do we handle the archive */ off_t records_read; /* number of records read from this archive */ off_t records_written; /* likewise, for records written */ +extern off_t records_skipped; /* number of records skipped at the start + of the archive, defined in delete.c */ static off_t record_start_block; /* block ordinal at record_start */ @@ -74,7 +75,7 @@ static int read_error_count; static bool hit_eof; /* Checkpointing counter */ -static int checkpoint; +static unsigned checkpoint; static bool read_full_records = false; @@ -119,6 +120,15 @@ static off_t save_totsize; /* total size of file we are writing, only static off_t save_sizeleft; /* where we are in the file we are writing, only valid if save_name is nonzero */ + +static struct tar_stat_info dummy; + +void +buffer_write_global_xheader () +{ + xheader_write_global (&dummy.xhdr); +} + void mv_begin (struct tar_stat_info *st) { @@ -166,6 +176,15 @@ void set_start_time () { gettime (&start_time); + volume_start_time = start_time; + last_stat_time = start_time; +} + +void +set_volume_start_time () +{ + gettime (&volume_start_time); + last_stat_time = volume_start_time; } void @@ -173,9 +192,9 @@ compute_duration () { struct timespec now; gettime (&now); - duration += ((now.tv_sec - start_time.tv_sec) - + (now.tv_nsec - start_time.tv_nsec) / 1e9); - set_start_time (); + duration += ((now.tv_sec - last_stat_time.tv_sec) + + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9); + gettime (&last_stat_time); } @@ -215,14 +234,16 @@ check_compressed_archive () { struct zip_magic const *p; bool sfr; - + bool short_file = false; + /* Prepare global data needed for find_next_block: */ record_end = record_start; /* set up for 1st record = # 0 */ sfr = read_full_records; read_full_records = true; /* Suppress fatal error on reading a partial record */ - find_next_block (); - + if (find_next_block () == 0) + short_file = true; + /* Restore global values */ read_full_records = sfr; @@ -234,6 +255,9 @@ check_compressed_archive () if (memcmp (record_start->buffer, p->magic, p->length) == 0) return p->type; + if (short_file) + ERROR ((0, 0, _("This does not look like a tar archive"))); + return ct_none; } @@ -274,26 +298,65 @@ open_compressed_archive () } -void -print_total_written (void) +static void +print_stats (FILE *fp, const char *text, tarlong numbytes) { - tarlong written = prev_written + bytes_written; char bytes[sizeof (tarlong) * CHAR_BIT]; char abbr[LONGEST_HUMAN_READABLE + 1]; char rate[LONGEST_HUMAN_READABLE + 1]; int human_opts = human_autoscale | human_base_1024 | human_SI | human_B; - sprintf (bytes, TARLONG_FORMAT, written); + sprintf (bytes, TARLONG_FORMAT, numbytes); - /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */ - fprintf (stderr, _("Total bytes written: %s (%s, %s/s)\n"), bytes, - human_readable (written, abbr, human_opts, 1, 1), - (0 < duration && written / duration < (uintmax_t) -1 - ? human_readable (written / duration, rate, human_opts, 1, 1) + fprintf (fp, "%s: %s (%s, %s/s)\n", + text, bytes, + human_readable (numbytes, abbr, human_opts, 1, 1), + (0 < duration && numbytes / duration < (uintmax_t) -1 + ? human_readable (numbytes / duration, rate, human_opts, 1, 1) : "?")); } +void +print_total_stats () +{ + switch (subcommand_option) + { + case CREATE_SUBCOMMAND: + case CAT_SUBCOMMAND: + case UPDATE_SUBCOMMAND: + case APPEND_SUBCOMMAND: + /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */ + print_stats (stderr, _("Total bytes written"), + prev_written + bytes_written); + break; + + case DELETE_SUBCOMMAND: + { + char buf[UINTMAX_STRSIZE_BOUND]; + print_stats (stderr, _("Total bytes read"), + records_read * record_size); + print_stats (stderr, _("Total bytes written"), + prev_written + bytes_written); + fprintf (stderr, _("Total bytes deleted: %s\n"), + STRINGIFY_BIGINT ((records_read - records_skipped) + * record_size + - (prev_written + bytes_written), buf)); + } + break; + + case EXTRACT_SUBCOMMAND: + case LIST_SUBCOMMAND: + case DIFF_SUBCOMMAND: + print_stats (stderr, _("Total bytes read"), + records_read * record_size); + break; + + default: + abort (); + } +} + /* Compute and return the block ordinal at current_block. */ off_t current_block_ordinal (void) @@ -386,16 +449,6 @@ _open_archive (enum access_mode wanted_access) { int backed_up_flag = 0; - if (index_file_name) - { - stdlis = freopen (index_file_name, "w", stdout); - if (! stdlis) - open_error (index_file_name); - close_stdout_set_file_name (index_file_name); - } - else - stdlis = to_stdout_option ? stderr : stdout; - if (record_size == 0) FATAL_ERROR ((0, 0, _("Invalid value for record_size"))); @@ -435,7 +488,8 @@ _open_archive (enum access_mode wanted_access) break; } - if (wanted_access == ACCESS_WRITE + if (!index_file_name + && wanted_access == ACCESS_WRITE && strcmp (archive_name_array[0], "-") == 0) stdlis = stderr; } @@ -463,13 +517,16 @@ _open_archive (enum access_mode wanted_access) case ACCESS_WRITE: archive = STDOUT_FILENO; - stdlis = stderr; + if (!index_file_name) + stdlis = stderr; break; case ACCESS_UPDATE: archive = STDIN_FILENO; - stdlis = stderr; write_archive_to_stdout = true; + record_end = record_start; /* set up for 1st record = # 0 */ + if (!index_file_name) + stdlis = stderr; break; } } @@ -494,8 +551,13 @@ _open_archive (enum access_mode wanted_access) break; case ACCESS_UPDATE: - archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY, + archive = rmtopen (archive_name_array[0], + O_RDWR | O_CREAT | O_BINARY, MODE_RW, rsh_command_option); + + if (check_compressed_archive () != ct_none) + FATAL_ERROR ((0, 0, + _("Cannot update compressed archives"))); break; } @@ -516,33 +578,54 @@ _open_archive (enum access_mode wanted_access) switch (wanted_access) { - case ACCESS_UPDATE: - records_written = 0; - record_end = record_start; /* set up for 1st record = # 0 */ - case ACCESS_READ: find_next_block (); /* read it in, check for EOF */ break; + case ACCESS_UPDATE: case ACCESS_WRITE: records_written = 0; break; } } +static void +do_checkpoint (bool do_write) +{ + if (checkpoint_option && !(++checkpoint % checkpoint_option)) + { + switch (checkpoint_style) + { + case checkpoint_dot: + fputc ('.', stdlis); + fflush (stdlis); + break; + + case checkpoint_text: + if (do_write) + /* TRANSLATORS: This is a ``checkpoint of write operation'', + *not* ``Writing a checkpoint''. + E.g. in Spanish ``Punto de comprobaci@'on de escritura'', + *not* ``Escribiendo un punto de comprobaci@'on'' */ + WARN ((0, 0, _("Write checkpoint %u"), checkpoint)); + else + /* TRANSLATORS: This is a ``checkpoint of read operation'', + *not* ``Reading a checkpoint''. + E.g. in Spanish ``Punto de comprobaci@'on de lectura'', + *not* ``Leyendo un punto de comprobaci@'on'' */ + WARN ((0, 0, _("Read checkpoint %u"), checkpoint)); + break; + } + } +} + /* Perform a write to flush the buffer. */ ssize_t _flush_write (void) { ssize_t status; - if (checkpoint_option && !(++checkpoint % 10)) - /* TRANSLATORS: This is a ``checkpoint of write operation'', - *not* ``Writing a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de escritura'', - *not* ``Escribiendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Write checkpoint %d"), checkpoint)); - + do_checkpoint (true); if (tape_length_option && tape_length_option <= bytes_written) { errno = ENOSPC; @@ -567,7 +650,7 @@ archive_write_error (ssize_t status) if (totals_option) { int e = errno; - print_total_written (); + print_total_stats (); errno = e; } @@ -646,39 +729,6 @@ short_read (size_t status) records_read++; } -/* Perform a read to flush the buffer. */ -size_t -_flush_read (void) -{ - size_t status; /* result from system call */ - - if (checkpoint_option && !(++checkpoint % 10)) - /* TRANSLATORS: This is a ``checkpoint of read operation'', - *not* ``Reading a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de lectura'', - *not* ``Leyendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Read checkpoint %d"), checkpoint)); - - /* Clear the count of errors. This only applies to a single call to - flush_read. */ - - read_error_count = 0; /* clear error count */ - - if (write_archive_to_stdout && record_start_block != 0) - { - archive = STDOUT_FILENO; - status = sys_write_archive_buffer (); - archive = STDIN_FILENO; - if (status != record_size) - archive_write_error (status); - } - - status = rmtread (archive, record_start->buffer, record_size); - if (status == record_size) - records_read++; - return status; -} - /* Flush the current buffer to/from the archive. */ void flush_archive (void) @@ -874,8 +924,9 @@ change_tape_menu (FILE *read_file) { char *input_buffer = NULL; size_t size = 0; - - while (1) + bool stop = false; + + while (!stop) { fputc ('\007', stderr); fprintf (stderr, @@ -905,7 +956,7 @@ change_tape_menu (FILE *read_file) case '?': { fprintf (stderr, _("\ - n [name] Give a new file name for the next (and subsequent) volume(s)\n\ + n name Give a new file name for the next (and subsequent) volume(s)\n\ q Abort tar\n\ y or newline Continue operation\n")); if (!restrict_option) @@ -942,8 +993,15 @@ change_tape_menu (FILE *read_file) ; *cursor = '\0'; - /* FIXME: the following allocation is never reclaimed. */ - *archive_name_cursor = xstrdup (name); + if (name[0]) + { + /* FIXME: the following allocation is never reclaimed. */ + *archive_name_cursor = xstrdup (name); + stop = true; + } + else + fprintf (stderr, "%s", + _("File name not specified. Try again.\n")); } break; @@ -984,7 +1042,8 @@ new_volume (enum access_mode mode) assign_string (&volume_label, NULL); assign_string (&continued_file_name, NULL); continued_file_size = continued_file_offset = 0; - + current_block = record_start; + if (rmtclose (archive) != 0) close_warn (*archive_name_cursor); @@ -1057,10 +1116,12 @@ new_volume (enum access_mode mode) } static bool -read_header0 () +read_header0 (struct tar_stat_info *info) { - enum read_header rc = read_header (false); + enum read_header rc; + tar_stat_init (info); + rc = read_header_primitive (false, info); if (rc == HEADER_SUCCESS) { set_next_block_after (current_header); @@ -1075,22 +1136,24 @@ try_new_volume () { size_t status; union block *header; - + enum access_mode acc; + switch (subcommand_option) { case APPEND_SUBCOMMAND: case CAT_SUBCOMMAND: case UPDATE_SUBCOMMAND: - if (!new_volume (ACCESS_UPDATE)) - return true; + acc = ACCESS_UPDATE; break; default: - if (!new_volume (ACCESS_READ)) - return true; + acc = ACCESS_READ; break; } + if (!new_volume (acc)) + return true; + while ((status = rmtread (archive, record_start->buffer, record_size)) == SAFE_READ_ERROR) archive_read_error (); @@ -1101,14 +1164,13 @@ try_new_volume () header = find_next_block (); if (!header) return false; + switch (header->header.typeflag) { case XGLTYPE: { - struct tar_stat_info dummy; - if (!read_header0 ()) + if (!read_header0 (&dummy)) return false; - tar_stat_init (&dummy); xheader_decode (&dummy); /* decodes values from the global header */ tar_stat_destroy (&dummy); if (!real_s_name) @@ -1122,8 +1184,9 @@ try_new_volume () } case GNUTYPE_VOLHDR: - if (!read_header0 ()) + if (!read_header0 (&dummy)) return false; + tar_stat_destroy (&dummy); assign_string (&volume_label, current_header->header.name); set_next_block_after (header); header = find_next_block (); @@ -1132,8 +1195,9 @@ try_new_volume () /* FALL THROUGH */ case GNUTYPE_MULTIVOL: - if (!read_header0 ()) + if (!read_header0 (&dummy)) return false; + tar_stat_destroy (&dummy); assign_string (&continued_file_name, current_header->header.name); continued_file_size = UINTMAX_FROM_HEADER (current_header->header.size); @@ -1243,7 +1307,7 @@ static void _write_volume_label (const char *str) { if (archive_format == POSIX_FORMAT) - xheader_store ("GNU.volume.label", NULL, str); + xheader_store ("GNU.volume.label", &dummy, str); else { union block *label = find_next_block (); @@ -1360,9 +1424,9 @@ add_multi_volume_header (void) if (archive_format == POSIX_FORMAT) { off_t d = real_s_totsize - real_s_sizeleft; - xheader_store ("GNU.volume.filename", NULL, real_s_name); - xheader_store ("GNU.volume.size", NULL, &real_s_sizeleft); - xheader_store ("GNU.volume.offset", NULL, &d); + xheader_store ("GNU.volume.filename", &dummy, real_s_name); + xheader_store ("GNU.volume.size", &dummy, &real_s_sizeleft); + xheader_store ("GNU.volume.offset", &dummy, &d); } else gnu_add_multi_volume_header (); @@ -1400,13 +1464,8 @@ simple_flush_read (void) { size_t status; /* result from system call */ - if (checkpoint_option && !(++checkpoint % 10)) - /* TRANSLATORS: This is a ``checkpoint of read operation'', - *not* ``Reading a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de lectura'', - *not* ``Leyendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Read checkpoint %d"), checkpoint)); - + do_checkpoint (false); + /* Clear the count of errors. This only applies to a single call to flush_read. */ @@ -1464,13 +1523,8 @@ _gnu_flush_read (void) { size_t status; /* result from system call */ - if (checkpoint_option && !(++checkpoint % 10)) - /* TRANSLATORS: This is a ``checkpoint of read operation'', - *not* ``Reading a checkpoint''. - E.g. in Spanish ``Punto de comprobaci@'on de lectura'', - *not* ``Leyendo un punto de comprobaci@'on'' */ - WARN ((0, 0, _("Read checkpoint %d"), checkpoint)); - + do_checkpoint (false); + /* Clear the count of errors. This only applies to a single call to flush_read. */ @@ -1559,11 +1613,10 @@ _gnu_flush_write (size_t buffer_level) if (!new_volume (ACCESS_WRITE)) return; - xheader_destroy (&extended_header); + tar_stat_destroy (&dummy); increase_volume_number (); - if (totals_option) - prev_written += bytes_written; + prev_written += bytes_written; bytes_written = 0; copy_ptr = record_start->buffer + status; @@ -1578,7 +1631,9 @@ _gnu_flush_write (size_t buffer_level) if (real_s_name) add_multi_volume_header (); - write_extended (true, NULL, find_next_block ()); + write_extended (true, &dummy, find_next_block ()); + tar_stat_destroy (&dummy); + if (real_s_name) add_chunk_header (); header = find_next_block (); @@ -1641,4 +1696,5 @@ open_archive (enum access_mode wanted_access) default: break; } + set_volume_start_time (); }