/* Create a tar archive.
- Copyright 1985,92,93,94,96,97,99,2000, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1985, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
+ 2003 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
{
dev_t dev;
ino_t ino;
+ size_t nlink;
char name[1];
};
\f
static void
to_chars (int negative, uintmax_t value, size_t valsize,
- uintmax_t (*substitute) PARAMS ((int *)),
+ uintmax_t (*substitute) (int *),
char *where, size_t size, const char *type)
{
int base256_allowed = (archive_format == GNU_FORMAT
{
to_chars (0, v, sizeof v, 0, p, s, "uintmax_t");
}
+
+void
+string_to_chars (char *str, char *p, size_t s)
+{
+ strncpy (p, str, s);
+ p[s-1] = 0;
+}
+
\f
/* Writing routines. */
/* FIXME: Cross recursion between start_header and write_long! */
-static union block *start_header PARAMS ((const char *, struct stat *));
+static union block *start_header (const char *, struct tar_stat_info *);
static void
write_long (const char *p, char type)
size_t size = strlen (p) + 1;
size_t bufsize;
union block *header;
- struct stat foo;
+ struct tar_stat_info foo;
memset (&foo, 0, sizeof foo);
- foo.st_size = size;
+ foo.stat.st_size = size;
header = start_header ("././@LongLink", &foo);
header->header.typeflag = type;
- finish_header (header);
+ finish_header (header, -1);
header = find_next_block ();
memset (header->buffer + size, 0, bufsize - size);
set_next_block_after (header + (size - 1) / BLOCKSIZE);
}
-\f
-/* Return a suffix of the file NAME that is a relative file name.
- Warn about `..' in file names. But return NAME if the user wants
- absolute file names. */
-static char const *
-relativize (char const *name)
+
+/* Write a long link name, depending on the current archive format */
+static void
+write_long_link (struct tar_stat_info *st)
{
- if (! absolute_names_option)
- {
- {
- static int warned_once;
- if (! warned_once && contains_dot_dot (name))
- {
- warned_once = 1;
- WARN ((0, 0, _("Member names contain `..'")));
- }
- }
+ if (archive_format == POSIX_FORMAT)
+ xheader_store ("linkpath", st);
+ else
+ write_long (st->link_name, GNUTYPE_LONGNAME);
+}
- {
- size_t prefix_len = FILESYSTEM_PREFIX_LEN (name);
+/* NOTE: Cross recursion between start_header and write_extended */
- while (ISSLASH (name[prefix_len]))
- prefix_len++;
+static union block *
+write_extended (union block *old_header, char type)
+{
+ union block *header, hp;
+ struct tar_stat_info foo;
+ size_t size;
+ char *p;
- if (prefix_len)
- {
- static int warned_once;
- if (!warned_once)
- {
- warned_once = 1;
- WARN ((0, 0, _("Removing leading `%.*s' from member names"),
- (int) prefix_len, name));
- }
- name += prefix_len;
- }
- }
+ if (extended_header.buffer || extended_header.stk == NULL)
+ return old_header; /* Prevent recursion */
+
+ xheader_finish (&extended_header);
+ size = extended_header.size;
+ memset (&foo, 0, sizeof foo);
+ foo.stat.st_mode = S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH;
+ time (&foo.stat.st_ctime);
+ foo.stat.st_atime = foo.stat.st_ctime;
+ foo.stat.st_mtime = foo.stat.st_ctime;
+ foo.stat.st_size = size;
+
+ memcpy (hp.buffer, old_header, sizeof (hp));
+
+ header = start_header ("././@PaxHeader", &foo);
+ header->header.typeflag = type;
+
+ finish_header (header, -1);
+
+ p = extended_header.buffer;
+
+ do
+ {
+ size_t len;
+
+ header = find_next_block ();
+ len = BLOCKSIZE;
+ if (len > size)
+ len = size;
+ memcpy (header->buffer, p, len);
+ if (len < BLOCKSIZE)
+ memset (header->buffer + len, 0, BLOCKSIZE - len);
+ p += len;
+ size -= len;
+ set_next_block_after (header);
}
+ while (size > 0);
- return name;
+ xheader_destroy (&extended_header);
+ header = find_next_block ();
+ memcpy (header, &hp.buffer, sizeof (hp.buffer));
+ return header;
}
+
\f
/* Header handling. */
and return its address. */
static union block *
-start_header (const char *name, struct stat *st)
+start_header (const char *name, struct tar_stat_info *st)
{
union block *header;
- name = relativize (name);
-
+ name = safer_name_suffix (name, 0);
+ assign_string (&st->file_name, name);
+
if (sizeof header->header.name <= strlen (name))
- write_long (name, GNUTYPE_LONGNAME);
+ {
+ if (archive_format == POSIX_FORMAT)
+ xheader_store ("path", st);
+ else
+ write_long (name, GNUTYPE_LONGNAME);
+ }
+
header = find_next_block ();
memset (header->buffer, 0, sizeof (union block));
- assign_string (¤t_file_name, name);
+ assign_string (¤t_stat_info.file_name, name);
strncpy (header->header.name, name, NAME_FIELD_SIZE);
header->header.name[NAME_FIELD_SIZE - 1] = '\0';
-
+
/* 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 & ~MODE_ALL)
- | 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));
/* Paul Eggert tried the trivial test ($WRITER cf a b; $READER tvf a)
for a few tars and came up with the following interoperability
acceptor for Paul's test. */
if (archive_format == V7_FORMAT)
- MODE_TO_CHARS (st->st_mode & MODE_ALL, header->header.mode);
+ MODE_TO_CHARS (st->stat.st_mode & MODE_ALL, header->header.mode);
+ else
+ MODE_TO_CHARS (st->stat.st_mode, header->header.mode);
+
+ if (st->stat.st_uid > MAXOCTAL7 && archive_format == POSIX_FORMAT)
+ xheader_store ("uid", st);
+ else
+ UID_TO_CHARS (st->stat.st_uid, header->header.uid);
+
+ if (st->stat.st_gid > MAXOCTAL7 && archive_format == POSIX_FORMAT)
+ xheader_store ("gid", st);
else
- MODE_TO_CHARS (st->st_mode, header->header.mode);
+ GID_TO_CHARS (st->stat.st_gid, header->header.gid);
- UID_TO_CHARS (st->st_uid, header->header.uid);
- GID_TO_CHARS (st->st_gid, header->header.gid);
- OFF_TO_CHARS (st->st_size, header->header.size);
- TIME_TO_CHARS (st->st_mtime, header->header.mtime);
+ if (st->stat.st_size > MAXOCTAL11 && archive_format == POSIX_FORMAT)
+ xheader_store ("size", st);
+ else
+ OFF_TO_CHARS (st->stat.st_size, header->header.size);
- if (incremental_option)
+ TIME_TO_CHARS (st->stat.st_mtime, header->header.mtime);
+
+ /* FIXME */
+ if (S_ISCHR (st->stat.st_mode)
+ || S_ISBLK (st->stat.st_mode))
+ {
+ st->devmajor = major (st->stat.st_rdev);
+ st->devminor = minor (st->stat.st_rdev);
+
+ if (st->devmajor > MAXOCTAL7 && archive_format == POSIX_FORMAT)
+ xheader_store ("devmajor", st);
+ else
+ MAJOR_TO_CHARS (st->devmajor, header->header.devmajor);
+
+ if (st->devminor > MAXOCTAL7 && archive_format == POSIX_FORMAT)
+ xheader_store ("devminor", st);
+ else
+ MAJOR_TO_CHARS (st->devminor, header->header.devminor);
+ }
+ else
+ {
+ MAJOR_TO_CHARS (0, header->header.devmajor);
+ MINOR_TO_CHARS (0, header->header.devminor);
+ }
+
+ if (archive_format == POSIX_FORMAT)
+ {
+ xheader_store ("atime", st);
+ xheader_store ("ctime", st);
+ }
+ else if (incremental_option)
if (archive_format == OLDGNU_FORMAT)
{
- TIME_TO_CHARS (st->st_atime, header->oldgnu_header.atime);
- TIME_TO_CHARS (st->st_ctime, header->oldgnu_header.ctime);
+ 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;
}
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)
+ xheader_store ("uname", st);
+ else
+ UNAME_TO_CHARS (st->uname, header->header.uname);
+
+ if (archive_format == POSIX_FORMAT
+ && strlen (st->gname) > GNAME_FIELD_SIZE)
+ xheader_store ("gname", st);
+ else
+ 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. */
+ 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 (union block *header)
+finish_header (union block *header, off_t block_ordinal)
{
size_t i;
int sum;
char *p;
+ /* 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 != XHDTYPE
+ && header->header.typeflag != XGLTYPE)
+ {
+ /* These globals are parameters to print_header, sigh. */
+
+ current_header = header;
+ /* current_stat_info is already set up. */
+ current_format = archive_format;
+ print_header (block_ordinal);
+ }
+
+ header = write_extended (header, XHDTYPE);
+
memcpy (header->header.chksum, CHKBLANKS, sizeof header->header.chksum);
sum = 0;
uintmax_to_chars ((uintmax_t) sum, header->header.chksum, 7);
- if (verbose_option
- && header->header.typeflag != GNUTYPE_LONGLINK
- && header->header.typeflag != GNUTYPE_LONGNAME)
- {
- /* These globals are parameters to print_header, sigh. */
-
- current_header = header;
- /* current_stat is already set up. */
- current_format = archive_format;
- print_header ();
- }
-
set_next_block_after (header);
}
\f
return 1;
}
-static void
+void
init_sparsearray (void)
{
- sp_array_size = 10;
-
- /* Make room for our scratch space -- initially is 10 elts long. */
-
- sparsearray = xmalloc (sp_array_size * sizeof (struct sp_array));
+ if (! sp_array_size)
+ sp_array_size = SPARSES_IN_OLDGNU_HEADER;
+ sparsearray = xmalloc (sp_array_size * sizeof *sparsearray);
}
static off_t
return ((link1->dev ^ link2->dev) | (link1->ino ^ link2->ino)) == 0;
}
+/* 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;
+
/* 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. PARENT_DEVICE is the device of P's
+ 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.
- Set global CURRENT_STAT to stat output for this file. */
+ Set global CURRENT_STAT_INFO to stat output for this file. */
/* FIXME: One should make sure that for *every* path leading to setting
exit_status to failure, a clear diagnostic has been issued. */
char save_typeflag;
time_t original_ctime;
struct utimbuf restore_times;
+ off_t block_ordinal = -1;
/* FIXME: `header' might be used uninitialized in this
function. Reported by Bruno Haible. */
if (interactive_option && !confirm ("add", p))
return;
- if (deref_stat (dereference_option, p, ¤t_stat) != 0)
+ if (deref_stat (dereference_option, p, ¤t_stat_info.stat) != 0)
{
if (ignore_failed_read_option)
stat_warn (p);
return;
}
- original_ctime = current_stat.st_ctime;
- restore_times.actime = current_stat.st_atime;
- restore_times.modtime = current_stat.st_mtime;
+ original_ctime = current_stat_info.stat.st_ctime;
+ restore_times.actime = current_stat_info.stat.st_atime;
+ restore_times.modtime = current_stat_info.stat.st_mtime;
#ifdef S_ISHIDDEN
- if (S_ISHIDDEN (current_stat.st_mode))
+ if (S_ISHIDDEN (current_stat_info.stat.st_mode))
{
char *new = (char *) alloca (strlen (p) + 2);
if (new)
put in the archive. */
if ((0 < top_level || !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))
+ && !S_ISDIR (current_stat_info.stat.st_mode)
+ && current_stat_info.stat.st_mtime < newer_mtime_option
+ && (!after_date_option || current_stat_info.stat.st_ctime < newer_ctime_option))
{
if (0 < top_level)
WARN ((0, 0, _("%s: file is unchanged; not dumped"),
#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 (ar_dev && current_stat_info.stat.st_dev == ar_dev && current_stat_info.stat.st_ino == ar_ino)
{
WARN ((0, 0, _("%s: file is the archive; not dumped"),
quotearg_colon (p)));
}
#endif
- if (S_ISDIR (current_stat.st_mode))
+ if (S_ISDIR (current_stat_info.stat.st_mode))
{
char *directory;
char const *entry;
char *namebuf;
size_t buflen;
size_t len;
- dev_t our_device = current_stat.st_dev;
+ dev_t our_device = current_stat_info.stat.st_dev;
errno = 0;
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 */
+ block_ordinal = current_block_ordinal ();
+ current_stat_info.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);
+ = start_header (standard_option ? p : namebuf, ¤t_stat_info);
but since they'd interpret DIRTYPE blocks as regular
files, we'd better put the / on the name. */
- header = start_header (namebuf, ¤t_stat);
+ header = start_header (namebuf, ¤t_stat_info);
if (incremental_option)
header->header.typeflag = GNUTYPE_DUMPDIR;
/* If we're gnudumping, we aren't done yet so don't close it. */
if (!incremental_option)
- finish_header (header); /* done with directory header */
+ finish_header (header, block_ordinal);
}
if (incremental_option && gnu_list_name->dir_contents)
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;
- }
+ 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, header->header.size);
- finish_header (header);
+ finish_header (header, block_ordinal);
p_buffer = buffer;
sizeleft = totsize;
while (sizeleft > 0)
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)
+ && parent_device != current_stat_info.stat.st_dev)
{
if (verbose_option)
WARN ((0, 0,
(entrylen = strlen (entry)) != 0;
entry += entrylen + 1)
{
- if (buflen <= len + entrylen)
+ if (buflen < len + entrylen)
{
buflen = len + entrylen;
namebuf = xrealloc (namebuf, buflen + 1);
return;
else
{
- /* Check for multiple links.
-
- 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. */
+ /* Check for multiple links. */
- if (1 < current_stat.st_nlink)
+ if (1 < current_stat_info.stat.st_nlink && link_table)
{
- static Hash_table *link_table;
- struct link *lp = xmalloc (sizeof *lp + strlen (p));
+ struct link lp;
struct link *dup;
- lp->ino = current_stat.st_ino;
- lp->dev = current_stat.st_dev;
- strcpy (lp->name, p);
-
- if (! ((link_table
- || (link_table = hash_initialize (0, 0, hash_link,
- compare_links, 0)))
- && (dup = hash_insert (link_table, lp))))
- xalloc_die ();
+ lp.ino = current_stat_info.stat.st_ino;
+ lp.dev = current_stat_info.stat.st_dev;
- if (dup != lp)
+ if ((dup = hash_lookup (link_table, &lp)))
{
/* We found a link. */
- char const *link_name = dup->name;
-
- free (lp);
+ char const *link_name = safer_name_suffix (dup->name, 1);
+ dup->nlink--;
+
+ block_ordinal = current_block_ordinal ();
+ assign_string (¤t_stat_info.link_name, link_name);
if (NAME_FIELD_SIZE <= strlen (link_name))
- write_long (link_name, GNUTYPE_LONGLINK);
- assign_string (¤t_link_name, link_name);
+ write_long_link (¤t_stat_info);
- current_stat.st_size = 0;
- header = start_header (p, ¤t_stat);
+ current_stat_info.stat.st_size = 0;
+ header = start_header (p, ¤t_stat_info);
strncpy (header->header.linkname, link_name, NAME_FIELD_SIZE);
/* Force null termination. */
header->header.linkname[NAME_FIELD_SIZE - 1] = 0;
header->header.typeflag = LNKTYPE;
- finish_header (header);
+ finish_header (header, block_ordinal);
/* FIXME: Maybe remove from table after all links found? */
if (remove_files_option && unlink (p) != 0)
unlink_error (p);
- /* We dumped it. */
+ /* We dumped it, and we don't need to put it in the
+ table again. */
return;
}
}
/* This is not a link to a previously dumped file, so dump it. */
- if (S_ISREG (current_stat.st_mode)
- || S_ISCTG (current_stat.st_mode))
+ if (S_ISREG (current_stat_info.stat.st_mode)
+ || S_ISCTG (current_stat_info.stat.st_mode))
{
int f; /* file descriptor */
size_t bufsize;
{
/* 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
+ If there is a smaller number of blocks than 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
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)))
+ if (ST_NBLOCKS (current_stat_info.stat)
+ < (current_stat_info.stat.st_size / ST_NBLOCKSIZE
+ + (current_stat_info.stat.st_size % ST_NBLOCKSIZE != 0)))
{
int counter;
- header = start_header (p, ¤t_stat);
+ block_ordinal = current_block_ordinal ();
+ header = start_header (p, ¤t_stat_info);
header->header.typeflag = GNUTYPE_SPARSE;
header_moved = 1;
<file>. It might be kind of disconcerting if the
shrunken file size was the one that showed up. */
- OFF_TO_CHARS (current_stat.st_size,
+ OFF_TO_CHARS (current_stat_info.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. */
- current_stat.st_size = find_new_file_size (sparses);
- OFF_TO_CHARS (current_stat.st_size, header->header.size);
+ current_stat_info.stat.st_size = find_new_file_size (sparses);
+ OFF_TO_CHARS (current_stat_info.stat.st_size, header->header.size);
for (counter = 0;
counter < sparses && counter < SPARSES_IN_OLDGNU_HEADER;
}
}
- sizeleft = current_stat.st_size;
+ sizeleft = current_stat_info.stat.st_size;
/* 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
- && MODE_R == (MODE_R & current_stat.st_mode)))
+ && MODE_R == (MODE_R & current_stat_info.stat.st_mode)))
f = -1;
else
{
/* If the file is sparse, we've already taken care of this. */
if (!header_moved)
- header = start_header (p, ¤t_stat);
+ {
+ block_ordinal = current_block_ordinal ();
+ header = start_header (p, ¤t_stat_info);
+ }
/* Mark contiguous files, if we support them. */
- if (archive_format != V7_FORMAT && S_ISCTG (current_stat.st_mode))
+ if (archive_format != V7_FORMAT && S_ISCTG (current_stat_info.stat.st_mode))
header->header.typeflag = CONTTYPE;
isextended = header->oldgnu_header.isextended;
save_typeflag = header->header.typeflag;
- finish_header (header);
+ finish_header (header, block_ordinal);
if (isextended)
{
int sparses_emitted = SPARSES_IN_OLDGNU_HEADER;
{
if (f < 0
|| finish_sparse_file (f, &sizeleft,
- current_stat.st_size, p))
+ current_stat_info.stat.st_size, p))
goto padit;
}
else
{
assign_string (&save_name, p);
save_sizeleft = sizeleft;
- save_totsize = current_stat.st_size;
+ save_totsize = current_stat_info.stat.st_size;
}
start = find_next_block ();
(ignore_failed_read_option
? read_warn_details
: read_error_details)
- (p, current_stat.st_size - sizeleft, bufsize);
+ (p, current_stat_info.stat.st_size - sizeleft, bufsize);
goto padit;
}
- sizeleft -= bufsize;
+ sizeleft -= count;
/* This is nonportable (the type of set_next_block_after's arg). */
char buf[UINTMAX_STRSIZE_BOUND];
memset (start->buffer + count, 0, bufsize - count);
WARN ((0, 0,
- _("%s: File shrank by %s bytes; padding with zeros"),
+ ngettext ("%s: File shrank by %s byte; padding with zeros",
+ "%s: File shrank by %s bytes; padding with zeros",
+ sizeleft),
quotearg_colon (p),
STRINGIFY_BIGINT (sizeleft, buf)));
if (! ignore_failed_read_option)
{
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)
{
if (unlink (p) == -1)
unlink_error (p);
}
- return;
+ goto file_was_dumped;
/* File shrunk or gave error, pad out tape to match the size we
specified in the header. */
if (atime_preserve_option)
utime (p, &restore_times);
}
- return;
+ goto file_was_dumped;
}
#ifdef HAVE_READLINK
- else if (S_ISLNK (current_stat.st_mode))
+ else if (S_ISLNK (current_stat_info.stat.st_mode))
{
char *buffer;
int size;
- size_t linklen = current_stat.st_size;
- if (linklen != current_stat.st_size || linklen + 1 == 0)
+ size_t linklen = current_stat_info.stat.st_size;
+ if (linklen != current_stat_info.stat.st_size || linklen + 1 == 0)
xalloc_die ();
buffer = (char *) alloca (linklen + 1);
size = readlink (p, buffer, linklen + 1);
return;
}
buffer[size] = '\0';
+ assign_string (¤t_stat_info.link_name, buffer);
if (size >= NAME_FIELD_SIZE)
- write_long (buffer, GNUTYPE_LONGLINK);
- assign_string (¤t_link_name, buffer);
+ write_long_link (¤t_stat_info);
- current_stat.st_size = 0; /* force 0 size on symlink */
- header = start_header (p, ¤t_stat);
+ block_ordinal = current_block_ordinal ();
+ current_stat_info.stat.st_size = 0; /* force 0 size on symlink */
+ header = start_header (p, ¤t_stat_info);
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 */
+ finish_header (header, block_ordinal);
+ /* nothing more to do to it */
+
if (remove_files_option)
{
if (unlink (p) == -1)
unlink_error (p);
}
- return;
+ goto file_was_dumped;
}
#endif
- else if (S_ISCHR (current_stat.st_mode))
+ else if (S_ISCHR (current_stat_info.stat.st_mode))
type = CHRTYPE;
- else if (S_ISBLK (current_stat.st_mode))
+ else if (S_ISBLK (current_stat_info.stat.st_mode))
type = BLKTYPE;
- else if (S_ISFIFO (current_stat.st_mode))
+ else if (S_ISFIFO (current_stat_info.stat.st_mode))
type = FIFOTYPE;
- else if (S_ISSOCK (current_stat.st_mode))
+ else if (S_ISSOCK (current_stat_info.stat.st_mode))
{
WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p)));
return;
}
- else if (S_ISDOOR (current_stat.st_mode))
+ else if (S_ISDOOR (current_stat_info.stat.st_mode))
{
WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p)));
return;
if (archive_format == V7_FORMAT)
goto unknown;
- current_stat.st_size = 0; /* force 0 size */
- header = start_header (p, ¤t_stat);
+ block_ordinal = current_block_ordinal ();
+ current_stat_info.stat.st_size = 0; /* force 0 size */
+ header = start_header (p, ¤t_stat_info);
header->header.typeflag = type;
if (type != FIFOTYPE)
{
- MAJOR_TO_CHARS (major (current_stat.st_rdev), header->header.devmajor);
- MINOR_TO_CHARS (minor (current_stat.st_rdev), header->header.devminor);
+ MAJOR_TO_CHARS (major (current_stat_info.stat.st_rdev), header->header.devmajor);
+ MINOR_TO_CHARS (minor (current_stat_info.stat.st_rdev), header->header.devminor);
}
- finish_header (header);
+ finish_header (header, block_ordinal);
if (remove_files_option)
{
if (unlink (p) == -1)
unlink_error (p);
}
- return;
+ goto file_was_dumped;
unknown:
WARN ((0, 0, _("%s: Unknown file type; file ignored"),
quotearg_colon (p)));
if (! ignore_failed_read_option)
exit_status = TAREXIT_FAILURE;
+ return;
+
+file_was_dumped:
+ if (1 < current_stat_info.stat.st_nlink)
+ {
+ struct link *dup;
+ struct link *lp = xmalloc (offsetof (struct link, name)
+ + strlen (p) + 1);
+ lp->ino = current_stat_info.stat.st_ino;
+ lp->dev = current_stat_info.stat.st_dev;
+ lp->nlink = current_stat_info.stat.st_nlink;
+ strcpy (lp->name, p);
+
+ if (! ((link_table
+ || (link_table = hash_initialize (0, 0, hash_link,
+ compare_links, 0)))
+ && (dup = hash_insert (link_table, lp))))
+ xalloc_die ();
+
+ if (dup != 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 ()
+{
+ 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"), lp->name));
+ }
+ }
}
projects / chaz / tar / blobdiff