X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=ea4ebb4e1b52409ae18bf3b69cb80e7c9605a06f;hb=6dccec3ba45c8c5052be0dacb7c4766662ed30fc;hp=bdb467cd0e82bb5386216355b1d7f5e7de713779;hpb=d46735235be2b3bcaf2e580d86f321130cd78e94;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index bdb467c..ea4ebb4 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,7 @@ time_t time (); # include #endif -#ifndef FNM_LEADING_DIR -# include -#endif +#include #include "common.h" #include "rmt.h" @@ -50,7 +55,7 @@ time_t time (); /* 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 @@ -133,7 +138,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); @@ -144,18 +149,11 @@ myfork (void) #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"); } @@ -307,13 +305,10 @@ is_regular_file (const char *name) { 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 @@ -620,13 +615,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; } @@ -808,8 +801,7 @@ open_archive (enum access_mode access) 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 @@ -822,8 +814,9 @@ open_archive (enum access_mode access) 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)); } @@ -874,7 +867,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 (time (0), record_start->header.mtime); finish_header (record_start); #if 0 current_block++; @@ -897,8 +890,7 @@ flush_write (void) 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; @@ -909,11 +901,9 @@ flush_write (void) 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) { @@ -929,11 +919,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++; @@ -955,7 +941,9 @@ flush_write (void) 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]) { @@ -974,7 +962,7 @@ flush_write (void) { memset ((void *) 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 (time (0), record_start->header.mtime); record_start->header.typeflag = GNUTYPE_VOLHDR; finish_header (record_start); } @@ -994,9 +982,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); @@ -1009,10 +997,9 @@ flush_write (void) 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; @@ -1027,12 +1014,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++; @@ -1056,7 +1039,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 (); @@ -1119,12 +1102,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++; @@ -1212,8 +1191,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_CHARS (cursor->header.size); + s2 = UINTMAX_FROM_CHARS (cursor->oldgnu_header.offset); if (real_s_totsize != s1 + s2 || s1 + s2 < s2) { char totsizebuf[UINTMAX_STRSIZE_BOUND]; @@ -1230,7 +1209,7 @@ error_loop: goto try_volume; } if (real_s_totsize - real_s_sizeleft - != OFF_FROM_OCT (cursor->oldgnu_header.offset)) + != OFF_FROM_CHARS (cursor->oldgnu_header.offset)) { WARN ((0, 0, _("This volume is out of sequence"))); volno--; @@ -1370,8 +1349,8 @@ 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. */ @@ -1433,40 +1412,32 @@ close_archive (void) if (child_pid) { - WAIT_T wait_status; - pid_t child; - - /* Loop waiting for the right child to die, or for no more kids. */ + int wait_status; - 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 */ @@ -1553,7 +1524,7 @@ new_volume (enum access_mode access) looped = 1; } -tryagain: + tryagain: if (looped) { /* We have to prompt from now on. */ @@ -1584,6 +1555,7 @@ tryagain: && subcommand_option != DIFF_SUBCOMMAND) WARN ((0, 0, _("WARNING: Archive is incomplete"))); + apply_delayed_set_stat (); exit (TAREXIT_FAILURE); } if (input_buffer[0] == '\n' @@ -1613,6 +1585,7 @@ tryagain: && subcommand_option != DIFF_SUBCOMMAND) WARN ((0, 0, _("WARNING: Archive is incomplete"))); + apply_delayed_set_stat (); exit (TAREXIT_FAILURE); case 'n': @@ -1638,35 +1611,39 @@ tryagain: #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 == NULL) + 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; }