X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=d60eaea55c1755368ba79ad29312621a19a4425b;hb=bc9dc01ec379d8bb74dda3e805818f0c3227e616;hp=1a0d6c743fcde3629b0afd7b8617f4cc7826dca4;hpb=2ca2d1cb99ed888aac568bbfb754d0a14af61329;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index 1a0d6c7..d60eaea 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,5 +1,5 @@ /* Buffer management for tar. - Copyright (C) 1988, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc. + Copyright 1988, 92, 93, 94, 96, 97, 1999 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 @@ -16,11 +16,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Enable GNU extensions in fnmatch.h. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + #include "system.h" #include #include +#ifndef time time_t time (); +#endif #if MSDOS # include @@ -30,9 +37,8 @@ time_t time (); # include #endif -#ifndef FNM_LEADING_DIR -# include -#endif +#include +#include #include "common.h" #include "rmt.h" @@ -114,15 +120,15 @@ static int global_volno = 1; /* volume number to print in external 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; @@ -133,7 +139,7 @@ static off_t real_s_sizeleft; static pid_t myfork (void) { - pid_t result = fork(); + pid_t result = fork (); if (result == 0) kill (getpid (), SIGSTOP); @@ -147,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) + : "?")); } /*--------------------------------------------------------. @@ -180,7 +206,7 @@ reset_eof (void) /*-------------------------------------------------------------------------. | 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. | `-------------------------------------------------------------------------*/ @@ -190,12 +216,12 @@ find_next_block (void) 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; @@ -235,7 +261,7 @@ available_space_after (union block *pointer) } /*------------------------------------------------------------------. -| Close file having descriptor FD, and abort if close unsucessful. | +| Close file having descriptor FD, and abort if close unsuccessful. | `------------------------------------------------------------------*/ static void @@ -610,13 +636,11 @@ child_open_for_uncompress (void) count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE; status = full_write (STDOUT_FILENO, cursor, count); if (status < 0) - FATAL_ERROR ((0, errno, _("\ -Cannot write to compression program"))); + FATAL_ERROR ((0, errno, _("Cannot write to compression program"))); if (status != count) { - ERROR ((0, 0, _("\ -Write to compression program short %lu bytes"), + ERROR ((0, 0, _("Write to compression program short %lu bytes"), (unsigned long) (count - status))); count = status; } @@ -679,8 +703,8 @@ open_archive (enum access_mode access) 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 @@ -689,20 +713,19 @@ open_archive (enum access_mode access) 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)); @@ -843,7 +866,7 @@ open_archive (enum access_mode access) 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'"), @@ -854,7 +877,7 @@ open_archive (enum access_mode access) 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); @@ -864,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_OCT (time (0), record_start->header.mtime); + TIME_TO_CHARS (start_time, record_start->header.mtime); finish_header (record_start); #if 0 current_block++; @@ -916,11 +939,7 @@ flush_write (void) return; } - cursor = save_name; -#if MSDOS - if (cursor[1] == ':') - cursor += 2; -#endif + cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name); while (*cursor == '/') cursor++; @@ -961,9 +980,9 @@ flush_write (void) 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_OCT (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); } @@ -975,7 +994,7 @@ flush_write (void) 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 @@ -983,9 +1002,9 @@ flush_write (void) strcpy (record_start->header.name, real_s_name); record_start->header.typeflag = GNUTYPE_MULTIVOL; - OFF_TO_OCT (real_s_sizeleft, record_start->header.size); - OFF_TO_OCT (real_s_totsize - real_s_sizeleft, - record_start->oldgnu_header.offset); + OFF_TO_CHARS (real_s_sizeleft, record_start->header.size); + OFF_TO_CHARS (real_s_totsize - real_s_sizeleft, + record_start->oldgnu_header.offset); tmp = verbose_option; verbose_option = 0; finish_header (record_start); @@ -1004,9 +1023,9 @@ flush_write (void) 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) @@ -1015,12 +1034,8 @@ flush_write (void) real_s_name[0] = '\0'; else { - char *cursor = save_name; + char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name); -#if MSDOS - if (cursor[1] == ':') - cursor += 2; -#endif while (*cursor == '/') cursor++; @@ -1044,7 +1059,7 @@ write_error (ssize_t status) 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 (); @@ -1065,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"))); @@ -1107,12 +1122,8 @@ flush_read (void) { if (save_name) { - char *cursor = save_name; + char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name); -#if MSDOS - if (cursor[1] == ':') - cursor += 2; -#endif while (*cursor == '/') cursor++; @@ -1128,7 +1139,7 @@ flush_read (void) } } -error_loop: + error_loop: status = rmtread (archive, record_start->buffer, record_size); if (status == record_size) return; @@ -1200,8 +1211,8 @@ error_loop: global_volno--; goto try_volume; } - s1 = UINTMAX_FROM_OCT (cursor->header.size); - s2 = UINTMAX_FROM_OCT (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]; @@ -1218,7 +1229,7 @@ error_loop: goto try_volume; } if (real_s_totsize - real_s_sizeleft - != OFF_FROM_OCT (cursor->oldgnu_header.offset)) + != OFF_FROM_HEADER (cursor->oldgnu_header.offset)) { WARN ((0, 0, _("This volume is out of sequence"))); volno--; @@ -1236,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; } /*-----------------------------------------------. @@ -1358,14 +1361,14 @@ backspace_output (void) { /* Lseek failed. Try a different method. */ - WARN ((0, 0, _("\ -Could not backspace archive file; it may be unreadable without -i"))); + WARN ((0, 0, + _("Could not backspace archive file; it may be unreadable without -i"))); /* Replace the first part of the record with NULs. */ if (record_start->buffer != output_start) memset (record_start->buffer, 0, - (size_t) (output_start - record_start->buffer)); + output_start - record_start->buffer); } } } @@ -1421,40 +1424,32 @@ close_archive (void) if (child_pid) { - WAIT_T wait_status; - pid_t child; + int wait_status; - /* Loop waiting for the right child to die, or for no more kids. */ - - while ((child = wait (&wait_status), child != child_pid) - && child != -1) - continue; + while (waitpid (child_pid, &wait_status, 0) == -1) + if (errno != EINTR) + { + ERROR ((0, errno, _("While waiting for child"))); + break; + } - if (child != -1) + if (WIFSIGNALED (wait_status)) { - if (WIFSIGNALED (wait_status) -#if 0 - && !WIFSTOPPED (wait_status) -#endif - ) - { - /* 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 (WEXITSTATUS (wait_status) != (SIGPIPE + 128) - && WEXITSTATUS (wait_status)) - ERROR ((0, 0, _("Child returned status %d"), - WEXITSTATUS (wait_status))); - } + /* SIGPIPE is OK, everything else is a problem. */ + + if (WTERMSIG (wait_status) != SIGPIPE) + ERROR ((0, 0, _("Child died with signal %d"), + WTERMSIG (wait_status))); + } + else + { + /* Child voluntarily terminated -- but why? /bin/sh returns + SIGPIPE + 128 if its child, then do nothing. */ + + if (WEXITSTATUS (wait_status) + && WEXITSTATUS (wait_status) != (SIGPIPE + 128)) + ERROR ((0, 0, _("Child returned status %d"), + WEXITSTATUS (wait_status))); } } #endif /* !MSDOS */ @@ -1514,8 +1509,8 @@ closeout_volume_number (void) 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; @@ -1563,9 +1558,9 @@ new_volume (enum access_mode access) 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 @@ -1595,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 @@ -1628,35 +1623,39 @@ new_volume (enum access_mode access) #if MSDOS spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0); #else /* not MSDOS */ - switch (fork ()) - { - case -1: - WARN ((0, errno, _("Cannot fork!"))); - break; - - case 0: - { - const char *shell = getenv ("SHELL"); - - if (shell == NULL) - shell = "/bin/sh"; - execlp (shell, "-sh", "-i", 0); - FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"), - shell)); - } - - default: + { + pid_t child = fork (); + switch (child) { - WAIT_T wait_status; - - wait (&wait_status); + case -1: + WARN ((0, errno, _("Cannot fork!"))); + break; + + case 0: + { + const char *shell = getenv ("SHELL"); + + if (! shell) + shell = "/bin/sh"; + execlp (shell, "-sh", "-i", 0); + FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"), + shell)); + } + + default: + { + int wait_status; + while (waitpid (child, &wait_status, 0) == -1) + if (errno != EINTR) + { + ERROR ((0, errno, + _("While waiting for child"))); + break; + } + } + break; } - break; - } - - /* FIXME: I'm not sure if that's all that has to be done - here. (jk) */ - + } #endif /* not MSDOS */ break; }