/* 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
};
#endif
+#include <quotearg.h>
+
#include "common.h"
+#include <hash.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. */
-
struct link
{
- struct link *next;
dev_t dev;
ino_t ino;
char name[1];
};
-
-static struct link *linklist; /* points to first link in list */
\f
/* The maximum uintmax_t value that can be represented with DIGITS digits,
assuming that each digit is BITS_PER_DIGIT wide. */
if (! warned_once)
{
warned_once = 1;
- WARN ((0, 0, _("Generating negative octal headers\n")));
+ WARN ((0, 0, _("Generating negative octal headers")));
}
where[size - 1] = '\0';
to_octal (value & MAX_VAL_WITH_DIGITS (valsize * CHAR_BIT, 1),
\f
/* Writing routines. */
-/*-----------------------------------------------------------------------.
-| Just zeroes out the buffer so we don't confuse ourselves with leftover |
-| data. |
-`-----------------------------------------------------------------------*/
-
+/* Zero out the buffer so we don't confuse ourselves with leftover
+ data. */
static void
clear_buffer (char *buffer)
{
memset (buffer, 0, BLOCKSIZE);
}
-/*-------------------------------------------------------------------------.
-| Write the EOT block(s). We 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. |
-`-------------------------------------------------------------------------*/
-
+/* 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)
{
set_next_block_after (pointer);
}
-/*-----------------------------------------------------.
-| Write a GNUTYPE_LONGLINK or GNUTYPE_LONGNAME block. |
-`-----------------------------------------------------*/
+/* Write a GNUTYPE_LONGLINK or GNUTYPE_LONGNAME block. */
/* FIXME: Cross recursion between start_header and write_long! */
if (!warned_once)
{
warned_once = 1;
- WARN ((0, 0, _("Removing `%.*s' prefix from archive names"),
+ WARN ((0, 0, _("Removing leading `%.*s' from member names"),
(int) prefix_len, name));
}
name += prefix_len;
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))
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. |
-`-------------------------------------------------------------------------*/
-
+/* 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)
{
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)
current_format = archive_format;
print_header ();
}
+
+ set_next_block_after (header);
}
\f
/* 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. |
-`-------------------------------------------------------------------------*/
-
+/* 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)
{
return 1;
}
-/*---.
-| ? |
-`---*/
-
static void
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;
}
-/*-----------------------------------------------------------------------.
-| 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. |
-`-----------------------------------------------------------------------*/
+/* 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. */
size_t numbytes = 0;
off_t offset = 0;
int file;
- int sparse_index = 0;
+ int sparses = 0;
ssize_t count;
char buffer[BLOCKSIZE];
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,
{
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;
}
if (!zero_block_p (buffer))
{
if (!numbytes)
- sparsearray[sparse_index].offset = offset;
+ sparsearray[sparses].offset = offset;
numbytes += count;
}
else
}
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 close (file) == 0 && 0 <= count ? sparses : 0;
}
-/*---.
-| ? |
-`---*/
-
static int
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;
}
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;
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
\f
/* Main functions of this module. */
-/*---.
-| ? |
-`---*/
-
void
create_archive (void)
{
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)
if (!excluded_name (p))
{
- strcpy (buffer, p);
- if (p[strlen (p) - 1] != '/')
- strcat (buffer, "/");
- bufp = buffer + strlen (buffer);
+ 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 (buffer[plen - 1] != '/')
+ buffer[plen++] = '/';
q = gnu_list_name->dir_contents;
if (q)
- for (; *q; q += strlen (q) + 1)
- if (*q == 'Y')
- {
- strcpy (bufp, q + 1);
- dump_file (buffer, -1, (dev_t) 0);
- }
+ while (*q)
+ {
+ 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);
}
write_directory_file ();
}
+
+/* Calculate the hash of a link. */
+static unsigned
+hash_link (void const *entry, unsigned n_buckets)
+{
+ struct link const *link = entry;
+ return (uintmax_t) (link->dev ^ link->ino) % 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;
+}
+
/* 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. */
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' might be used uninitialized in this
function. Reported by Bruno Haible. */
if (interactive_option && !confirm ("add", p))
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))
&& (!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;
}
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
if (S_ISDIR (current_stat.st_mode))
{
- DIR *directory;
- struct dirent *entry;
+ char *directory;
+ char const *entry;
+ size_t entrylen;
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. */
+ errno = 0;
- if (access (p, R_OK) == -1 && geteuid () != 0)
+ directory = savedir (p, current_stat.st_size);
+ if (! directory)
{
- WARN ((0, errno, _("Cannot add directory %s"), p));
- if (!ignore_failed_read_option)
- exit_status = TAREXIT_FAILURE;
+ if (ignore_failed_read_option)
+ savedir_warn (p);
+ else
+ savedir_error (p);
return;
}
len = strlen (p);
buflen = len + NAME_FIELD_SIZE;
namebuf = xmalloc (buflen + 1);
- strncpy (namebuf, p, buflen);
+ memcpy (namebuf, p, len);
while (len >= 1 && namebuf[len - 1] == '/')
len--;
namebuf[len++] = '/';
}
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. */
&& 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)
+ for (entry = directory;
+ (entrylen = strlen (entry)) != 0;
+ entry += entrylen + 1)
{
- /* Skip `.', `..', and excluded file names. */
-
- if (is_dot_or_dotdot (entry->d_name))
- continue;
-
- if ((int) NAMLEN (entry) + len >= buflen)
+ if (buflen <= len + entrylen)
{
- buflen = len + NAMLEN (entry);
+ buflen = len + entrylen;
namebuf = xrealloc (namebuf, buflen + 1);
}
- strcpy (namebuf + len, entry->d_name);
+ strcpy (namebuf + len, entry);
if (!excluded_name (namebuf))
- dump_file (namebuf, our_device, 0);
+ dump_file (namebuf, 0, our_device);
}
- closedir (directory);
+ finish_dir:
+
+ free (directory);
free (namebuf);
if (atime_preserve_option)
utime (p, &restore_times);
{
/* 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. */
+ We maintain a table of all such files 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. */
if (1 < current_stat.st_nlink)
{
- struct link *lp;
+ static Hash_table *link_table;
+ struct link *lp = xmalloc (sizeof *lp + strlen (p));
+ struct link *dup;
+ lp->ino = current_stat.st_ino;
+ lp->dev = current_stat.st_dev;
+ strcpy (lp->name, p);
- /* FIXME: First quick and dirty. Hashing, etc later. */
+ if (! ((link_table
+ || (link_table = hash_initialize (0, 0, hash_link,
+ compare_links, 0)))
+ && (dup = hash_insert (link_table, lp))))
+ xalloc_die ();
- 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;
+ if (dup != lp)
+ {
+ /* We found a link. */
+ char const *link_name = dup->name;
- /* We found a link. */
+ free (lp);
- while (!absolute_names_option && *link_name == '/')
+ if (! absolute_names_option)
+ for (; *link_name == '/'; link_name++)
{
static int warned_once;
if (!warned_once)
WARN ((0, 0,
_("Removing leading `/' from link names")));
}
- 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);
- strncpy (header->header.linkname,
- link_name, NAME_FIELD_SIZE);
+ if (NAME_FIELD_SIZE <= strlen (link_name))
+ write_long (link_name, GNUTYPE_LONGLINK);
+ assign_string (¤t_link_name, link_name);
- /* Force null truncated. */
+ current_stat.st_size = 0;
+ header = start_header (p, ¤t_stat);
+ strncpy (header->header.linkname, link_name, NAME_FIELD_SIZE);
- header->header.linkname[NAME_FIELD_SIZE - 1] = 0;
+ /* Force null termination. */
+ header->header.linkname[NAME_FIELD_SIZE - 1] = 0;
- header->header.typeflag = LNKTYPE;
- finish_header (header);
+ header->header.typeflag = LNKTYPE;
+ finish_header (header);
- /* FIXME: Maybe remove from list after all links found? */
+ /* FIXME: Maybe remove from table after all links found? */
- if (remove_files_option)
- if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
+ if (remove_files_option && unlink (p) != 0)
+ unlink_error (p);
- /* We dumped it. */
- return;
- }
-
- /* Not found. Add it to the list of possible links. */
-
- lp = xmalloc (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;
+ /* We dumped it. */
+ return;
+ }
}
/* This is not a link to a previously dumped file, so dump it. */
union block *start;
int header_moved;
char isextended = 0;
- int upperbound;
+ int sparses = 0;
header_moved = 0;
< (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);
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
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;
sizeleft = current_stat.st_size;
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;
}
}
finish_header (header);
if (isextended)
{
- int counter;
- /* static */ int index_offset = SPARSES_IN_OLDGNU_HEADER;
+ int sparses_emitted = SPARSES_IN_OLDGNU_HEADER;
- extend:
- exhdr = find_next_block ();
- memset (exhdr->buffer, 0, BLOCKSIZE);
- for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
+ for (;;)
{
- if (counter + index_offset > upperbound)
+ int i;
+ exhdr = find_next_block ();
+ memset (exhdr->buffer, 0, BLOCKSIZE);
+ for (i = 0;
+ (i < SPARSES_IN_SPARSE_HEADER
+ && sparses_emitted + i < sparses);
+ i++)
+ {
+ SIZE_TO_CHARS (sparsearray[sparses_emitted + i].numbytes,
+ exhdr->sparse_header.sp[i].numbytes);
+ OFF_TO_CHARS (sparsearray[sparses_emitted + i].offset,
+ exhdr->sparse_header.sp[i].offset);
+ }
+ set_next_block_after (exhdr);
+ sparses_emitted += i;
+ if (sparses == sparses_emitted)
break;
-
- SIZE_TO_CHARS (sparsearray[counter + index_offset].numbytes,
- exhdr->sparse_header.sp[counter].numbytes);
- OFF_TO_CHARS (sparsearray[counter + index_offset].offset,
- exhdr->sparse_header.sp[counter].offset);
- }
- set_next_block_after (exhdr);
- if (index_offset + counter <= upperbound)
- {
- index_offset += counter;
exhdr->sparse_header.isextended = 1;
- goto extend;
}
-
}
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
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;
+ sizeleft -= bufsize;
/* This is nonportable (the type of set_next_block_after's arg). */
- set_next_block_after (start + (count - 1) / BLOCKSIZE);
+ set_next_block_after (start + (bufsize - 1) / BLOCKSIZE);
- if (count == bufsize)
- continue;
- else
+
+ if (count != bufsize)
{
char buf[UINTMAX_STRSIZE_BOUND];
- ERROR ((0, 0,
- _("File %s shrunk by %s bytes, padding with zeros"),
- p, STRINGIFY_BIGINT (sizeleft, buf)));
+ memset (start->buffer + count, 0, bufsize - count);
+ 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 */
}
}
{
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;
#ifdef HAVE_READLINK
else if (S_ISLNK (current_stat.st_mode))
{
+ char *buffer;
int size;
- char *buffer = (char *) alloca (PATH_MAX + 1);
-
- size = readlink (p, buffer, PATH_MAX + 1);
+ size_t linklen = current_stat.st_size;
+ if (linklen != current_stat.st_size || linklen + 1 == 0)
+ xalloc_die ();
+ buffer = (char *) alloca (linklen + 1);
+ size = readlink (p, buffer, linklen + 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';
if (remove_files_option)
{
if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
+ unlink_error (p);
}
return;
}
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;
+ 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"), quotearg_colon (p)));
+ return;
+ }
else
goto unknown;
}
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;
}
projects / chaz / tar / blobdiff