X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcreate.c;h=6381f9fe6ff71d14e01b87484e8f51b277c190f9;hb=d659cbaccdc1f3279c49107cf15f15a639738529;hp=8dec08bf260d8c9fd6d160a16e4905277a9f3500;hpb=3ca6dbbb22e9b736d0848f89afba32018a34cf38;p=chaz%2Ftar diff --git a/src/create.c b/src/create.c index 8dec08b..6381f9f 100644 --- a/src/create.c +++ b/src/create.c @@ -1,5 +1,8 @@ /* Create a tar archive. - Copyright 1985, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc. + + Copyright (C) 1985, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, + 2003, 2004, 2005 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 @@ -14,189 +17,435 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., - 59 Place - Suite 330, Boston, MA 02111-1307, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "system.h" - -#if !MSDOS -# include -# include -#endif +#include -#if HAVE_UTIME_H -# include -#else -struct utimbuf - { - long actime; - long modtime; - }; -#endif +#include +#include #include "common.h" - -#ifndef MSDOS -extern dev_t ar_dev; -extern ino_t ar_ino; -#endif - -extern struct name *gnu_list_name; - -/* This module is the only one that cares about `struct link's. */ +#include struct link { - struct link *next; dev_t dev; ino_t ino; - short linkcount; + size_t nlink; char name[1]; }; - -struct link *linklist = NULL; /* points to first link in list */ +/* The maximum uintmax_t value that can be represented with DIGITS digits, + assuming that each digit is BITS_PER_DIGIT wide. */ +#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ + ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ + ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ + : (uintmax_t) -1) -/*------------------------------------------------------------------------. -| Convert VALUE into a size-SIZE field at WHERE, including a | -| trailing space. For example, 3 for SIZE means two digits and a space. | -| | -| We assume the trailing NUL is already there and don't fill it in. This | -| fact is used by start_header and finish_header, so don't change it! | -`------------------------------------------------------------------------*/ +/* The maximum uintmax_t value that can be represented with octal + digits and a trailing NUL in BUFFER. */ +#define MAX_OCTAL_VAL(buffer) MAX_VAL_WITH_DIGITS (sizeof (buffer) - 1, LG_8) -/* This should be equivalent to: sprintf (WHERE, "%*lo ", SIZE - 1, VALUE); - except that we don't assume VALUE fits in an unsigned long, and - except that sprintf fills in the trailing NUL and we don't. */ +/* Convert VALUE to an octal representation suitable for tar headers. + Output to buffer WHERE with size SIZE. + The result is undefined if SIZE is 0 or if VALUE is too large to fit. */ static void -to_oct (uintmax_t value, char *where, size_t size, const char *type) +to_octal (uintmax_t value, char *where, size_t size) { uintmax_t v = value; size_t i = size; - where[--i] = ' '; /* put in the space, though */ - /* Produce the digits -- at least one. */ + do + { + where[--i] = '0' + (v & ((1 << LG_8) - 1)); + v >>= LG_8; + } + while (i); +} + +/* Copy at most LEN bytes from the string SRC to DST. Terminate with + NUL unless SRC is LEN or more bytes long. */ + +static void +tar_copy_str (char *dst, const char *src, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + if (! (dst[i] = src[i])) + break; +} + +/* Same as tar_copy_str, but always terminate with NUL if using + is OLDGNU format */ + +static void +tar_name_copy_str (char *dst, const char *src, size_t len) +{ + tar_copy_str (dst, src, len); + if (archive_format == OLDGNU_FORMAT) + dst[len-1] = 0; +} + +/* Convert NEGATIVE VALUE to a base-256 representation suitable for + tar headers. NEGATIVE is 1 if VALUE was negative before being cast + to uintmax_t, 0 otherwise. Output to buffer WHERE with size SIZE. + The result is undefined if SIZE is 0 or if VALUE is too large to + fit. */ + +static void +to_base256 (int negative, uintmax_t value, char *where, size_t size) +{ + uintmax_t v = value; + uintmax_t propagated_sign_bits = + ((uintmax_t) - negative << (CHAR_BIT * sizeof v - LG_256)); + size_t i = size; do { - where[--i] = '0' + (int) (v & 7); /* one octal digit */ - v >>= 3; + where[--i] = v & ((1 << LG_256) - 1); + v = propagated_sign_bits | (v >> LG_256); + } + while (i); +} + +/* Convert NEGATIVE VALUE (which was originally of size VALSIZE) to + external form, using SUBSTITUTE (...) if VALUE won't fit. Output + to buffer WHERE with size SIZE. NEGATIVE is 1 iff VALUE was + negative before being cast to uintmax_t; its original bitpattern + can be deduced from VALSIZE, its original size before casting. + TYPE is the kind of value being output (useful for diagnostics). + Prefer the POSIX format of SIZE - 1 octal digits (with leading zero + digits), followed by '\0'. If this won't work, and if GNU or + OLDGNU format is allowed, use '\200' followed by base-256, or (if + NEGATIVE is nonzero) '\377' followed by two's complement base-256. + If neither format works, use SUBSTITUTE (...) instead. Pass to + SUBSTITUTE the address of an 0-or-1 flag recording whether the + substitute value is negative. */ + +static void +to_chars (int negative, uintmax_t value, size_t valsize, + uintmax_t (*substitute) (int *), + char *where, size_t size, const char *type) +{ + int base256_allowed = (archive_format == GNU_FORMAT + || archive_format == OLDGNU_FORMAT); + + /* Generate the POSIX octal representation if the number fits. */ + if (! negative && value <= MAX_VAL_WITH_DIGITS (size - 1, LG_8)) + { + where[size - 1] = '\0'; + to_octal (value, where, size - 1); } - while (i != 0 && v != 0); - /* Leading spaces, if necessary. */ - while (i != 0) - where[--i] = ' '; + /* Otherwise, generate the base-256 representation if we are + generating an old or new GNU format and if the number fits. */ + else if (((negative ? -1 - value : value) + <= MAX_VAL_WITH_DIGITS (size - 1, LG_256)) + && base256_allowed) + { + where[0] = negative ? -1 : 1 << (LG_256 - 1); + to_base256 (negative, value, where + 1, size - 1); + } + + /* Otherwise, if the number is negative, and if it would not cause + ambiguity on this host by confusing positive with negative + values, then generate the POSIX octal representation of the value + modulo 2**(field bits). The resulting tar file is + machine-dependent, since it depends on the host word size. Yuck! + But this is the traditional behavior. */ + else if (negative && valsize * CHAR_BIT <= (size - 1) * LG_8) + { + static int warned_once; + if (! warned_once) + { + warned_once = 1; + WARN ((0, 0, _("Generating negative octal headers"))); + } + where[size - 1] = '\0'; + to_octal (value & MAX_VAL_WITH_DIGITS (valsize * CHAR_BIT, 1), + where, size - 1); + } - if (v != 0) + /* Otherwise, output a substitute value if possible (with a + warning), and an error message if not. */ + else { - char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, 0, _("%s value %s is too large to fit in a %u-bit field"), - type, STRINGIFY_BIGINT (value, buf), - (unsigned) ((size - 1) * 3))); + uintmax_t maxval = (base256_allowed + ? MAX_VAL_WITH_DIGITS (size - 1, LG_256) + : MAX_VAL_WITH_DIGITS (size - 1, LG_8)); + char valbuf[UINTMAX_STRSIZE_BOUND + 1]; + char maxbuf[UINTMAX_STRSIZE_BOUND]; + char minbuf[UINTMAX_STRSIZE_BOUND + 1]; + char const *minval_string; + char const *maxval_string = STRINGIFY_BIGINT (maxval, maxbuf); + char const *value_string; + + if (base256_allowed) + { + uintmax_t m = maxval + 1 ? maxval + 1 : maxval / 2 + 1; + char *p = STRINGIFY_BIGINT (m, minbuf + 1); + *--p = '-'; + minval_string = p; + } + else + minval_string = "0"; + + if (negative) + { + char *p = STRINGIFY_BIGINT (- value, valbuf + 1); + *--p = '-'; + value_string = p; + } + else + value_string = STRINGIFY_BIGINT (value, valbuf); + + if (substitute) + { + int negsub; + uintmax_t sub = substitute (&negsub) & maxval; + /* FIXME: This is the only place where GNU_FORMAT differs from + OLDGNU_FORMAT. Apart from this they are completely identical. */ + uintmax_t s = (negsub &= archive_format == GNU_FORMAT) ? - sub : sub; + char subbuf[UINTMAX_STRSIZE_BOUND + 1]; + char *sub_string = STRINGIFY_BIGINT (s, subbuf + 1); + if (negsub) + *--sub_string = '-'; + WARN ((0, 0, _("value %s out of %s range %s..%s; substituting %s"), + value_string, type, minval_string, maxval_string, + sub_string)); + to_chars (negsub, s, valsize, 0, where, size, type); + } + else + ERROR ((0, 0, _("value %s out of %s range %s..%s"), + value_string, type, minval_string, maxval_string)); } } + +static uintmax_t +gid_substitute (int *negative) +{ + gid_t r; +#ifdef GID_NOBODY + r = GID_NOBODY; +#else + static gid_t gid_nobody; + if (!gid_nobody && !gname_to_gid ("nobody", &gid_nobody)) + gid_nobody = -2; + r = gid_nobody; +#endif + *negative = r < 0; + return r; +} + +void +gid_to_chars (gid_t v, char *p, size_t s) +{ + to_chars (v < 0, (uintmax_t) v, sizeof v, gid_substitute, p, s, "gid_t"); +} + void -gid_to_oct (gid_t v, char *p, size_t s) +major_to_chars (major_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "gid_t"); + to_chars (v < 0, (uintmax_t) v, sizeof v, 0, p, s, "major_t"); } + void -major_to_oct (major_t v, char *p, size_t s) +minor_to_chars (minor_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "major_t"); + to_chars (v < 0, (uintmax_t) v, sizeof v, 0, p, s, "minor_t"); } + void -minor_to_oct (minor_t v, char *p, size_t s) +mode_to_chars (mode_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "minor_t"); + /* In the common case where the internal and external mode bits are the same, + and we are not using POSIX or GNU format, + propagate all unknown bits to the external mode. + This matches historical practice. + Otherwise, just copy the bits we know about. */ + int negative; + uintmax_t u; + if (S_ISUID == TSUID && S_ISGID == TSGID && S_ISVTX == TSVTX + && S_IRUSR == TUREAD && S_IWUSR == TUWRITE && S_IXUSR == TUEXEC + && S_IRGRP == TGREAD && S_IWGRP == TGWRITE && S_IXGRP == TGEXEC + && S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC + && archive_format != POSIX_FORMAT + && archive_format != USTAR_FORMAT + && archive_format != GNU_FORMAT) + { + negative = v < 0; + u = v; + } + else + { + negative = 0; + u = ((v & S_ISUID ? TSUID : 0) + | (v & S_ISGID ? TSGID : 0) + | (v & S_ISVTX ? TSVTX : 0) + | (v & S_IRUSR ? TUREAD : 0) + | (v & S_IWUSR ? TUWRITE : 0) + | (v & S_IXUSR ? TUEXEC : 0) + | (v & S_IRGRP ? TGREAD : 0) + | (v & S_IWGRP ? TGWRITE : 0) + | (v & S_IXGRP ? TGEXEC : 0) + | (v & S_IROTH ? TOREAD : 0) + | (v & S_IWOTH ? TOWRITE : 0) + | (v & S_IXOTH ? TOEXEC : 0)); + } + to_chars (negative, u, sizeof v, 0, p, s, "mode_t"); } + void -mode_to_oct (mode_t v, char *p, size_t s) +off_to_chars (off_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "mode_t"); + to_chars (v < 0, (uintmax_t) v, sizeof v, 0, p, s, "off_t"); } + void -off_to_oct (off_t v, char *p, size_t s) +size_to_chars (size_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "off_t"); + to_chars (0, (uintmax_t) v, sizeof v, 0, p, s, "size_t"); } + void -size_to_oct (size_t v, char *p, size_t s) +time_to_chars (time_t v, char *p, size_t s) +{ + to_chars (v < 0, (uintmax_t) v, sizeof v, 0, p, s, "time_t"); +} + +static uintmax_t +uid_substitute (int *negative) { - to_oct ((uintmax_t) v, p, s, "size_t"); + uid_t r; +#ifdef UID_NOBODY + r = UID_NOBODY; +#else + static uid_t uid_nobody; + if (!uid_nobody && !uname_to_uid ("nobody", &uid_nobody)) + uid_nobody = -2; + r = uid_nobody; +#endif + *negative = r < 0; + return r; } + void -time_to_oct (time_t v, char *p, size_t s) +uid_to_chars (uid_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "time_t"); + to_chars (v < 0, (uintmax_t) v, sizeof v, uid_substitute, p, s, "uid_t"); } + void -uid_to_oct (uid_t v, char *p, size_t s) +uintmax_to_chars (uintmax_t v, char *p, size_t s) { - to_oct ((uintmax_t) v, p, s, "uid_t"); + to_chars (0, v, sizeof v, 0, p, s, "uintmax_t"); } + void -uintmax_to_oct (uintmax_t v, char *p, size_t s) +string_to_chars (char const *str, char *p, size_t s) { - to_oct (v, p, s, "uintmax_t"); + tar_copy_str (p, str, s); + p[s - 1] = '\0'; } - -/* Writing routines. */ -/*-----------------------------------------------------------------------. -| Just zeroes out the buffer so we don't confuse ourselves with leftover | -| data. | -`-----------------------------------------------------------------------*/ + +/* A file is not dumpable if + a) it is empty *and* world-readable, or + b) current archive is /dev/null */ -static void -clear_buffer (char *buffer) +bool +file_dumpable_p (struct tar_stat_info *st) { - memset (buffer, 0, BLOCKSIZE); + return !(dev_null_output + || (st->archive_file_size == 0 + && (st->stat.st_mode & MODE_R) == MODE_R)); } -/*-------------------------------------------------------------------------. -| Write the EOT block(s). We actually zero at least one block, through | -| the end of the record. Old tar, as previous versions of GNU tar, writes | -| garbage after two zeroed blocks. | -`-------------------------------------------------------------------------*/ + +/* Writing routines. */ +/* Write the EOT block(s). Zero at least two blocks, through the end + of the record. Old tar, as previous versions of GNU tar, writes + garbage after two zeroed blocks. */ void write_eot (void) { union block *pointer = find_next_block (); + memset (pointer->buffer, 0, BLOCKSIZE); + set_next_block_after (pointer); + pointer = find_next_block (); + memset (pointer->buffer, 0, available_space_after (pointer)); + set_next_block_after (pointer); +} - if (pointer) - { - size_t space = available_space_after (pointer); +/* Write a "private" header */ +union block * +start_private_header (const char *name, size_t size) +{ + time_t t; + union block *header = find_next_block (); - memset (pointer->buffer, 0, space); - set_next_block_after (pointer); - } + memset (header->buffer, 0, sizeof (union block)); + + tar_name_copy_str (header->header.name, name, NAME_FIELD_SIZE); + OFF_TO_CHARS (size, header->header.size); + + time (&t); + TIME_TO_CHARS (t, header->header.mtime); + MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode); + UID_TO_CHARS (getuid (), header->header.uid); + GID_TO_CHARS (getgid (), header->header.gid); + MAJOR_TO_CHARS (0, header->header.devmajor); + MINOR_TO_CHARS (0, header->header.devminor); + strncpy (header->header.magic, TMAGIC, TMAGLEN); + strncpy (header->header.version, TVERSION, TVERSLEN); + return header; } -/*-----------------------------------------------------. -| Write a GNUTYPE_LONGLINK or GNUTYPE_LONGNAME block. | -`-----------------------------------------------------*/ +/* Create a new header and store there at most NAME_FIELD_SIZE bytes of + the file name */ -/* FIXME: Cross recursion between start_header and write_long! */ +static union block * +write_short_name (struct tar_stat_info *st) +{ + union block *header = find_next_block (); + memset (header->buffer, 0, sizeof (union block)); + tar_name_copy_str (header->header.name, st->file_name, NAME_FIELD_SIZE); + return header; +} -static union block *start_header PARAMS ((const char *, struct stat *)); +#define FILL(field,byte) do { \ + memset(field, byte, sizeof(field)-1); \ + (field)[sizeof(field)-1] = 0; \ +} while (0) +/* Write a GNUTYPE_LONGLINK or GNUTYPE_LONGNAME block. */ static void -write_long (const char *p, char type) +write_gnu_long_link (struct tar_stat_info *st, const char *p, char type) { size_t size = strlen (p) + 1; size_t bufsize; union block *header; - struct stat foo; - - memset (&foo, 0, sizeof foo); - foo.st_size = size; - - header = start_header ("././@LongLink", &foo); + char *tmpname; + + header = start_private_header ("././@LongLink", size); + FILL(header->header.mtime, '0'); + FILL(header->header.mode, '0'); + FILL(header->header.uid, '0'); + FILL(header->header.gid, '0'); + FILL(header->header.devmajor, 0); + FILL(header->header.devminor, 0); + uid_to_uname (0, &tmpname); + UNAME_TO_CHARS (tmpname, header->header.uname); + free (tmpname); + gid_to_gname (0, &tmpname); + GNAME_TO_CHARS (tmpname, header->header.gname); + free (tmpname); + + strcpy (header->header.magic, OLDGNU_MAGIC); header->header.typeflag = type; - finish_header (header); + finish_header (st, header, -1); header = find_next_block (); @@ -215,68 +464,173 @@ write_long (const char *p, char type) memset (header->buffer + size, 0, bufsize - size); set_next_block_after (header + (size - 1) / BLOCKSIZE); } - -/* Header handling. */ -/*---------------------------------------------------------------------. -| Make a header block for the file name whose stat info is st. Return | -| header pointer for success, NULL if the name is too long. | -`---------------------------------------------------------------------*/ +static size_t +split_long_name (const char *name, size_t length) +{ + size_t i; + + if (length > PREFIX_FIELD_SIZE) + length = PREFIX_FIELD_SIZE+2; + for (i = length - 1; i > 0; i--) + if (ISSLASH (name[i])) + break; + return i; +} static union block * -start_header (const char *name, struct stat *st) +write_ustar_long_name (const char *name) { + size_t length = strlen (name); + size_t i; union block *header; - if (!absolute_names_option) + if (length > PREFIX_FIELD_SIZE + NAME_FIELD_SIZE + 1) + { + ERROR ((0, 0, _("%s: file name is too long (max %d); not dumped"), + quotearg_colon (name), + PREFIX_FIELD_SIZE + NAME_FIELD_SIZE + 1)); + return NULL; + } + + i = split_long_name (name, length); + if (i == 0 || length - i - 1 > NAME_FIELD_SIZE) { - static int warned_once = 0; + ERROR ((0, 0, + _("%s: file name is too long (cannot be split); not dumped"), + quotearg_colon (name))); + return NULL; + } -#if MSDOS - if (name[1] == ':') - { - name += 2; - if (!warned_once) - { - warned_once = 1; - WARN ((0, 0, _("Removing drive spec from names in the archive"))); - } - } -#endif + header = find_next_block (); + memset (header->buffer, 0, sizeof (header->buffer)); + memcpy (header->header.prefix, name, i); + memcpy (header->header.name, name + i + 1, length - i - 1); + + return header; +} + +/* Write a long link name, depending on the current archive format */ +static void +write_long_link (struct tar_stat_info *st) +{ + switch (archive_format) + { + case POSIX_FORMAT: + xheader_store ("linkpath", st, NULL); + break; + + case V7_FORMAT: /* old V7 tar format */ + case USTAR_FORMAT: + case STAR_FORMAT: + ERROR ((0, 0, + _("%s: link name is too long; not dumped"), + quotearg_colon (st->link_name))); + break; + + case OLDGNU_FORMAT: + case GNU_FORMAT: + write_gnu_long_link (st, st->link_name, GNUTYPE_LONGLINK); + break; + + default: + abort(); /*FIXME*/ + } +} + +static union block * +write_long_name (struct tar_stat_info *st) +{ + switch (archive_format) + { + case POSIX_FORMAT: + xheader_store ("path", st, NULL); + break; - while (*name == '/') + case V7_FORMAT: + if (strlen (st->file_name) > NAME_FIELD_SIZE-1) { - name++; /* force relative path */ - if (!warned_once) - { - warned_once = 1; - WARN ((0, 0, _("\ -Removing leading `/' from absolute path names in the archive"))); - } + ERROR ((0, 0, _("%s: file name is too long (max %d); not dumped"), + quotearg_colon (st->file_name), + NAME_FIELD_SIZE - 1)); + return NULL; } + break; + + case USTAR_FORMAT: + case STAR_FORMAT: + return write_ustar_long_name (st->file_name); + + case OLDGNU_FORMAT: + case GNU_FORMAT: + write_gnu_long_link (st, st->file_name, GNUTYPE_LONGNAME); + break; + + default: + abort(); /*FIXME*/ } + return write_short_name (st); +} + +static union block * +write_extended (struct tar_stat_info *st, union block *old_header) +{ + union block *header, hp; + char *p; - /* Check the file name and put it in the block. */ + if (extended_header.buffer || extended_header.stk == NULL) + return old_header; - if (strlen (name) >= (size_t) NAME_FIELD_SIZE) - write_long (name, GNUTYPE_LONGNAME); + xheader_finish (&extended_header); + memcpy (hp.buffer, old_header, sizeof (hp)); + p = xheader_xhdr_name (st); + xheader_write (XHDTYPE, p, &extended_header); + free (p); header = find_next_block (); - memset (header->buffer, 0, sizeof (union block)); + memcpy (header, &hp.buffer, sizeof (hp.buffer)); + return header; +} + +static union block * +write_header_name (struct tar_stat_info *st) +{ + if (archive_format == POSIX_FORMAT && !string_ascii_p (st->file_name)) + { + xheader_store ("path", st, NULL); + return write_short_name (st); + } + else if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) + < strlen (st->file_name)) + return write_long_name (st); + else + return write_short_name (st); +} + + +/* Header handling. */ + +/* Make a header block for the file whose stat info is st, + and return its address. */ - assign_string (¤t_file_name, name); +union block * +start_header (struct tar_stat_info *st) +{ + union block *header; - strncpy (header->header.name, name, NAME_FIELD_SIZE); - header->header.name[NAME_FIELD_SIZE - 1] = '\0'; + header = write_header_name (st); + if (!header) + return NULL; /* Override some stat fields, if requested to do so. */ if (owner_option != (uid_t) -1) - st->st_uid = owner_option; + st->stat.st_uid = owner_option; if (group_option != (gid_t) -1) - st->st_gid = group_option; + st->stat.st_gid = group_option; if (mode_option) - st->st_mode = ((st->st_mode & S_IFMT) - | mode_adjust (st->st_mode, mode_option)); + st->stat.st_mode = + ((st->stat.st_mode & ~MODE_ALL) + | mode_adjust (st->stat.st_mode, mode_option, initial_umask)); /* Paul Eggert tried the trivial test ($WRITER cf a b; $READER tvf a) for a few tars and came up with the following interoperability @@ -301,41 +655,119 @@ Removing leading `/' from absolute path names in the archive"))); above, thus making GNU tar both a universal donor and a universal acceptor for Paul's test. */ - if (archive_format == V7_FORMAT) - MODE_TO_OCT (st->st_mode & 07777, header->header.mode); + if (archive_format == V7_FORMAT || archive_format == USTAR_FORMAT) + MODE_TO_CHARS (st->stat.st_mode & MODE_ALL, header->header.mode); else - MODE_TO_OCT (st->st_mode, header->header.mode); + MODE_TO_CHARS (st->stat.st_mode, header->header.mode); - UID_TO_OCT (st->st_uid, header->header.uid); - GID_TO_OCT (st->st_gid, header->header.gid); - OFF_TO_OCT (st->st_size, header->header.size); - TIME_TO_OCT (st->st_mtime, header->header.mtime); + { + uid_t uid = st->stat.st_uid; + if (archive_format == POSIX_FORMAT + && MAX_OCTAL_VAL (header->header.uid) < uid) + { + xheader_store ("uid", st, NULL); + uid = 0; + } + UID_TO_CHARS (uid, header->header.uid); + } - if (incremental_option) - if (archive_format == OLDGNU_FORMAT) + { + gid_t gid = st->stat.st_gid; + if (archive_format == POSIX_FORMAT + && MAX_OCTAL_VAL (header->header.gid) < gid) { - TIME_TO_OCT (st->st_atime, header->oldgnu_header.atime); - TIME_TO_OCT (st->st_ctime, header->oldgnu_header.ctime); + xheader_store ("gid", st, NULL); + gid = 0; + } + GID_TO_CHARS (gid, header->header.gid); + } + + { + off_t size = st->stat.st_size; + if (archive_format == POSIX_FORMAT + && MAX_OCTAL_VAL (header->header.size) < size) + { + xheader_store ("size", st, NULL); + size = 0; + } + OFF_TO_CHARS (size, header->header.size); + } + + { + struct timespec mtime = get_stat_mtime (&st->stat); + if (archive_format == POSIX_FORMAT) + { + if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec + || mtime.tv_nsec != 0) + xheader_store ("mtime", st, NULL); + if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec) + mtime.tv_sec = 0; + } + TIME_TO_CHARS (mtime.tv_sec, header->header.mtime); + } + + /* FIXME */ + if (S_ISCHR (st->stat.st_mode) + || S_ISBLK (st->stat.st_mode)) + { + major_t devmajor = major (st->stat.st_rdev); + minor_t devminor = minor (st->stat.st_rdev); + + if (archive_format == POSIX_FORMAT + && MAX_OCTAL_VAL (header->header.devmajor) < devmajor) + { + xheader_store ("devmajor", st, NULL); + devmajor = 0; + } + MAJOR_TO_CHARS (devmajor, header->header.devmajor); + + if (archive_format == POSIX_FORMAT + && MAX_OCTAL_VAL (header->header.devminor) < devminor) + { + xheader_store ("devminor", st, NULL); + devminor = 0; + } + MINOR_TO_CHARS (devminor, header->header.devminor); + } + else if (archive_format != GNU_FORMAT && archive_format != OLDGNU_FORMAT) + { + MAJOR_TO_CHARS (0, header->header.devmajor); + MINOR_TO_CHARS (0, header->header.devminor); + } + + if (archive_format == POSIX_FORMAT) + { + xheader_store ("atime", st, NULL); + xheader_store ("ctime", st, NULL); + } + else if (incremental_option) + if (archive_format == OLDGNU_FORMAT || archive_format == GNU_FORMAT) + { + TIME_TO_CHARS (st->stat.st_atime, header->oldgnu_header.atime); + TIME_TO_CHARS (st->stat.st_ctime, header->oldgnu_header.ctime); } header->header.typeflag = archive_format == V7_FORMAT ? AREGTYPE : REGTYPE; switch (archive_format) { - case DEFAULT_FORMAT: case V7_FORMAT: break; case OLDGNU_FORMAT: + case GNU_FORMAT: /*FIXME?*/ /* Overwrite header->header.magic and header.version in one blow. */ strcpy (header->header.magic, OLDGNU_MAGIC); break; case POSIX_FORMAT: - case GNU_FORMAT: + case USTAR_FORMAT: strncpy (header->header.magic, TMAGIC, TMAGLEN); strncpy (header->header.version, TVERSION, TVERSLEN); break; + + default: + abort (); } if (archive_format == V7_FORMAT || numeric_owner_option) @@ -344,450 +776,640 @@ Removing leading `/' from absolute path names in the archive"))); } else { - uid_to_uname (st->st_uid, header->header.uname); - gid_to_gname (st->st_gid, header->header.gname); + uid_to_uname (st->stat.st_uid, &st->uname); + gid_to_gname (st->stat.st_gid, &st->gname); + + if (archive_format == POSIX_FORMAT + && (strlen (st->uname) > UNAME_FIELD_SIZE + || !string_ascii_p (st->uname))) + xheader_store ("uname", st, NULL); + UNAME_TO_CHARS (st->uname, header->header.uname); + + if (archive_format == POSIX_FORMAT + && (strlen (st->gname) > GNAME_FIELD_SIZE + || !string_ascii_p (st->gname))) + xheader_store ("gname", st, NULL); + GNAME_TO_CHARS (st->gname, header->header.gname); } return header; } -/*-------------------------------------------------------------------------. -| Finish off a filled-in header block and write it out. We also print the | -| file name and/or full info if verbose is on. | -`-------------------------------------------------------------------------*/ - void -finish_header (union block *header) +simple_finish_header (union block *header) { size_t i; int sum; char *p; - memcpy (header->header.chksum, CHKBLANKS, sizeof (header->header.chksum)); + memcpy (header->header.chksum, CHKBLANKS, sizeof header->header.chksum); sum = 0; p = header->buffer; - for (i = sizeof (*header); i-- != 0; ) + for (i = sizeof *header; i-- != 0; ) /* We can't use unsigned char here because of old compilers, e.g. V7. */ sum += 0xFF & *p++; /* Fill in the checksum field. It's formatted differently from the other fields: it has [6] digits, a null, then a space -- rather than - digits, a space, then a null. We use to_oct then write the null in - over to_oct's space. The final space is already there, from - checksumming, and to_oct doesn't modify it. + digits, then a null. We use to_chars. + The final space is already there, from + checksumming, and to_chars doesn't modify it. This is a fast way to do: sprintf(header->header.chksum, "%6o", sum); */ - UINTMAX_TO_OCT ((uintmax_t) sum, header->header.chksum); - header->header.chksum[6] = '\0'; /* zap the space */ + uintmax_to_chars ((uintmax_t) sum, header->header.chksum, 7); set_next_block_after (header); +} +/* Finish off a filled-in header block and write it out. We also + print the file name and/or full info if verbose is on. If BLOCK_ORDINAL + is not negative, is the block ordinal of the first record for this + file, which may be a preceding long name or long link record. */ +void +finish_header (struct tar_stat_info *st, + union block *header, off_t block_ordinal) +{ + /* Note: It is important to do this before the call to write_extended(), + so that the actual ustar header is printed */ if (verbose_option && header->header.typeflag != GNUTYPE_LONGLINK - && header->header.typeflag != GNUTYPE_LONGNAME) + && header->header.typeflag != GNUTYPE_LONGNAME + && header->header.typeflag != XHDTYPE + && header->header.typeflag != XGLTYPE) { /* These globals are parameters to print_header, sigh. */ current_header = header; - /* current_stat is already set up. */ current_format = archive_format; - print_header (); + print_header (st, block_ordinal); } -} - -/* Sparse file processing. */ -/*-------------------------------------------------------------------------. -| Takes a blockful of data and basically cruises through it to see if it's | -| made *entirely* of zeros, returning a 0 the instant it finds something | -| that is a nonzero, i.e., useful data. | -`-------------------------------------------------------------------------*/ - -static int -zero_block_p (char *buffer) -{ - int counter; - - for (counter = 0; counter < BLOCKSIZE; counter++) - if (buffer[counter] != '\0') - return 0; - return 1; + header = write_extended (st, header); + simple_finish_header (header); } + -/*---. -| ? | -`---*/ - -static void -init_sparsearray (void) +void +pad_archive (off_t size_left) { - int counter; - - sp_array_size = 10; - - /* Make room for our scratch space -- initially is 10 elts long. */ - - sparsearray = (struct sp_array *) - xmalloc (sp_array_size * sizeof (struct sp_array)); - for (counter = 0; counter < sp_array_size; counter++) + union block *blk; + while (size_left > 0) { - sparsearray[counter].offset = 0; - sparsearray[counter].numbytes = 0; + save_sizeleft = size_left; + blk = find_next_block (); + memset (blk->buffer, 0, BLOCKSIZE); + set_next_block_after (blk); + size_left -= BLOCKSIZE; } } -/*---. -| ? | -`---*/ - -static void -find_new_file_size (off_t *filesize, int highest_index) -{ - int counter; - - *filesize = 0; - for (counter = 0; - sparsearray[counter].numbytes && counter <= highest_index; - counter++) - *filesize += sparsearray[counter].numbytes; -} - -/*-----------------------------------------------------------------------. -| Make one pass over the file NAME, studying where any non-zero data is, | -| that is, how far into the file each instance of data is, and how many | -| bytes are there. Save this information in the sparsearray, which will | -| later be translated into header information. | -`-----------------------------------------------------------------------*/ - -/* There is little point in trimming small amounts of null data at the head - and tail of blocks, only avoid dumping full null blocks. */ - -/* FIXME: this routine might accept bits of algorithmic cleanup, it is - too kludgey for my taste... */ - -static int -deal_with_sparse (char *name, union block *header) +static enum dump_status +dump_regular_file (int fd, struct tar_stat_info *st) { - size_t numbytes = 0; - off_t offset = 0; - int file; - int sparse_index = 0; - ssize_t count; - char buffer[BLOCKSIZE]; + off_t size_left = st->stat.st_size; + off_t block_ordinal; + union block *blk; - if (archive_format == OLDGNU_FORMAT) - header->oldgnu_header.isextended = 0; + block_ordinal = current_block_ordinal (); + blk = start_header (st); + if (!blk) + return dump_status_fail; - if (file = open (name, O_RDONLY), file < 0) - /* This problem will be caught later on, so just return. */ - return 0; + /* Mark contiguous files, if we support them. */ + if (archive_format != V7_FORMAT && S_ISCTG (st->stat.st_mode)) + blk->header.typeflag = CONTTYPE; - init_sparsearray (); - clear_buffer (buffer); + finish_header (st, blk, block_ordinal); - while (count = read (file, buffer, sizeof buffer), count != 0) + while (size_left > 0) { - /* Realloc the scratch area as necessary. FIXME: should reallocate - only at beginning of a new instance of non-zero data. */ + size_t bufsize, count; - if (sparse_index > sp_array_size - 1) + if (multi_volume_option) { - - sparsearray = (struct sp_array *) - xrealloc (sparsearray, - 2 * sp_array_size * sizeof (struct sp_array)); - sp_array_size *= 2; + assign_string (&save_name, st->orig_file_name); + save_sizeleft = size_left; + save_totsize = st->stat.st_size; } + blk = find_next_block (); - /* Process one block. */ + bufsize = available_space_after (blk); - if (count == sizeof buffer) + if (size_left < bufsize) + { + /* Last read -- zero out area beyond. */ + bufsize = size_left; + count = bufsize % BLOCKSIZE; + if (count) + memset (blk->buffer + size_left, 0, BLOCKSIZE - count); + } - if (zero_block_p (buffer)) - { - if (numbytes) - { - sparsearray[sparse_index++].numbytes = numbytes; - numbytes = 0; - } - } - else - { - if (!numbytes) - sparsearray[sparse_index].offset = offset; - numbytes += count; - } + count = (fd < 0) ? bufsize : safe_read (fd, blk->buffer, bufsize); + if (count == SAFE_READ_ERROR) + { + read_diag_details (st->orig_file_name, + st->stat.st_size - size_left, bufsize); + pad_archive (size_left); + return dump_status_short; + } + size_left -= count; + if (count) + set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE); - else - - /* Since count < sizeof buffer, we have the last bit of the file. */ + if (count != bufsize) + { + char buf[UINTMAX_STRSIZE_BOUND]; + memset (blk->buffer + count, 0, bufsize - count); + WARN ((0, 0, + ngettext ("%s: File shrank by %s byte; padding with zeros", + "%s: File shrank by %s bytes; padding with zeros", + size_left), + quotearg_colon (st->orig_file_name), + STRINGIFY_BIGINT (size_left, buf))); + if (! ignore_failed_read_option) + exit_status = TAREXIT_FAILURE; + pad_archive (size_left - (bufsize-count)); + return dump_status_short; + } + } + return dump_status_ok; +} - if (!zero_block_p (buffer)) - { - if (!numbytes) - sparsearray[sparse_index].offset = offset; - numbytes += count; - } - else - /* The next two lines are suggested by Andreas Degert, who says - they are required for trailing full blocks to be written to the - archive, when all zeroed. Yet, it seems to me that the case - does not apply. Further, at restore time, the file is not as - sparse as it should. So, some serious cleanup is *also* needed - in this area. Just one more... :-(. FIXME. */ - if (numbytes) - numbytes += count; - - /* Prepare for next block. */ - - offset += count; - /* FIXME: do not clear unless necessary. */ - clear_buffer (buffer); +static void +dump_regular_finish (int fd, struct tar_stat_info *st, + struct timespec original_ctime) +{ + if (fd >= 0) + { + struct stat final_stat; + if (fstat (fd, &final_stat) != 0) + { + stat_diag (st->orig_file_name); + } + else if (final_stat.st_ctime != original_ctime.tv_sec + || (get_stat_ctime (&final_stat).tv_nsec + != original_ctime.tv_nsec)) + { + WARN ((0, 0, _("%s: file changed as we read it"), + quotearg_colon (st->orig_file_name))); + } + if (close (fd) != 0) + { + close_diag (st->orig_file_name); + } } + if (remove_files_option) + { + if (unlink (st->orig_file_name) == -1) + unlink_error (st->orig_file_name); + } +} - if (numbytes) - sparsearray[sparse_index++].numbytes = numbytes; - else +/* Look in directory DIRNAME for a cache directory tag file + with the magic name "CACHEDIR.TAG" and a standard header, + as described at: + http://www.brynosaurus.com/cachedir + Applications can write this file into directories they create + for use as caches containing purely regenerable, non-precious data, + allowing us to avoid archiving them if --exclude-caches is specified. */ + +#define CACHEDIR_SIGNATURE "Signature: 8a477f597d28d172789f06886806bc55" +#define CACHEDIR_SIGNATURE_SIZE (sizeof CACHEDIR_SIGNATURE - 1) + +static bool +check_cache_directory (char *dirname) +{ + static char tagname[] = "CACHEDIR.TAG"; + char *tagpath; + int fd; + int tag_present = false; + + tagpath = xmalloc (strlen (dirname) + strlen (tagname) + 1); + strcpy (tagpath, dirname); + strcat (tagpath, tagname); + + fd = open (tagpath, O_RDONLY); + if (fd >= 0) { - sparsearray[sparse_index].offset = offset - 1; - sparsearray[sparse_index++].numbytes = 1; + static char tagbuf[CACHEDIR_SIGNATURE_SIZE]; + + if (read (fd, tagbuf, CACHEDIR_SIGNATURE_SIZE) + == CACHEDIR_SIGNATURE_SIZE + && memcmp (tagbuf, CACHEDIR_SIGNATURE, CACHEDIR_SIGNATURE_SIZE) == 0) + tag_present = true; + + close (fd); } - close (file); - return sparse_index - 1; -} + free (tagpath); -/*---. -| ? | -`---*/ + return tag_present; +} -static int -finish_sparse_file (int file, off_t *sizeleft, off_t fullsize, char *name) +static void +dump_dir0 (char *directory, + struct tar_stat_info *st, int top_level, dev_t parent_device) { - union block *start; - size_t bufsize; - int sparse_index = 0; - ssize_t count; + dev_t our_device = st->stat.st_dev; - while (*sizeleft > 0) + if (!is_avoided_name (st->orig_file_name)) { - 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; - } + union block *blk = NULL; + off_t block_ordinal = current_block_ordinal (); + st->stat.st_size = 0; /* force 0 size on dir */ - if (lseek (file, sparsearray[sparse_index++].offset, 0) < 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)); - break; - } + blk = start_header (st); + if (!blk) + return; + + if (incremental_option) + blk->header.typeflag = GNUTYPE_DUMPDIR; + else /* if (standard_option) */ + blk->header.typeflag = DIRTYPE; - /* If the number of bytes to be written here exceeds the size of - the temporary buffer, do it in steps. */ + /* If we're gnudumping, we aren't done yet so don't close it. */ - while (bufsize > BLOCKSIZE) + if (!incremental_option) + finish_header (st, blk, block_ordinal); + else if (gnu_list_name->dir_contents) { -#if 0 - if (amount_read) - { - count = 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. */ + off_t size_left; + off_t totsize; + size_t bufsize; + ssize_t count; + const char *buffer, *p_buffer; - count = read (file, start->buffer, BLOCKSIZE); - if (count < 0) + block_ordinal = current_block_ordinal (); + buffer = gnu_list_name->dir_contents; /* FOO */ + totsize = 0; + if (buffer) + for (p_buffer = buffer; *p_buffer; ) + { + size_t size = strlen (p_buffer) + 1; + totsize += size; + p_buffer += size; + } + totsize++; + OFF_TO_CHARS (totsize, blk->header.size); + finish_header (st, blk, block_ordinal); + p_buffer = buffer; + size_left = totsize; + while (size_left > 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)); - return 1; + if (multi_volume_option) + { + assign_string (&save_name, st->orig_file_name); + save_sizeleft = size_left; + save_totsize = totsize; + } + blk = find_next_block (); + bufsize = available_space_after (blk); + if (size_left < bufsize) + { + bufsize = size_left; + count = bufsize % BLOCKSIZE; + if (count) + memset (blk->buffer + size_left, 0, BLOCKSIZE - count); + } + memcpy (blk->buffer, p_buffer, bufsize); + size_left -= bufsize; + p_buffer += bufsize; + set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE); } - bufsize -= count; - *sizeleft -= count; - set_next_block_after (start); - start = find_next_block (); - memset (start->buffer, 0, BLOCKSIZE); + if (multi_volume_option) + assign_string (&save_name, 0); + return; } + } - { - char buffer[BLOCKSIZE]; + if (!recursion_option) + return; + + if (one_file_system_option + && !top_level + && parent_device != st->stat.st_dev) + { + if (verbose_option) + WARN ((0, 0, + _("%s: file is on a different filesystem; not dumped"), + quotearg_colon (st->orig_file_name))); + return; + } - clear_buffer (buffer); - count = read (file, buffer, bufsize); - memcpy (start->buffer, buffer, BLOCKSIZE); + if (exclude_caches_option + && check_cache_directory(st->orig_file_name)) + { + if (verbose_option) + WARN ((0, 0, + _("%s: contains a cache directory tag; not dumped"), + quotearg_colon (st->orig_file_name))); + return; + } + + { + char const *entry; + size_t entry_len; + char *name_buf = xstrdup (st->orig_file_name); + size_t name_size = strlen (name_buf); + size_t name_len = name_size; + + /* Now output all the files in the directory. */ + /* FIXME: Should speed this up by cd-ing into the dir. */ + + for (entry = directory; (entry_len = strlen (entry)) != 0; + entry += entry_len + 1) + { + if (name_size < name_len + entry_len) + { + name_size = name_len + entry_len; + name_buf = xrealloc (name_buf, name_size + 1); + } + strcpy (name_buf + name_len, entry); + if (!excluded_name (name_buf)) + dump_file (name_buf, 0, our_device); } - 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)); - 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 (name_buf); + } +} + +/* Ensure exactly one trailing slash. */ +static void +ensure_slash (char **pstr) +{ + size_t len = strlen (*pstr); + while (len >= 1 && ISSLASH ((*pstr)[len - 1])) + len--; + if (!ISSLASH ((*pstr)[len])) + *pstr = xrealloc (*pstr, len + 2); + (*pstr)[len++] = '/'; + (*pstr)[len] = '\0'; +} +static bool +dump_dir (struct tar_stat_info *st, int top_level, dev_t parent_device) +{ + char *directory; + + directory = savedir (st->orig_file_name); + if (!directory) + { + savedir_diag (st->orig_file_name); + return false; } - free (sparsearray); -#if 0 - set_next_block_after (start + (count - 1) / BLOCKSIZE); -#endif - return 0; + + ensure_slash (&st->orig_file_name); + ensure_slash (&st->file_name); + + dump_dir0 (directory, st, top_level, parent_device); + + free (directory); + return true; } + /* Main functions of this module. */ -/*---. -| ? | -`---*/ - void create_archive (void) { char *p; open_archive (ACCESS_WRITE); + xheader_write_global (); if (incremental_option) { - char *buffer = xmalloc (PATH_MAX); + size_t buffer_size = 1000; + char *buffer = xmalloc (buffer_size); const char *q; - char *bufp; collect_and_sort_names (); - while (p = name_from_list (), p) - dump_file (p, (dev_t) -1, 1); + while ((p = name_from_list ()) != NULL) + if (!excluded_name (p)) + dump_file (p, -1, (dev_t) 0); blank_name_list (); - while (p = name_from_list (), p) - { - strcpy (buffer, p); - if (p[strlen (p) - 1] != '/') - strcat (buffer, "/"); - bufp = buffer + strlen (buffer); - for (q = gnu_list_name->dir_contents; - q && *q; - q += strlen (q) + 1) - { - if (*q == 'Y') + while ((p = name_from_list ()) != NULL) + if (!excluded_name (p)) + { + size_t plen = strlen (p); + if (buffer_size <= plen) + { + while ((buffer_size *= 2) <= plen) + continue; + buffer = xrealloc (buffer, buffer_size); + } + memcpy (buffer, p, plen); + if (! ISSLASH (buffer[plen - 1])) + buffer[plen++] = '/'; + q = gnu_list_name->dir_contents; + if (q) + while (*q) { - strcpy (bufp, q + 1); - dump_file (buffer, (dev_t) -1, 1); + size_t qlen = strlen (q); + if (*q == 'Y') + { + if (buffer_size < plen + qlen) + { + while ((buffer_size *=2 ) < plen + qlen) + continue; + buffer = xrealloc (buffer, buffer_size); + } + strcpy (buffer + plen, q + 1); + dump_file (buffer, -1, (dev_t) 0); + } + q += qlen + 1; } - } - } + } free (buffer); } else { - while (p = name_next (1), p) - dump_file (p, (dev_t) -1, 1); + while ((p = name_next (1)) != NULL) + if (!excluded_name (p)) + dump_file (p, 1, (dev_t) 0); } write_eot (); close_archive (); if (listed_incremental_option) - write_dir_file (); + write_directory_file (); +} + + +/* Calculate the hash of a link. */ +static size_t +hash_link (void const *entry, size_t n_buckets) +{ + struct link const *l = entry; + uintmax_t num = l->dev ^ l->ino; + return num % n_buckets; +} + +/* Compare two links for equality. */ +static bool +compare_links (void const *entry1, void const *entry2) +{ + struct link const *link1 = entry1; + struct link const *link2 = entry2; + return ((link1->dev ^ link2->dev) | (link1->ino ^ link2->ino)) == 0; +} + +static void +unknown_file_error (char *p) +{ + WARN ((0, 0, _("%s: Unknown file type; file ignored"), + quotearg_colon (p))); + if (!ignore_failed_read_option) + exit_status = TAREXIT_FAILURE; +} + + +/* Handling of hard links */ + +/* Table of all non-directories that we've written so far. Any time + we see another, we check the table and avoid dumping the data + again if we've done it once already. */ +static Hash_table *link_table; + +/* Try to dump stat as a hard link to another file in the archive. If + succeeded returns true */ +static bool +dump_hard_link (struct tar_stat_info *st) +{ + if (link_table && st->stat.st_nlink > 1) + { + struct link lp; + struct link *duplicate; + off_t block_ordinal; + union block *blk; + + lp.ino = st->stat.st_ino; + lp.dev = st->stat.st_dev; + + if ((duplicate = hash_lookup (link_table, &lp))) + { + /* We found a link. */ + char const *link_name = safer_name_suffix (duplicate->name, true, + absolute_names_option); + + duplicate->nlink--; + + block_ordinal = current_block_ordinal (); + assign_string (&st->link_name, link_name); + if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) + < strlen (link_name)) + write_long_link (st); + + st->stat.st_size = 0; + blk = start_header (st); + if (!blk) + return true; + tar_copy_str (blk->header.linkname, link_name, NAME_FIELD_SIZE); + + blk->header.typeflag = LNKTYPE; + finish_header (st, blk, block_ordinal); + + if (remove_files_option && unlink (st->orig_file_name) != 0) + unlink_error (st->orig_file_name); + + return true; + } + } + return false; +} + +static void +file_count_links (struct tar_stat_info *st) +{ + if (st->stat.st_nlink > 1) + { + struct link *duplicate; + struct link *lp = xmalloc (offsetof (struct link, name) + + strlen (st->orig_file_name) + 1); + lp->ino = st->stat.st_ino; + lp->dev = st->stat.st_dev; + lp->nlink = st->stat.st_nlink; + strcpy (lp->name, st->orig_file_name); + + if (! ((link_table + || (link_table = hash_initialize (0, 0, hash_link, + compare_links, 0))) + && (duplicate = hash_insert (link_table, lp)))) + xalloc_die (); + + if (duplicate != lp) + abort (); + lp->nlink--; + } +} + +/* For each dumped file, check if all its links were dumped. Emit + warnings if it is not so. */ +void +check_links (void) +{ + struct link *lp; + + if (!link_table) + return; + + for (lp = hash_get_first (link_table); lp; + lp = hash_get_next (link_table, lp)) + { + if (lp->nlink) + { + WARN ((0, 0, _("Missing links to %s.\n"), quote (lp->name))); + } + } } -/*----------------------------------------------------------------------. -| Dump a single file. Recurse on directories. Result is nonzero for | -| success. P is file name to dump. PARENT_DEVICE is device our parent | -| directory was on. TOP_LEVEL tells wether we are a toplevel call. | -| | -| Sets global CURRENT_STAT to stat output for this file. | -`----------------------------------------------------------------------*/ + +/* 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 the top level + of an incremental dump. PARENT_DEVICE is the device of P's + parent directory; it is examined only if TOP_LEVEL is zero. */ /* FIXME: One should make sure that for *every* path leading to setting exit_status to failure, a clear diagnostic has been issued. */ -void -dump_file (char *p, dev_t parent_device, int top_level) +static void +dump_file0 (struct tar_stat_info *st, char *p, + int top_level, dev_t parent_device) { union block *header; char type; - union block *exhdr; - char save_typeflag; - struct utimbuf restore_times; - - /* FIXME: `header' and `upperbound' might be used uninitialized in this - function. Reported by Bruno Haible. */ + struct timespec original_ctime; + struct timespec restore_times[2]; + off_t block_ordinal = -1; if (interactive_option && !confirm ("add", p)) return; - /* Use stat if following (rather than dumping) 4.2BSD's symbolic links. - Otherwise, use lstat (which falls back to stat if no symbolic links). */ + assign_string (&st->orig_file_name, p); + assign_string (&st->file_name, + safer_name_suffix (p, false, absolute_names_option)); - if (dereference_option != 0 -#ifdef STX_HIDDEN /* AIX */ - ? statx (p, ¤t_stat, STATSIZE, STX_HIDDEN) - : statx (p, ¤t_stat, STATSIZE, STX_HIDDEN | STX_LINK) -#else - ? stat (p, ¤t_stat) : lstat (p, ¤t_stat) -#endif - ) + if (deref_stat (dereference_option, p, &st->stat) != 0) { - WARN ((0, errno, _("Cannot add file %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; + stat_diag (p); return; } - - restore_times.actime = current_stat.st_atime; - restore_times.modtime = current_stat.st_mtime; + st->archive_file_size = st->stat.st_size; + original_ctime = get_stat_ctime (&st->stat); + restore_times[0] = get_stat_atime (&st->stat); + restore_times[1] = get_stat_mtime (&st->stat); #ifdef S_ISHIDDEN - if (S_ISHIDDEN (current_stat.st_mode)) + if (S_ISHIDDEN (st->stat.st_mode)) { char *new = (char *) alloca (strlen (p) + 2); if (new) @@ -799,706 +1421,203 @@ dump_file (char *p, dev_t parent_device, int top_level) } #endif - /* See if we only want new files, and check if this one is too old to - put in the archive. */ + /* See if we want only new files, and check if this one is too old to + put in the archive. + + This check is omitted if incremental_option is set *and* the + requested file is not explicitely listed in the command line. */ - if (!incremental_option && !S_ISDIR (current_stat.st_mode) - && current_stat.st_mtime < newer_mtime_option - && (!after_date_option || current_stat.st_ctime < newer_ctime_option)) + if (!(incremental_option && !is_individual_file (p)) + && !S_ISDIR (st->stat.st_mode) + && OLDER_STAT_TIME (st->stat, m) + && (!after_date_option || OLDER_STAT_TIME (st->stat, c))) { - if (parent_device == (dev_t) -1) - WARN ((0, 0, _("%s: is unchanged; not dumped"), p)); - /* FIXME: recheck this return. */ + if (!incremental_option && verbose_option) + WARN ((0, 0, _("%s: file is unchanged; not dumped"), + quotearg_colon (p))); return; } -#if !MSDOS /* See if we are trying to dump the archive. */ - - if (ar_dev && current_stat.st_dev == ar_dev && current_stat.st_ino == ar_ino) + if (sys_file_is_archive (st)) { - 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 - - /* Check for multiple links. - - We maintain a list of all such files that we've written so far. Any - time we see another, we check the list and avoid dumping the data - again if we've done it once already. */ - if (current_stat.st_nlink > 1 - && (S_ISREG (current_stat.st_mode) -#ifdef S_ISCTG - || S_ISCTG (current_stat.st_mode) -#endif -#ifdef S_ISCHR - || S_ISCHR (current_stat.st_mode) -#endif -#ifdef S_ISBLK - || S_ISBLK (current_stat.st_mode) -#endif -#ifdef S_ISFIFO - || S_ISFIFO (current_stat.st_mode) -#endif - )) + if (is_avoided_name (p)) + return; + if (S_ISDIR (st->stat.st_mode)) { - struct link *lp; - - /* FIXME: First quick and dirty. Hashing, etc later. */ - - for (lp = linklist; lp; lp = lp->next) - if (lp->ino == current_stat.st_ino && lp->dev == current_stat.st_dev) - { - char *link_name = lp->name; - - /* We found a link. */ - - while (!absolute_names_option && *link_name == '/') - { - static int warned_once = 0; - - if (!warned_once) - { - warned_once = 1; - WARN ((0, 0, _("\ -Removing leading `/' from absolute links"))); - } - link_name++; - } - if (strlen (link_name) >= NAME_FIELD_SIZE) - write_long (link_name, GNUTYPE_LONGLINK); - assign_string (¤t_link_name, link_name); - - current_stat.st_size = 0; - header = start_header (p, ¤t_stat); - if (header == NULL) - { - exit_status = TAREXIT_FAILURE; - return; - } - strncpy (header->header.linkname, - link_name, NAME_FIELD_SIZE); - - /* Force null truncated. */ - - header->header.linkname[NAME_FIELD_SIZE - 1] = 0; - - header->header.typeflag = LNKTYPE; - finish_header (header); - - /* FIXME: Maybe remove from list after all links found? */ - - if (remove_files_option) - if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); - - /* We dumped it. */ - return; - } - - /* Not found. Add it to the list of possible links. */ - - lp = (struct link *) - xmalloc ((size_t) (sizeof (struct link) + strlen (p))); - lp->ino = current_stat.st_ino; - lp->dev = current_stat.st_dev; - strcpy (lp->name, p); - lp->next = linklist; - linklist = lp; + dump_dir (st, top_level, parent_device); + if (atime_preserve_option) + utimens (p, restore_times); + return; } - - /* This is not a link to a previously dumped file, so dump it. */ - - if (S_ISREG (current_stat.st_mode) -#ifdef S_ISCTG - || S_ISCTG (current_stat.st_mode) -#endif - ) + else { - int f; /* file descriptor */ - size_t bufsize; - ssize_t count; - off_t sizeleft; - union block *start; - int header_moved; - char isextended = 0; - int upperbound; -#if 0 - static int cried_once = 0; -#endif + /* Check for multiple links. */ + if (dump_hard_link (st)) + return; - header_moved = 0; + /* This is not a link to a previously dumped file, so dump it. */ - if (sparse_option) + if (S_ISREG (st->stat.st_mode) + || S_ISCTG (st->stat.st_mode)) { - /* Check the size of the file against the number of blocks - allocated for it, counting both data and indirect blocks. - If there is a smaller number of blocks that would be - necessary to accommodate a file of this size, this is safe - to say that we have a sparse file: at least one of those - blocks in the file is just a useless hole. For sparse - files not having more hole blocks than indirect blocks, the - sparseness will go undetected. */ - - /* Bruno Haible sent me these statistics for Linux. It seems - that some filesystems count indirect blocks in st_blocks, - while others do not seem to: - - minix-fs tar: size=7205, st_blocks=18 and ST_NBLOCKS=18 - extfs tar: size=7205, st_blocks=18 and ST_NBLOCKS=18 - ext2fs tar: size=7205, st_blocks=16 and ST_NBLOCKS=16 - msdos-fs tar: size=7205, st_blocks=16 and ST_NBLOCKS=16 - - Dick Streefland reports the previous numbers as misleading, - because ext2fs use 12 direct blocks, while minix-fs uses only - 6 direct blocks. Dick gets: - - ext2 size=20480 ls listed blocks=21 - minix size=20480 ls listed blocks=21 - msdos size=20480 ls listed blocks=20 - - It seems that indirect blocks *are* included in st_blocks. - The minix filesystem does not account for phantom blocks in - st_blocks, so `du' and `ls -s' give wrong results. So, the - --sparse option would not work on a minix filesystem. */ - - if (ST_NBLOCKS (current_stat) - < (current_stat.st_size / ST_NBLOCKSIZE - + (current_stat.st_size % ST_NBLOCKSIZE != 0))) - { - off_t filesize = current_stat.st_size; - int counter; + int fd; + enum dump_status status; - header = start_header (p, ¤t_stat); - if (header == NULL) + if (file_dumpable_p (st)) + { + fd = open (st->orig_file_name, + O_RDONLY | O_BINARY); + if (fd < 0) { - exit_status = TAREXIT_FAILURE; + if (!top_level && errno == ENOENT) + WARN ((0, 0, _("%s: File removed before we read it"), + quotearg_colon (st->orig_file_name))); + else + open_diag (st->orig_file_name); return; } - header->header.typeflag = GNUTYPE_SPARSE; - 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. */ - - upperbound = deal_with_sparse (p, header); - - /* See if we'll need an extended header later. */ - - if (upperbound > SPARSES_IN_OLDGNU_HEADER - 1) - header->oldgnu_header.isextended = 1; - - /* We store the "real" file size so we can show that in - case someone wants to list the archive, i.e., tar tvf - . It might be kind of disconcerting if the - shrunken file size was the one that showed up. */ - - OFF_TO_OCT (current_stat.st_size, - header->oldgnu_header.realsize); - - /* This will be the new "size" of the file, i.e., the size - 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_OCT (filesize, header->header.size); - - for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++) - { - if (!sparsearray[counter].numbytes) - break; - - OFF_TO_OCT (sparsearray[counter].offset, - header->oldgnu_header.sp[counter].offset); - SIZE_TO_OCT (sparsearray[counter].numbytes, - header->oldgnu_header.sp[counter].numbytes); - } - } - } - else - upperbound = SPARSES_IN_OLDGNU_HEADER - 1; - - sizeleft = current_stat.st_size; + else + fd = -1; - /* Don't bother opening empty, world readable files. Also do not open - files when archive is meant for /dev/null. */ - - if (dev_null_output - || (sizeleft == 0 && 0444 == (0444 & current_stat.st_mode))) - f = -1; - else - { - f = open (p, O_RDONLY | O_BINARY); - if (f < 0) + if (sparse_option && sparse_file_p (st)) { - WARN ((0, errno, _("Cannot add file %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; - return; + status = sparse_dump_file (fd, st); + if (status == dump_status_not_implemented) + status = dump_regular_file (fd, st); } - } - - /* If the file is sparse, we've already taken care of this. */ + else + status = dump_regular_file (fd, st); - if (!header_moved) - { - header = start_header (p, ¤t_stat); - if (header == NULL) + switch (status) { - if (f >= 0) - close (f); - exit_status = TAREXIT_FAILURE; - return; - } - } -#ifdef S_ISCTG - /* Mark contiguous files, if we support them. */ - - if (archive_format != V7_FORMAT && S_ISCTG (current_stat.st_mode)) - header->header.typeflag = CONTTYPE; -#endif - isextended = header->oldgnu_header.isextended; - save_typeflag = header->header.typeflag; - finish_header (header); - if (isextended) - { -#if 0 - int sum = 0; -#endif - int counter; -#if 0 - union block *exhdr; - int arraybound = SPARSES_IN_SPARSE_HEADER; -#endif - /* static */ int index_offset = SPARSES_IN_OLDGNU_HEADER; + case dump_status_ok: + if (multi_volume_option) + assign_string (&save_name, 0); + dump_regular_finish (fd, st, original_ctime); + break; - extend: - exhdr = find_next_block (); + case dump_status_short: + if (multi_volume_option) + assign_string (&save_name, 0); + close (fd); + break; - if (exhdr == NULL) - { - exit_status = TAREXIT_FAILURE; + case dump_status_fail: + close (fd); return; - } - memset (exhdr->buffer, 0, BLOCKSIZE); - for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++) - { - if (counter + index_offset > upperbound) - break; - SIZE_TO_OCT (sparsearray[counter + index_offset].numbytes, - exhdr->sparse_header.sp[counter].numbytes); - OFF_TO_OCT (sparsearray[counter + index_offset].offset, - exhdr->sparse_header.sp[counter].offset); - } - set_next_block_after (exhdr); -#if 0 - sum += counter; - if (sum < upperbound) - goto extend; -#endif - if (index_offset + counter <= upperbound) - { - index_offset += counter; - exhdr->sparse_header.isextended = 1; - goto extend; + case dump_status_not_implemented: + abort (); } - } - if (save_typeflag == GNUTYPE_SPARSE) - { - if (finish_sparse_file (f, &sizeleft, current_stat.st_size, p)) - goto padit; - } - else - while (sizeleft > 0) - { - if (multi_volume_option) - { - assign_string (&save_name, p); - save_sizeleft = sizeleft; - save_totsize = current_stat.st_size; - } - start = find_next_block (); - - bufsize = available_space_after (start); - - if (sizeleft < bufsize) - { - /* Last read -- zero out area beyond. */ - - bufsize = sizeleft; - count = bufsize % BLOCKSIZE; - if (count) - memset (start->buffer + sizeleft, 0, - (size_t) (BLOCKSIZE - count)); - } - if (f < 0) - count = bufsize; - else - count = 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)); - goto padit; - } - sizeleft -= count; - - /* This is nonportable (the type of set_next_block_after's arg). */ - - set_next_block_after (start + (count - 1) / BLOCKSIZE); - - if (count == bufsize) - continue; - else - { - char buf[UINTMAX_STRSIZE_BOUND]; - ERROR ((0, 0, - _("File %s shrunk by %s bytes, padding with zeros"), - p, STRINGIFY_BIGINT (sizeleft, buf))); - goto padit; /* short read */ - } - } - - if (multi_volume_option) - assign_string (&save_name, NULL); - - if (f >= 0) - { - close (f); - if (atime_preserve_option) - utime (p, &restore_times); - } - if (remove_files_option) - { - if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); - } - return; - - /* File shrunk or gave error, pad out tape to match the size we - specified in the header. */ - - padit: - while (sizeleft > 0) - { - save_sizeleft = sizeleft; - start = find_next_block (); - memset (start->buffer, 0, BLOCKSIZE); - set_next_block_after (start); - sizeleft -= BLOCKSIZE; - } - if (multi_volume_option) - assign_string (&save_name, NULL); - if (f >= 0) - { - close (f); if (atime_preserve_option) - utime (p, &restore_times); - } - return; - } - -#ifdef S_ISLNK - else if (S_ISLNK (current_stat.st_mode)) - { - int size; - char *buffer = (char *) alloca (PATH_MAX + 1); - - 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; + utimens (st->orig_file_name, restore_times); + file_count_links (st); return; } - buffer[size] = '\0'; - if (size >= NAME_FIELD_SIZE) - write_long (buffer, GNUTYPE_LONGLINK); - assign_string (¤t_link_name, buffer); - - current_stat.st_size = 0; /* force 0 size on symlink */ - header = start_header (p, ¤t_stat); - if (header == NULL) +#ifdef HAVE_READLINK + else if (S_ISLNK (st->stat.st_mode)) { - exit_status = TAREXIT_FAILURE; - return; - } - strncpy (header->header.linkname, buffer, NAME_FIELD_SIZE); - header->header.linkname[NAME_FIELD_SIZE - 1] = '\0'; - header->header.typeflag = SYMTYPE; - finish_header (header); /* nothing more to do to it */ - if (remove_files_option) - { - if (unlink (p) == -1) - ERROR ((0, errno, _("Cannot remove %s"), p)); - } - return; - } -#endif /* S_ISLNK */ - - else if (S_ISDIR (current_stat.st_mode)) - { - DIR *directory; - struct dirent *entry; - char *namebuf; - size_t buflen; - 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. */ - - if (access (p, R_OK) == -1 && geteuid () != 0) - { - WARN ((0, errno, _("Cannot add directory %s"), p)); - if (!ignore_failed_read_option) - exit_status = TAREXIT_FAILURE; - return; - } - - /* Build new prototype name. Ensure exactly one trailing slash. */ - - len = strlen (p); - buflen = len + NAME_FIELD_SIZE; - namebuf = xmalloc (buflen + 1); - strncpy (namebuf, p, buflen); - while (len >= 1 && namebuf[len - 1] == '/') - len--; - namebuf[len++] = '/'; - namebuf[len] = '\0'; - - if (1) - { - /* The "1" above used to be "archive_format != V7_FORMAT", GNU tar - was just not writing directory blocks at all. Daniel Trinkle - writes: ``All old versions of tar I have ever seen have - correctly archived an empty directory. The really old ones I - checked included HP-UX 7 and Mt. Xinu More/BSD. There may be - some subtle reason for the exclusion that I don't know, but the - current behavior is broken.'' I do not know those subtle - reasons either, so until these are reported (anew?), just allow - directory blocks to be written even with old archives. */ - - current_stat.st_size = 0; /* force 0 size on dir */ - - /* FIXME: If people could really read standard archives, this - should be: - - header - = start_header (standard_option ? p : namebuf, ¤t_stat); - - but since they'd interpret DIRTYPE blocks as regular - files, we'd better put the / on the name. */ - - header = start_header (namebuf, ¤t_stat); - if (header == NULL) + char *buffer; + int size; + size_t linklen = st->stat.st_size; + if (linklen != st->stat.st_size || linklen + 1 == 0) + xalloc_die (); + buffer = (char *) alloca (linklen + 1); + size = readlink (p, buffer, linklen + 1); + if (size < 0) { - exit_status = TAREXIT_FAILURE; - return; /* eg name too long */ + readlink_diag (p); + return; } + buffer[size] = '\0'; + assign_string (&st->link_name, buffer); + if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size) + write_long_link (st); + + block_ordinal = current_block_ordinal (); + st->stat.st_size = 0; /* force 0 size on symlink */ + header = start_header (st); + if (!header) + return; + tar_copy_str (header->header.linkname, buffer, NAME_FIELD_SIZE); + header->header.typeflag = SYMTYPE; + finish_header (st, header, block_ordinal); + /* nothing more to do to it */ - if (incremental_option) - header->header.typeflag = GNUTYPE_DUMPDIR; - else /* if (standard_option) */ - header->header.typeflag = DIRTYPE; - - /* If we're gnudumping, we aren't done yet so don't close it. */ - - if (!incremental_option) - finish_header (header); /* done with directory header */ - } - - if (incremental_option && gnu_list_name->dir_contents) - { - off_t sizeleft; - off_t totsize; - size_t bufsize; - union block *start; - ssize_t count; - const char *buffer, *p_buffer; - - buffer = gnu_list_name->dir_contents; /* FOO */ - totsize = 0; - for (p_buffer = buffer; p_buffer && *p_buffer;) - { - size_t tmp; - - tmp = strlen (p_buffer) + 1; - totsize += tmp; - p_buffer += tmp; - } - totsize++; - OFF_TO_OCT (totsize, header->header.size); - finish_header (header); - p_buffer = buffer; - sizeleft = totsize; - while (sizeleft > 0) + if (remove_files_option) { - if (multi_volume_option) - { - assign_string (&save_name, p); - save_sizeleft = sizeleft; - save_totsize = totsize; - } - start = find_next_block (); - bufsize = available_space_after (start); - if (sizeleft < bufsize) - { - bufsize = sizeleft; - count = bufsize % BLOCKSIZE; - if (count) - memset (start->buffer + sizeleft, 0, - (size_t) (BLOCKSIZE - count)); - } - memcpy (start->buffer, p_buffer, bufsize); - sizeleft -= bufsize; - p_buffer += bufsize; - set_next_block_after (start + (bufsize - 1) / BLOCKSIZE); + if (unlink (p) == -1) + unlink_error (p); } - if (multi_volume_option) - assign_string (&save_name, NULL); - if (atime_preserve_option) - utime (p, &restore_times); + file_count_links (st); return; } - - /* 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; - - /* 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. */ - - if (one_file_system_option && !top_level - && parent_device != current_stat.st_dev) +#endif + else if (S_ISCHR (st->stat.st_mode)) + type = CHRTYPE; + else if (S_ISBLK (st->stat.st_mode)) + type = BLKTYPE; + else if (S_ISFIFO (st->stat.st_mode)) + type = FIFOTYPE; + else if (S_ISSOCK (st->stat.st_mode)) { - if (verbose_option) - WARN ((0, 0, _("%s: On a different filesystem; not dumped"), p)); + WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p))); return; } - - /* Now output all the files in the directory. */ - - errno = 0; /* FIXME: errno should be read-only */ - - directory = opendir (p); - if (!directory) + else if (S_ISDOOR (st->stat.st_mode)) { - ERROR ((0, errno, _("Cannot open directory %s"), p)); + WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p))); return; } - - /* Hack to remove "./" from the front of all the file names. */ - - if (len == 2 && namebuf[0] == '.' && namebuf[1] == '/') - len = 0; - - /* FIXME: Should speed this up by cd-ing into the dir. */ - - while (entry = readdir (directory), entry) + else { - /* Skip `.' and `..'. */ - - if (is_dot_or_dotdot (entry->d_name)) - continue; - - if ((int) NAMLEN (entry) + len >= buflen) - { - buflen = len + NAMLEN (entry); - namebuf = (char *) xrealloc (namebuf, buflen + 1); -#if 0 - namebuf[len] = '\0'; - ERROR ((0, 0, _("File name %s%s too long"), - namebuf, entry->d_name)); - continue; -#endif - } - strcpy (namebuf + len, entry->d_name); - if (exclude_option && check_exclude (namebuf)) - continue; - dump_file (namebuf, our_device, 0); + unknown_file_error (p); + return; } - - closedir (directory); - free (namebuf); - if (atime_preserve_option) - utime (p, &restore_times); - return; } -#ifdef S_ISCHR - else if (S_ISCHR (current_stat.st_mode)) - type = CHRTYPE; -#endif - -#ifdef S_ISBLK - else if (S_ISBLK (current_stat.st_mode)) - type = BLKTYPE; -#endif - - /* Avoid screwy apollo lossage where S_IFIFO == S_IFSOCK. */ - -#if (_ISP__M68K == 0) && (_ISP__A88K == 0) && defined(S_ISFIFO) - else if (S_ISFIFO (current_stat.st_mode)) - type = FIFOTYPE; -#endif - -#ifdef S_ISSOCK - else if (S_ISSOCK (current_stat.st_mode)) - type = FIFOTYPE; -#endif - - else - goto unknown; - if (archive_format == V7_FORMAT) - goto unknown; - - current_stat.st_size = 0; /* force 0 size */ - header = start_header (p, ¤t_stat); - if (header == NULL) { - exit_status = TAREXIT_FAILURE; - return; /* eg name too long */ + unknown_file_error (p); + return; } + block_ordinal = current_block_ordinal (); + st->stat.st_size = 0; /* force 0 size */ + header = start_header (st); + if (!header) + return; header->header.typeflag = type; -#if defined(S_IFBLK) || defined(S_IFCHR) if (type != FIFOTYPE) { - MAJOR_TO_OCT (major (current_stat.st_rdev), header->header.devmajor); - MINOR_TO_OCT (minor (current_stat.st_rdev), header->header.devminor); + MAJOR_TO_CHARS (major (st->stat.st_rdev), + header->header.devmajor); + MINOR_TO_CHARS (minor (st->stat.st_rdev), + header->header.devminor); } -#endif - finish_header (header); + finish_header (st, header, block_ordinal); 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)); +void +dump_file (char *p, int top_level, dev_t parent_device) +{ + struct tar_stat_info st; + tar_stat_init (&st); + dump_file0 (&st, p, top_level, parent_device); + tar_stat_destroy (&st); }