X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcreate.c;h=6f38836e18b4674588ffd776b2abf6790f37ad88;hb=ba2ef4d0752d3440fa449599cdd6def5c96bfbaf;hp=241310699ab0c37b091e8ca6907f28bdf0667d3d;hpb=f87e585c511d94bbf6413665e1d662902802cad7;p=chaz%2Ftar diff --git a/src/create.c b/src/create.c index 2413106..6f38836 100644 --- a/src/create.c +++ b/src/create.c @@ -1,5 +1,5 @@ /* Create a tar archive. - Copyright 1985, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc. + Copyright 1985, 92, 93, 94, 96, 97, 99, 2000 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 @@ -33,6 +33,8 @@ struct utimbuf }; #endif +#include + #include "common.h" #ifndef MSDOS @@ -422,7 +424,7 @@ start_header (const char *name, struct stat *st) if (!warned_once) { warned_once = 1; - WARN ((0, 0, _("Removing `%.*s' prefix from archive names"), + WARN ((0, 0, _("Removing `%.*s' prefix from member names"), (int) prefix_len, name)); } name += prefix_len; @@ -434,10 +436,19 @@ start_header (const char *name, struct stat *st) if (!warned_once) { warned_once = 1; - WARN ((0, 0, _("Removing leading `/' from archive names"))); + WARN ((0, 0, _("Removing leading `/' from member names"))); } name++; } + + { + static int warned_once; + if (! warned_once && contains_dot_dot (name)) + { + warned_once = 1; + WARN ((0, 0, _("Member names contain `..'"))); + } + } } if (sizeof header->header.name <= strlen (name)) @@ -567,8 +578,6 @@ finish_header (union block *header) uintmax_to_chars ((uintmax_t) sum, header->header.chksum, 7); - set_next_block_after (header); - if (verbose_option && header->header.typeflag != GNUTYPE_LONGLINK && header->header.typeflag != GNUTYPE_LONGNAME) @@ -580,6 +589,8 @@ finish_header (union block *header) current_format = archive_format; print_header (); } + + set_next_block_after (header); } /* Sparse file processing. */ @@ -626,16 +637,14 @@ init_sparsearray (void) | ? | `---*/ -static void -find_new_file_size (off_t *filesize, int highest_index) +static off_t +find_new_file_size (int sparses) { - int counter; - - *filesize = 0; - for (counter = 0; - sparsearray[counter].numbytes && counter <= highest_index; - counter++) - *filesize += sparsearray[counter].numbytes; + int i; + off_t s = 0; + for (i = 0; i < sparses; i++) + s += sparsearray[i].numbytes; + return s; } /*-----------------------------------------------------------------------. @@ -657,7 +666,7 @@ deal_with_sparse (char *name, union block *header) size_t numbytes = 0; off_t offset = 0; int file; - int sparse_index = 0; + int sparses = 0; ssize_t count; char buffer[BLOCKSIZE]; @@ -671,12 +680,12 @@ deal_with_sparse (char *name, union block *header) init_sparsearray (); clear_buffer (buffer); - while (count = safe_read (file, buffer, sizeof buffer), count != 0) + while (0 < (count = safe_read (file, buffer, sizeof buffer))) { /* Realloc the scratch area as necessary. FIXME: should reallocate only at beginning of a new instance of non-zero data. */ - if (sparse_index > sp_array_size - 1) + if (sp_array_size <= sparses) { sparsearray = xrealloc (sparsearray, @@ -692,14 +701,14 @@ deal_with_sparse (char *name, union block *header) { if (numbytes) { - sparsearray[sparse_index++].numbytes = numbytes; + sparsearray[sparses++].numbytes = numbytes; numbytes = 0; } } else { if (!numbytes) - sparsearray[sparse_index].offset = offset; + sparsearray[sparses].offset = offset; numbytes += count; } @@ -710,7 +719,7 @@ deal_with_sparse (char *name, union block *header) if (!zero_block_p (buffer)) { if (!numbytes) - sparsearray[sparse_index].offset = offset; + sparsearray[sparses].offset = offset; numbytes += count; } else @@ -731,15 +740,15 @@ deal_with_sparse (char *name, union block *header) } if (numbytes) - sparsearray[sparse_index++].numbytes = numbytes; + sparsearray[sparses++].numbytes = numbytes; else { - sparsearray[sparse_index].offset = offset - 1; - sparsearray[sparse_index++].numbytes = 1; + sparsearray[sparses].offset = offset - 1; + sparsearray[sparses++].numbytes = 1; } close (file); - return sparse_index - 1; + return count < 0 ? 0 : sparses; } /*---. @@ -751,33 +760,21 @@ finish_sparse_file (int file, off_t *sizeleft, off_t fullsize, char *name) { union block *start; size_t bufsize; - int sparse_index = 0; + int sparses = 0; ssize_t count; while (*sizeleft > 0) { start = find_next_block (); memset (start->buffer, 0, BLOCKSIZE); - bufsize = sparsearray[sparse_index].numbytes; - if (!bufsize) - { - /* We blew it, maybe. */ - char buf1[UINTMAX_STRSIZE_BOUND]; - char buf2[UINTMAX_STRSIZE_BOUND]; - - ERROR ((0, 0, _("Wrote %s of %s bytes to file %s"), - STRINGIFY_BIGINT (fullsize - *sizeleft, buf1), - STRINGIFY_BIGINT (fullsize, buf2), - name)); - break; - } + bufsize = sparsearray[sparses].numbytes; + if (! bufsize) + abort (); - if (lseek (file, sparsearray[sparse_index++].offset, SEEK_SET) < 0) + if (lseek (file, sparsearray[sparses++].offset, SEEK_SET) < 0) { - char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, errno, _("lseek error at byte %s in file %s"), - STRINGIFY_BIGINT (sparsearray[sparse_index - 1].offset, buf), - name)); + (ignore_failed_read_option ? seek_warn_details : seek_error_details) + (name, sparsearray[sparses - 1].offset); break; } @@ -786,28 +783,13 @@ finish_sparse_file (int file, off_t *sizeleft, off_t fullsize, char *name) while (bufsize > BLOCKSIZE) { -#if 0 - if (amount_read) - { - count = safe_read (file, start->buffer + amount_read, - BLOCKSIZE - amount_read); - bufsize -= BLOCKSIZE - amount_read; - amount_read = 0; - set_next_block_after (start); - start = find_next_block (); - memset (start->buffer, 0, BLOCKSIZE); - } -#endif - /* Store the data. */ - count = safe_read (file, start->buffer, BLOCKSIZE); if (count < 0) { - char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, errno, - _("Read error at byte %s, reading %lu bytes, in file %s"), - STRINGIFY_BIGINT (fullsize - *sizeleft, buf), - (unsigned long) bufsize, name)); + (ignore_failed_read_option + ? read_warn_details + : read_error_details) + (name, fullsize - *sizeleft, bufsize); return 1; } bufsize -= count; @@ -827,34 +809,15 @@ finish_sparse_file (int file, off_t *sizeleft, off_t fullsize, char *name) if (count < 0) { - char buf[UINTMAX_STRSIZE_BOUND]; - - ERROR ((0, errno, - _("Read error at byte %s, reading %lu bytes, in file %s"), - STRINGIFY_BIGINT (fullsize - *sizeleft, buf), - (unsigned long) bufsize, name)); + (ignore_failed_read_option + ? read_warn_details + : read_error_details) + (name, fullsize - *sizeleft, bufsize); return 1; } -#if 0 - if (amount_read >= BLOCKSIZE) - { - amount_read = 0; - set_next_block_after (start + (count - 1) / BLOCKSIZE); - if (count != bufsize) - { - ERROR ((0, 0, - _("File %s shrunk, padding with zeros"), - name)); - return 1; - } - start = find_next_block (); - } - else - amount_read += bufsize; -#endif + *sizeleft -= count; set_next_block_after (start); - } free (sparsearray); #if 0 @@ -924,7 +887,7 @@ create_archive (void) /* Dump a single file, recursing on directories. P is the file name to dump. TOP_LEVEL tells whether this is a top-level call; zero means no, positive means yes, and negative means an incremental - dump where it's irrelevant. PARENT_DEVICE is the device of P's + dump. PARENT_DEVICE is the device of P's parent directory; it is examined only if TOP_LEVEL is zero. Set global CURRENT_STAT to stat output for this file. */ @@ -939,10 +902,10 @@ dump_file (char *p, int top_level, dev_t parent_device) char type; union block *exhdr; char save_typeflag; + time_t original_ctime; struct utimbuf restore_times; - off_t restore_size; - /* FIXME: `header' and `upperbound' might be used uninitialized in this + /* FIXME: `header' and `sparses' might be used uninitialized in this function. Reported by Bruno Haible. */ if (interactive_option && !confirm ("add", p)) @@ -950,15 +913,16 @@ dump_file (char *p, int top_level, dev_t parent_device) if (deref_stat (dereference_option, p, ¤t_stat) != 0) { - WARN ((0, errno, _("Cannot add file %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; + if (ignore_failed_read_option) + stat_warn (p); + else + stat_error (p); return; } + original_ctime = current_stat.st_ctime; restore_times.actime = current_stat.st_atime; restore_times.modtime = current_stat.st_mtime; - restore_size = current_stat.st_size; #ifdef S_ISHIDDEN if (S_ISHIDDEN (current_stat.st_mode)) @@ -982,7 +946,8 @@ dump_file (char *p, int top_level, dev_t parent_device) && (!after_date_option || current_stat.st_ctime < newer_ctime_option)) { if (0 < top_level) - WARN ((0, 0, _("%s: is unchanged; not dumped"), p)); + WARN ((0, 0, _("%s: file is unchanged; not dumped"), + quotearg_colon (p))); /* FIXME: recheck this return. */ return; } @@ -992,7 +957,8 @@ dump_file (char *p, int top_level, dev_t parent_device) if (ar_dev && current_stat.st_dev == ar_dev && current_stat.st_ino == ar_ino) { - WARN ((0, 0, _("%s is the archive; not dumped"), p)); + WARN ((0, 0, _("%s: file is the archive; not dumped"), + quotearg_colon (p))); return; } #endif @@ -1006,18 +972,15 @@ dump_file (char *p, int top_level, dev_t parent_device) size_t len; dev_t our_device = current_stat.st_dev; - /* If this tar program is installed suid root, like for Amanda, the - access might look like denied, while it is not really. - - FIXME: I have the feeling this test is done too early. Couldn't it - just be bundled in later actions? I guess that the proper support - of --ignore-failed-read is the key of the current writing. */ + errno = 0; - if (access (p, R_OK) == -1 && geteuid () != 0) + directory = opendir (p); + if (! directory) { - WARN ((0, errno, _("Cannot add directory %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; + if (ignore_failed_read_option) + opendir_warn (p); + else + opendir_error (p); return; } @@ -1116,16 +1079,14 @@ dump_file (char *p, int top_level, dev_t parent_device) } if (multi_volume_option) assign_string (&save_name, 0); - if (atime_preserve_option) - utime (p, &restore_times); - return; + goto finish_dir; } /* See if we are about to recurse into a directory, and avoid doing so if the user wants that we do not descend into directories. */ if (no_recurse_option) - return; + goto finish_dir; /* See if we are crossing from one file system to another, and avoid doing so if the user only wants to dump one file system. */ @@ -1134,24 +1095,17 @@ dump_file (char *p, int top_level, dev_t parent_device) && parent_device != current_stat.st_dev) { if (verbose_option) - WARN ((0, 0, _("%s: On a different filesystem; not dumped"), p)); - return; + WARN ((0, 0, + _("%s: file is on a different filesystem; not dumped"), + quotearg_colon (p))); + goto finish_dir; } /* Now output all the files in the directory. */ - errno = 0; /* FIXME: errno should be read-only */ - - directory = opendir (p); - if (!directory) - { - ERROR ((0, errno, _("Cannot open directory %s"), p)); - return; - } - /* FIXME: Should speed this up by cd-ing into the dir. */ - while (entry = readdir (directory), entry) + while (errno = 0, (entry = readdir (directory))) { /* Skip `.', `..', and excluded file names. */ @@ -1168,7 +1122,23 @@ dump_file (char *p, int top_level, dev_t parent_device) dump_file (namebuf, 0, our_device); } - closedir (directory); + if (errno) + { + if (ignore_failed_read_option) + readdir_warn (p); + else + readdir_error (p); + } + + finish_dir: + if (closedir (directory) != 0) + { + if (ignore_failed_read_option) + closedir_warn (p); + else + closedir_error (p); + } + free (namebuf); if (atime_preserve_option) utime (p, &restore_times); @@ -1229,7 +1199,7 @@ dump_file (char *p, int top_level, dev_t parent_device) if (remove_files_option) if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); + unlink_error (p); /* We dumped it. */ return; @@ -1257,7 +1227,7 @@ dump_file (char *p, int top_level, dev_t parent_device) union block *start; int header_moved; char isextended = 0; - int upperbound; + int sparses; header_moved = 0; @@ -1298,7 +1268,6 @@ dump_file (char *p, int top_level, dev_t parent_device) < (current_stat.st_size / ST_NBLOCKSIZE + (current_stat.st_size % ST_NBLOCKSIZE != 0))) { - off_t filesize = current_stat.st_size; int counter; header = start_header (p, ¤t_stat); @@ -1306,15 +1275,15 @@ dump_file (char *p, int top_level, dev_t parent_device) header_moved = 1; /* Call the routine that figures out the layout of the - sparse file in question. UPPERBOUND is the index of the - last element of the "sparsearray," i.e., the number of - elements it needed to describe the file. */ + sparse file in question. SPARSES is the index of the + first unused element of the "sparsearray," i.e., + the number of elements it needed to describe the file. */ - upperbound = deal_with_sparse (p, header); + sparses = deal_with_sparse (p, header); /* See if we'll need an extended header later. */ - if (upperbound > SPARSES_IN_OLDGNU_HEADER - 1) + if (SPARSES_IN_OLDGNU_HEADER < sparses) header->oldgnu_header.isextended = 1; /* We store the "real" file size so we can show that in @@ -1329,25 +1298,22 @@ dump_file (char *p, int top_level, dev_t parent_device) of the file minus the blocks of holes that we're skipping over. */ - find_new_file_size (&filesize, upperbound); - current_stat.st_size = filesize; - OFF_TO_CHARS (filesize, header->header.size); + current_stat.st_size = find_new_file_size (sparses); + OFF_TO_CHARS (current_stat.st_size, header->header.size); - for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++) + for (counter = 0; + counter < sparses && counter < SPARSES_IN_OLDGNU_HEADER; + counter++) { - if (!sparsearray[counter].numbytes) - break; - OFF_TO_CHARS (sparsearray[counter].offset, header->oldgnu_header.sp[counter].offset); SIZE_TO_CHARS (sparsearray[counter].numbytes, header->oldgnu_header.sp[counter].numbytes); } - } } else - upperbound = SPARSES_IN_OLDGNU_HEADER - 1; + sparses = SPARSES_IN_OLDGNU_HEADER; sizeleft = current_stat.st_size; @@ -1363,9 +1329,11 @@ dump_file (char *p, int top_level, dev_t parent_device) f = open (p, O_RDONLY | O_BINARY); if (f < 0) { - WARN ((0, errno, _("Cannot add file %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; + if (! top_level && errno == ENOENT) + WARN ((0, 0, _("%s: File removed before we read it"), + quotearg_colon (p))); + else + (ignore_failed_read_option ? open_warn : open_error) (p); return; } } @@ -1393,7 +1361,7 @@ dump_file (char *p, int top_level, dev_t parent_device) memset (exhdr->buffer, 0, BLOCKSIZE); for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++) { - if (counter + index_offset > upperbound) + if (sparses <= counter + index_offset) break; SIZE_TO_CHARS (sparsearray[counter + index_offset].numbytes, @@ -1402,7 +1370,7 @@ dump_file (char *p, int top_level, dev_t parent_device) exhdr->sparse_header.sp[counter].offset); } set_next_block_after (exhdr); - if (index_offset + counter <= upperbound) + if (counter + index_offset < sparses) { index_offset += counter; exhdr->sparse_header.isextended = 1; @@ -1413,7 +1381,8 @@ dump_file (char *p, int top_level, dev_t parent_device) if (save_typeflag == GNUTYPE_SPARSE) { if (f < 0 - || finish_sparse_file (f, &sizeleft, current_stat.st_size, p)) + || finish_sparse_file (f, &sizeleft, + current_stat.st_size, p)) goto padit; } else @@ -1444,12 +1413,10 @@ dump_file (char *p, int top_level, dev_t parent_device) count = safe_read (f, start->buffer, bufsize); if (count < 0) { - char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, errno, - _("Read error at byte %s, reading %lu bytes, in file %s"), - STRINGIFY_BIGINT (current_stat.st_size - sizeleft, - buf), - (unsigned long) bufsize, p)); + (ignore_failed_read_option + ? read_warn_details + : read_error_details) + (p, current_stat.st_size - sizeleft, bufsize); goto padit; } sizeleft -= count; @@ -1463,9 +1430,12 @@ dump_file (char *p, int top_level, dev_t parent_device) else { char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, 0, - _("File %s shrunk by %s bytes, padding with zeros"), - p, STRINGIFY_BIGINT (sizeleft, buf))); + WARN ((0, 0, + _("%s: File shrank by %s bytes; padding with zeros"), + quotearg_colon (p), + STRINGIFY_BIGINT (sizeleft, buf))); + if (! ignore_failed_read_option) + exit_status = TAREXIT_FAILURE; goto padit; /* short read */ } } @@ -1477,19 +1447,33 @@ dump_file (char *p, int top_level, dev_t parent_device) { struct stat final_stat; if (fstat (f, &final_stat) != 0) - ERROR ((0, errno, "%s: fstat", p)); - else if (final_stat.st_mtime != restore_times.modtime - || final_stat.st_size != restore_size) - ERROR ((0, errno, _("%s: file changed as we read it"), p)); + { + if (ignore_failed_read_option) + stat_warn (p); + else + stat_error (p); + } + else if (final_stat.st_ctime != original_ctime) + { + char const *qp = quotearg_colon (p); + WARN ((0, 0, _("%s: file changed as we read it"), qp)); + if (! ignore_failed_read_option) + exit_status = TAREXIT_FAILURE; + } if (close (f) != 0) - ERROR ((0, errno, _("%s: close"), p)); + { + if (ignore_failed_read_option) + close_warn (p); + else + close_error (p); + } if (atime_preserve_option) utime (p, &restore_times); } if (remove_files_option) { if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); + unlink_error (p); } return; @@ -1524,9 +1508,10 @@ dump_file (char *p, int top_level, dev_t parent_device) size = readlink (p, buffer, PATH_MAX + 1); if (size < 0) { - WARN ((0, errno, _("Cannot add file %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; + if (ignore_failed_read_option) + readlink_warn (p); + else + readlink_error (p); return; } buffer[size] = '\0'; @@ -1543,7 +1528,7 @@ dump_file (char *p, int top_level, dev_t parent_device) if (remove_files_option) { if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); + unlink_error (p); } return; } @@ -1552,16 +1537,18 @@ dump_file (char *p, int top_level, dev_t parent_device) type = CHRTYPE; else if (S_ISBLK (current_stat.st_mode)) type = BLKTYPE; - else if (S_ISFIFO (current_stat.st_mode) - || S_ISSOCK (current_stat.st_mode)) + else if (S_ISFIFO (current_stat.st_mode)) type = FIFOTYPE; -#ifdef S_ISDOOR + else if (S_ISSOCK (current_stat.st_mode)) + { + WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p))); + return; + } else if (S_ISDOOR (current_stat.st_mode)) { - WARN ((0, 0, _("%s: door ignored"), p)); + WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p))); return; } -#endif else goto unknown; } @@ -1583,10 +1570,13 @@ dump_file (char *p, int top_level, dev_t parent_device) if (remove_files_option) { if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); + unlink_error (p); } return; unknown: - ERROR ((0, 0, _("%s: Unknown file type; file ignored"), p)); + WARN ((0, 0, _("%s: Unknown file type; file ignored"), + quotearg_colon (p))); + if (! ignore_failed_read_option) + exit_status = TAREXIT_FAILURE; }