Improve listed incremental dumps.

[chaz/tar] / src / incremen.c

diff --git a/src/incremen.c b/src/incremen.c
index bde8dc39d77bb71a0369857eba4bcf38d25d13c0..564121796d7b2e8023c44580373e44c4f982fb63 100644 (file)
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -1,9 +1,11 @@
 /* GNU dump extensions to tar.
 /* GNU dump extensions to tar.

-   Copyright (C) 1988, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+
+   Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -13,703 +15,1757 @@
 
    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.,
 
    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>
+#include <hash.h>
+#include <quotearg.h>
+#include "common.h"

 
 

-#include "system.h"
+/* Incremental dump specialities.  */

 
 

-#include <time.h>
-time_t time ();
+/* Which child files to save under a directory.  */
+enum children
+  {
+    NO_CHILDREN,
+    CHANGED_CHILDREN,
+    ALL_CHILDREN
+  };

 
 

-#define ISDIGIT(Char) (ISASCII (Char) && isdigit (Char))
-#define ISSPACE(Char) (ISASCII (Char) && isspace (Char))
+#define DIRF_INIT     0x0001    /* directory structure is initialized
+                                  (procdir called at least once) */
+#define DIRF_NFS      0x0002    /* directory is mounted on nfs */
+#define DIRF_FOUND    0x0004    /* directory is found on fs */
+#define DIRF_NEW      0x0008    /* directory is new (not found
+                                  in the previous dump) */
+#define DIRF_RENAMED  0x0010    /* directory is renamed */

 
 

-#include "common.h"
-\f
-/* Variable sized generic character buffers.  */
+#define DIR_IS_INITED(d) ((d)->flags & DIRF_INIT)
+#define DIR_IS_NFS(d) ((d)->flags & DIRF_NFS)
+#define DIR_IS_FOUND(d) ((d)->flags & DIRF_FOUND)
+#define DIR_IS_NEW(d) ((d)->flags & DIRF_NEW)
+#define DIR_IS_RENAMED(d) ((d)->flags & DIRF_RENAMED)

 
 

-struct accumulator
+#define DIR_SET_FLAG(d,f) (d)->flags |= (f)
+#define DIR_CLEAR_FLAG(d,f) (d)->flags &= ~(f)
+
+struct dumpdir                 /* Dump directory listing */

 {
 {

-  int allocated;
-  int length;
-  char *pointer;
+  char *contents;              /* Actual contents */
+  size_t total;                /* Total number of elements */
+  size_t elc;                  /* Number of D/N/Y elements. */
+  char **elv;                  /* Array of D/N/Y elements */

 };
 
 };
 

-/* Amount of space guaranteed just after a reallocation.  */
-#define ACCUMULATOR_SLACK 50
+/* Directory attributes.  */
+struct directory
+  {
+    struct directory *next;
+    struct timespec mtime;      /* Modification time */
+    dev_t device_number;       /* device number for directory */
+    ino_t inode_number;                /* inode number for directory */
+    struct dumpdir *dump;       /* Directory contents */
+    struct dumpdir *idump;      /* Initial contents if the directory was
+                                  rescanned */
+    enum children children;     /* What to save under this directory */
+    unsigned flags;             /* See DIRF_ macros above */
+    struct directory *orig;     /* If the directory was renamed, points to
+                                  the original directory structure */
+    const char *tagfile;        /* Tag file, if the directory falls under
+                                  exclusion_tag_under */
+    char *caname;               /* canonical name */
+    char *name;                        /* file name of directory */
+  };
+
+struct dumpdir *
+dumpdir_create0 (const char *contents, const char *cmask)
+{
+  struct dumpdir *dump;
+  size_t i, total, ctsize, len;
+  char *p;
+  const char *q;
+  
+  for (i = 0, total = 0, ctsize = 1, q = contents; *q; total++, q += len)
+    {
+      len = strlen (q) + 1;
+      ctsize += len;
+      if (!cmask || strchr (cmask, *q))
+       i++;
+    }
+  dump = xmalloc (sizeof (*dump) + ctsize);
+  dump->contents = (char*)(dump + 1);
+  memcpy (dump->contents, contents, ctsize);
+  dump->total = total;
+  dump->elc = i;
+  dump->elv = xcalloc (i + 1, sizeof (dump->elv[0]));
+
+  for (i = 0, p = dump->contents; *p; p += strlen (p) + 1)
+    {
+      if (!cmask || strchr (cmask, *p))
+       dump->elv[i++] = p + 1;
+    }
+  dump->elv[i] = NULL;
+  return dump;
+}

 
 

-/*---------------------------------------------------------.
-| Return the accumulated data from an ACCUMULATOR buffer.  |
-`---------------------------------------------------------*/
+struct dumpdir *
+dumpdir_create (const char *contents)
+{
+  return dumpdir_create0 (contents, "YND");
+}

 
 

-static char *
-get_accumulator (struct accumulator *accumulator)
+void
+dumpdir_free (struct dumpdir *dump)

 {
 {

-  return accumulator->pointer;
+  free (dump->elv);
+  free (dump);

 }
 
 }
 

-/*-----------------------------------------------.
-| Allocate and return a new accumulator buffer.         |
-`-----------------------------------------------*/
+static int
+compare_dirnames (const void *first, const void *second)
+{
+  char const *const *name1 = first;
+  char const *const *name2 = second;
+  return strcmp (*name1, *name2);
+}

 
 

-static struct accumulator *
-new_accumulator (void)
+/* Locate NAME in the dumpdir array DUMP.
+   Return pointer to the slot in DUMP->contents, or NULL if not found */
+char *
+dumpdir_locate (struct dumpdir *dump, const char *name)

 {
 {

-  struct accumulator *accumulator
-    = (struct accumulator *) xmalloc (sizeof (struct accumulator));
+  char **ptr;
+  if (!dump)
+    return NULL;

 
 

-  accumulator->allocated = ACCUMULATOR_SLACK;
-  accumulator->pointer = (char *) xmalloc (ACCUMULATOR_SLACK);
-  accumulator->length = 0;
-  return accumulator;
+  ptr = bsearch (&name, dump->elv, dump->elc, sizeof (dump->elv[0]),
+                compare_dirnames);
+  return ptr ? *ptr - 1: NULL;

 }
 
 }
 

-/*-----------------------------------.
-| Deallocate an ACCUMULATOR buffer.  |
-`-----------------------------------*/
+struct dumpdir_iter
+{
+  struct dumpdir *dump; /* Dumpdir being iterated */
+  int all;              /* Iterate over all entries, not only D/N/Y */ 
+  size_t next;          /* Index of the next element */
+};

 
 

-static void
-delete_accumulator (struct accumulator *accumulator)
+char *
+dumpdir_next (struct dumpdir_iter *itr)

 {
 {

-  free (accumulator->pointer);
-  free (accumulator);
+  size_t cur = itr->next;
+  char *ret = NULL;
+  
+  if (itr->all)
+    {
+      ret = itr->dump->contents + cur;
+      if (*ret == 0)
+       return NULL;
+      itr->next += strlen (ret) + 1;
+    }
+  else if (cur < itr->dump->elc)
+    {
+      ret = itr->dump->elv[cur] - 1;
+      itr->next++;
+    }
+
+  return ret;

 }
 
 }
 

-/*----------------------------------------------------------------------.
-| At the end of an ACCUMULATOR buffer, add a DATA block of SIZE bytes.  |
-`----------------------------------------------------------------------*/
+char *
+dumpdir_first (struct dumpdir *dump, int all, struct dumpdir_iter **pitr)
+{
+  struct dumpdir_iter *itr = xmalloc (sizeof (*itr));
+  itr->dump = dump;
+  itr->all = all;
+  itr->next = 0;
+  *pitr = itr;
+  return dumpdir_next (itr);
+}

 
 

-static void
-add_to_accumulator (struct accumulator *accumulator,
-                   const char *data, int size)
+/* Return size in bytes of the dumpdir array P */
+size_t
+dumpdir_size (const char *p)

 {
 {

-  if (accumulator->length + size > accumulator->allocated)
+  size_t totsize = 0;
+
+  while (*p)

     {
     {

-      accumulator->allocated = accumulator->length + size + ACCUMULATOR_SLACK;
-      accumulator->pointer = (char *)
-       xrealloc (accumulator->pointer, (size_t) accumulator->allocated);
+      size_t size = strlen (p) + 1;
+      totsize += size;
+      p += size;

     }
     }

-  memcpy (accumulator->pointer + accumulator->length, data, (size_t) size);
-  accumulator->length += size;
+  return totsize + 1;

 }
 }

+

 \f
 \f

-/* Incremental dump specialities.  */
+static struct directory *dirhead, *dirtail;
+static Hash_table *directory_table;
+static Hash_table *directory_meta_table;
+
+#if HAVE_ST_FSTYPE_STRING
+  static char const nfs_string[] = "nfs";
+# define NFS_FILE_STAT(st) (strcmp ((st).st_fstype, nfs_string) == 0)
+#else
+# define ST_DEV_MSB(st) (~ (dev_t) 0 << (sizeof (st).st_dev * CHAR_BIT - 1))
+# define NFS_FILE_STAT(st) (((st).st_dev & ST_DEV_MSB (st)) != 0)
+#endif

 
 

-/* Current time.  */
-static time_t time_now;
+/* Calculate the hash of a directory.  */
+static size_t
+hash_directory_canonical_name (void const *entry, size_t n_buckets)
+{
+  struct directory const *directory = entry;
+  return hash_string (directory->caname, n_buckets);
+}

 
 

-/* List of directory names.  */
-struct directory
-  {
-    struct directory *next;    /* next entry in list */
-    const char *name;          /* path name of directory */
-    int device_number;         /* device number for directory */
-    int inode_number;          /* inode number for directory */
-    int allnew;
-    const char *dir_text;
-  };
-static struct directory *directory_list = NULL;
+/* Compare two directories for equality of their names. */
+static bool
+compare_directory_canonical_names (void const *entry1, void const *entry2)
+{
+  struct directory const *directory1 = entry1;
+  struct directory const *directory2 = entry2;
+  return strcmp (directory1->caname, directory2->caname) == 0;
+}
+
+static size_t
+hash_directory_meta (void const *entry, size_t n_buckets)
+{
+  struct directory const *directory = entry;
+  /* FIXME: Work out a better algorytm */
+  return (directory->device_number + directory->inode_number) % n_buckets;
+}
+
+/* Compare two directories for equality of their device and inode numbers. */
+static bool
+compare_directory_meta (void const *entry1, void const *entry2)
+{
+  struct directory const *directory1 = entry1;
+  struct directory const *directory2 = entry2;
+  return directory1->device_number == directory2->device_number
+            && directory1->inode_number == directory2->inode_number;
+}

 
 

-/*-------------------------------------------------------------------.
-| Create and link a new directory entry for directory NAME, having a |
-| DEVICE_NUMBER and a INODE_NUMBER, with some TEXT.                 |
-`-------------------------------------------------------------------*/
+/* Make a directory entry for given relative NAME and canonical name CANAME.
+   The latter is "stolen", i.e. the returned directory contains pointer to
+   it. */
+static struct directory *
+make_directory (const char *name, char *caname)
+{
+  size_t namelen = strlen (name);
+  struct directory *directory = xmalloc (sizeof (*directory));
+  directory->next = NULL;
+  directory->dump = directory->idump = NULL;
+  directory->orig = NULL;
+  directory->flags = false;
+  if (namelen && ISSLASH (name[namelen - 1]))
+    namelen--;
+  directory->name = xmalloc (namelen + 1);
+  memcpy (directory->name, name, namelen);
+  directory->name[namelen] = 0;
+  directory->caname = caname;
+  directory->tagfile = NULL;
+  return directory;
+}

 
 static void
 
 static void

-note_directory (char *name, dev_t device_number, ino_t inode_number,
-               const char *text)
+free_directory (struct directory *dir)

 {
 {

-  struct directory *directory
-    = (struct directory *) xmalloc (sizeof (struct directory));
+  free (dir->caname);
+  free (dir->name);
+  free (dir);
+}

 
 

-  directory->next = directory_list;
-  directory_list = directory;
+static struct directory *
+attach_directory (const char *name)
+{
+  char *cname = normalize_filename (name);
+  struct directory *dir = make_directory (name, cname);
+  if (dirtail)
+    dirtail->next = dir;
+  else
+    dirhead = dir;
+  dirtail = dir;
+  return dir;
+}
+                
+\f
+static void
+replace_prefix (char **pname, const char *samp, size_t slen,
+               const char *repl, size_t rlen)
+{
+  char *name = *pname;
+  size_t nlen = strlen (name);
+  if (nlen > slen && memcmp (name, samp, slen) == 0 && ISSLASH (name[slen]))
+    {
+      if (rlen > slen)
+       {
+         name = xrealloc (name, nlen - slen + rlen + 1);
+         *pname = name;
+       }
+      memmove (name + rlen, name + slen, nlen - slen + 1);
+      memcpy (name, repl, rlen);
+    }
+}

 
 

-  directory->device_number = device_number;
-  directory->inode_number = inode_number;
-  directory->name = xstrdup (name);
-  directory->dir_text = text;
-  directory->allnew = 0;
+void
+dirlist_replace_prefix (const char *pref, const char *repl)
+{
+  struct directory *dp;
+  size_t pref_len = strlen (pref);
+  size_t repl_len = strlen (repl);
+  for (dp = dirhead; dp; dp = dp->next)
+    replace_prefix (&dp->name, pref, pref_len, repl, repl_len);

 }
 
 }
 

-/*------------------------------------------------------------------------.
-| Return a directory entry for a given path NAME, or NULL if none found.  |
-`------------------------------------------------------------------------*/
+/* Create and link a new directory entry for directory NAME, having a
+   device number DEV and an inode number INO, with NFS indicating
+   whether it is an NFS device and FOUND indicating whether we have
+   found that the directory exists.  */
+static struct directory *
+note_directory (char const *name, struct timespec mtime,
+               dev_t dev, ino_t ino, bool nfs, bool found,
+               const char *contents)
+{
+  struct directory *directory = attach_directory (name);
+
+  directory->mtime = mtime;
+  directory->device_number = dev;
+  directory->inode_number = ino;
+  directory->children = CHANGED_CHILDREN;
+  if (nfs)
+    DIR_SET_FLAG (directory, DIRF_NFS);
+  if (found)
+    DIR_SET_FLAG (directory, DIRF_FOUND);
+  if (contents)
+    directory->dump = dumpdir_create (contents);
+  else
+    directory->dump = NULL;
+
+  if (! ((directory_table
+         || (directory_table = hash_initialize (0, 0,
+                                                hash_directory_canonical_name,
+                                                compare_directory_canonical_names, 0)))
+        && hash_insert (directory_table, directory)))
+    xalloc_die ();
+
+  if (! ((directory_meta_table
+         || (directory_meta_table = hash_initialize (0, 0,
+                                                     hash_directory_meta,
+                                                     compare_directory_meta,
+                                                     0)))
+        && hash_insert (directory_meta_table, directory)))
+    xalloc_die ();
+
+  return directory;
+}

 
 

+/* Return a directory entry for a given file NAME, or zero if none found.  */

 static struct directory *
 static struct directory *

-find_directory (char *name)
+find_directory (const char *name)

 {
 {

-  struct directory *directory;
+  if (! directory_table)
+    return 0;
+  else
+    {
+      char *caname = normalize_filename (name);
+      struct directory *dir = make_directory (name, caname);
+      struct directory *ret = hash_lookup (directory_table, dir);
+      free_directory (dir);
+      return ret;
+    }
+}

 
 

-  for (directory = directory_list;
-       directory;
-       directory = directory->next)
+#if 0
+/* Remove directory entry for the given CANAME */
+void
+remove_directory (const char *caname)
+{
+  struct directory *dir = make_directory (caname, xstrdup (caname));
+  struct directory *ret = hash_delete (directory_table, dir);
+  if (ret)
+    free_directory (ret);
+  free_directory (dir);
+}
+#endif
+
+/* Find a directory entry for NAME.  If first OLD_PREFIX_LEN
+   bytes of its name match OLD_PREFIX, replace them with
+   NEW_PREFIX. */
+void
+rebase_directory (const char *name, size_t old_prefix_len,
+                 const char *old_prefix,
+                 const char *new_prefix)
+{
+  struct directory *dir = find_directory (name);
+  if (dir)

     {
     {

-      if (!strcmp (directory->name, name))
-       return directory;
+      size_t len = strlen (dir->name);
+      if (len > old_prefix_len
+         && memcmp (dir->name, old_prefix, old_prefix_len) == 0)
+       {
+         char *newp = xmalloc (len - old_prefix_len + strlen (new_prefix));
+         strcpy (newp, new_prefix);
+         strcat (newp, dir->name + old_prefix_len);
+         free (dir->name);
+         dir->name = newp;
+       }

     }
     }

-  return NULL;

 }
 
 }
 

-/*---.
-| ?  |
-`---*/
+/* Return a directory entry for a given combination of device and inode
+   numbers, or zero if none found.  */
+static struct directory *
+find_directory_meta (dev_t dev, ino_t ino)
+{
+  if (! directory_meta_table)
+    return 0;
+  else
+    {
+      struct directory *dir = make_directory ("", NULL);
+      struct directory *ret;
+      dir->device_number = dev;
+      dir->inode_number = ino;
+      ret = hash_lookup (directory_meta_table, dir);
+      free_directory (dir);
+      return ret;
+    }
+}

 
 

-static int
-compare_dirents (const voidstar first, const voidstar second)
+void
+update_parent_directory (const char *name)

 {
 {

-  return strcmp ((*(char *const *) first) + 1,
-                (*(char *const *) second) + 1);
+  struct directory *directory;
+  char *p;
+
+  p = dir_name (name);
+  directory = find_directory (p);
+  if (directory)
+    {
+      struct stat st;
+      if (deref_stat (dereference_option, p, &st) != 0)
+       stat_diag (name);
+      else
+       directory->mtime = get_stat_mtime (&st);
+    }
+  free (p);

 }
 
 }
 

-/*---.
-| ?  |
-`---*/
+#define PD_FORCE_CHILDREN 0x10
+#define PD_FORCE_INIT     0x20
+#define PD_CHILDREN(f) ((f) & 3)

 
 

-char *
-get_directory_contents (char *path, int device)
+static struct directory *
+procdir (const char *name_buffer, struct stat *stat_data,
+        dev_t device,
+        int flag,
+        char *entry)

 {
 {

-  struct accumulator *accumulator;
+  struct directory *directory;
+  bool nfs = NFS_FILE_STAT (*stat_data);

 
 

-  /* Recursively scan the given PATH.  */
+  if ((directory = find_directory (name_buffer)) != NULL)
+    {
+      if (DIR_IS_INITED (directory))
+       {
+         if (flag & PD_FORCE_INIT)
+           {
+             assign_string (&directory->name, name_buffer);
+           }
+         else
+           {
+             *entry = 'N'; /* Avoid duplicating this directory */
+             return directory;
+           }
+       }

 
 

-  {
-    DIR *dirp = opendir (path);        /* for scanning directory */
-    struct dirent *entry;      /* directory entry being scanned */
-    char *name_buffer;         /* directory, `/', and directory member */
-    int name_buffer_size;      /* allocated size of name_buffer, minus 2 */
-    int name_length;           /* used length in name_buffer */
-    struct directory *directory; /* for checking if already already seen */
-    int all_children;
-
-    if (dirp == NULL)
-      {
-       ERROR ((0, errno, _("Cannot open directory %s"), path));
-       return NULL;
-      }
-    errno = 0;                 /* FIXME: errno should be read-only */
+      if (strcmp (directory->name, name_buffer))
+       {
+         *entry = 'N';
+         return directory;
+       }
+      
+      /* With NFS, the same file can have two different devices
+        if an NFS directory is mounted in multiple locations,
+        which is relatively common when automounting.
+        To avoid spurious incremental redumping of
+        directories, consider all NFS devices as equal,
+        relying on the i-node to establish differences.  */
+      
+      if (! ((!check_device_option
+             || (DIR_IS_NFS (directory) && nfs)
+             || directory->device_number == stat_data->st_dev)
+            && directory->inode_number == stat_data->st_ino))
+       {
+         /* FIXME: find_directory_meta ignores nfs */
+         struct directory *d = find_directory_meta (stat_data->st_dev,
+                                                    stat_data->st_ino);
+         if (d)
+           {
+             if (strcmp (d->name, name_buffer))
+               {
+                 WARNOPT (WARN_RENAME_DIRECTORY,
+                          (0, 0,
+                           _("%s: Directory has been renamed from %s"),
+                           quotearg_colon (name_buffer),
+                           quote_n (1, d->name)));
+                 directory->orig = d;
+                 DIR_SET_FLAG (directory, DIRF_RENAMED);
+                 dirlist_replace_prefix (d->name, name_buffer);
+               }
+             directory->children = CHANGED_CHILDREN;
+           }
+         else
+           {
+             WARNOPT (WARN_RENAME_DIRECTORY,
+                      (0, 0, _("%s: Directory has been renamed"),
+                       quotearg_colon (name_buffer)));
+             directory->children = ALL_CHILDREN;
+             directory->device_number = stat_data->st_dev;
+             directory->inode_number = stat_data->st_ino;
+           }
+         if (nfs)
+           DIR_SET_FLAG (directory, DIRF_NFS);
+       }
+      else
+       directory->children = CHANGED_CHILDREN;
+      
+      DIR_SET_FLAG (directory, DIRF_FOUND);
+    }
+  else
+    {
+      struct directory *d = find_directory_meta (stat_data->st_dev,
+                                                stat_data->st_ino);
+      
+      directory = note_directory (name_buffer,
+                                 get_stat_mtime(stat_data),
+                                 stat_data->st_dev,
+                                 stat_data->st_ino,
+                                 nfs,
+                                 true,
+                                 NULL);
+
+      if (d)
+       {
+         if (strcmp (d->name, name_buffer))
+           {
+             WARNOPT (WARN_RENAME_DIRECTORY,
+                      (0, 0, _("%s: Directory has been renamed from %s"),
+                       quotearg_colon (name_buffer),
+                       quote_n (1, d->name)));
+             directory->orig = d;
+             DIR_SET_FLAG (directory, DIRF_RENAMED);
+             dirlist_replace_prefix (d->name, name_buffer);
+           }
+         directory->children = CHANGED_CHILDREN;
+       }
+      else
+       {
+         DIR_SET_FLAG (directory, DIRF_NEW);
+         WARNOPT (WARN_NEW_DIRECTORY,
+                  (0, 0, _("%s: Directory is new"),
+                   quotearg_colon (name_buffer)));
+         directory->children =
+           (listed_incremental_option
+            || (OLDER_STAT_TIME (*stat_data, m)
+                || (after_date_option
+                    && OLDER_STAT_TIME (*stat_data, c))))
+           ? ALL_CHILDREN
+           : CHANGED_CHILDREN;
+       }
+    }

 
 

-    name_buffer_size = strlen (path) + NAME_FIELD_SIZE;
-    name_buffer = xmalloc ((size_t) (name_buffer_size + 2));
-    strcpy (name_buffer, path);
-    if (path[strlen (path) - 1] != '/')
-      strcat (name_buffer, "/");
-    name_length = strlen (name_buffer);
+  /* If the directory is on another device and --one-file-system was given,
+     omit it... */
+  if (one_file_system_option && device != stat_data->st_dev
+      /* ... except if it was explicitely given in the command line */
+      && !is_individual_file (name_buffer))
+    directory->children = NO_CHILDREN;
+  else if (flag & PD_FORCE_CHILDREN)
+    {
+      directory->children = PD_CHILDREN(flag);
+      if (directory->children == NO_CHILDREN)
+       *entry = 'N';
+    }
+         
+  DIR_SET_FLAG (directory, DIRF_INIT);

 
 

-    directory = find_directory (path);
-    all_children = directory ? directory->allnew : 0;
+  if (directory->children != NO_CHILDREN)
+    {
+      const char *tag_file_name;
+
+      switch (check_exclusion_tags (name_buffer, &tag_file_name))
+       {
+       case exclusion_tag_all:
+         /* This warning can be duplicated by code in dump_file0, but only
+            in case when the topmost directory being archived contains
+            an exclusion tag. */
+         exclusion_tag_warning (name_buffer, tag_file_name,
+                                _("directory not dumped"));
+         *entry = 'N';
+         directory->children = NO_CHILDREN;
+         break;
+
+       case exclusion_tag_contents:
+         exclusion_tag_warning (name_buffer, tag_file_name,
+                                _("contents not dumped"));
+         directory->children = NO_CHILDREN;
+         break;
+         
+       case exclusion_tag_under:
+         exclusion_tag_warning (name_buffer, tag_file_name,
+                                _("contents not dumped"));
+         directory->tagfile = tag_file_name;
+         break;
+         
+       case exclusion_tag_none:
+         break;
+       }
+    }

 
 

-    accumulator = new_accumulator ();
+  return directory;
+}

 
 

-    while (entry = readdir (dirp), entry)
-      {
-       struct stat stat_data;
+/* Compare dumpdir array from DIRECTORY with directory listing DIR and
+   build a new dumpdir template.

 
 

-       /* Skip `.' and `..'.  */
+   DIR must be returned by a previous call to savedir().

 
 

-       if (is_dot_or_dotdot (entry->d_name))
-         continue;
+   File names in DIRECTORY->dump->contents must be sorted
+   alphabetically.

 
 

-       if ((int) NAMLEN (entry) + name_length >= name_buffer_size)
-         {
-           while ((int) NAMLEN (entry) + name_length >= name_buffer_size)
-             name_buffer_size += NAME_FIELD_SIZE;
-           name_buffer = (char *)
-             xrealloc (name_buffer, (size_t) (name_buffer_size + 2));
-         }
-       strcpy (name_buffer + name_length, entry->d_name);
-
-       if (dereference_option
-#ifdef AIX
-           ? statx (name_buffer, &stat_data, STATSIZE, STX_HIDDEN)
-           : statx (name_buffer, &stat_data, STATSIZE, STX_HIDDEN | STX_LINK)
-#else
-           ? stat (name_buffer, &stat_data)
-           : lstat (name_buffer, &stat_data)
-#endif
-           )
-         {
-           ERROR ((0, errno, _("Cannot stat %s"), name_buffer));
-           continue;
-         }
-
-       if ((one_file_system_option && device != stat_data.st_dev)
-           || (exclude_option && check_exclude (name_buffer)))
-         add_to_accumulator (accumulator, "N", 1);
-
-#ifdef AIX
-       else if (S_ISHIDDEN (stat_data.st_mode))
-         {
-           add_to_accumulator (accumulator, "D", 1);
-           strcat (entry->d_name, "A");
-           entry->d_namlen++;
-         }
-#endif
+   DIRECTORY->dump is replaced with the created template. Each entry is
+   prefixed with ' ' if it was present in DUMP and with 'Y' otherwise. */

 
 

-       else if (S_ISDIR (stat_data.st_mode))
-         {
-           if (directory = find_directory (name_buffer), directory)
-             {
-               /* Devices having the high bit set are NFS devices, which are
-                  attributed somewhat randomly in automounting situations.
-                  For avoiding spurious incremental redumping of directories,
-                  we have to plainly consider all NFS devices as equal,
-                  relying on the i-node only to establish differences.  */
-
-               /* FIXME: Göran Uddeborg <goeran@uddeborg.pp.se> says, on
-                  1996-09-20, that SunOS 5/Solaris 2 uses unsigned long for
-                  the device number type.  */
-
-               if ((((short) directory->device_number >= 0
-                     || (short) stat_data.st_dev >= 0)
-                    && directory->device_number != stat_data.st_dev)
-                   || directory->inode_number != stat_data.st_ino)
-                 {
-                   if (verbose_option)
-                     WARN ((0, 0, _("Directory %s has been renamed"),
-                            name_buffer));
-                   directory->allnew = 1;
-                   directory->device_number = stat_data.st_dev;
-                   directory->inode_number = stat_data.st_ino;
-                 }
-               directory->dir_text = "";
-             }
-           else
-             {
-               if (verbose_option)
-                 WARN ((0, 0, _("Directory %s is new"), name_buffer));
-               note_directory (name_buffer, stat_data.st_dev, stat_data.st_ino,
-                               "");
-               directory = find_directory (name_buffer);
-               directory->allnew = 1;
-             }
-           if (all_children && directory)
-             directory->allnew = 1;
-
-           add_to_accumulator (accumulator, "D", 1);
-         }
-
-       else
-         if (!all_children
-             && stat_data.st_mtime < newer_mtime_option
-             && (!after_date_option
-                 || stat_data.st_ctime < newer_ctime_option))
-           add_to_accumulator (accumulator, "N", 1);
+void
+makedumpdir (struct directory *directory, const char *dir)
+{
+  size_t i,
+         dirsize,  /* Number of elements in DIR */
+         len;      /* Length of DIR, including terminating nul */
+  const char *p;
+  char const **array;
+  char *new_dump, *new_dump_ptr;
+  struct dumpdir *dump;
+
+  if (directory->children == ALL_CHILDREN)
+    dump = NULL;
+  else if (DIR_IS_RENAMED (directory))
+    dump = directory->orig->idump ?
+           directory->orig->idump : directory->orig->dump;
+  else
+    dump = directory->dump;
+
+  /* Count the size of DIR and the number of elements it contains */
+  dirsize = 0;
+  len = 0;
+  for (p = dir; *p; p += strlen (p) + 1, dirsize++)
+    len += strlen (p) + 2;
+  len++;
+
+  /* Create a sorted directory listing */
+  array = xcalloc (dirsize, sizeof array[0]);
+  for (i = 0, p = dir; *p; p += strlen (p) + 1, i++)
+    array[i] = p;
+
+  qsort (array, dirsize, sizeof (array[0]), compare_dirnames);
+
+  /* Prepare space for new dumpdir */
+  new_dump = xmalloc (len);
+  new_dump_ptr = new_dump;
+
+  /* Fill in the dumpdir template */
+  for (i = 0; i < dirsize; i++)
+    {
+      const char *loc = dumpdir_locate (dump, array[i]);
+      if (loc)
+       {
+         if (directory->tagfile)
+           *new_dump_ptr = strcmp (directory->tagfile, array[i]) == 0 ?
+                               ' ' : 'I';

          else
          else

-           add_to_accumulator (accumulator, "Y", 1);
+           *new_dump_ptr = ' ';
+         new_dump_ptr++;
+       }
+      else if (directory->tagfile)
+       *new_dump_ptr++ = strcmp (directory->tagfile, array[i]) == 0 ?
+                              ' ' : 'I';
+      else
+       *new_dump_ptr++ = 'Y'; /* New entry */
+
+      /* Copy the file name */
+      for (p = array[i]; (*new_dump_ptr++ = *p++); )
+       ;
+    }
+  *new_dump_ptr = 0;
+  directory->idump = directory->dump;
+  directory->dump = dumpdir_create0 (new_dump, NULL);
+  free (array);
+}

 
 

-       add_to_accumulator (accumulator,
-                           entry->d_name, (int) (NAMLEN (entry) + 1));
-      }
-    add_to_accumulator (accumulator, "\000\000", 2);
+/* Recursively scan the given directory DIR.
+   DEVICE is the device number where DIR resides (for --one-file-system).
+   If CMDLINE is true, the directory name was explicitly listed in the
+   command line. */
+const char *
+scan_directory (char *dir, dev_t device, bool cmdline)
+{
+  char *dirp = savedir (dir);  /* for scanning directory */
+  char *name_buffer;           /* directory, `/', and directory member */
+  size_t name_buffer_size;     /* allocated size of name_buffer, minus 2 */
+  size_t name_length;          /* used length in name_buffer */
+  struct stat stat_data;
+  struct directory *directory;
+  char ch;
+  
+  if (! dirp)
+    savedir_error (dir);
+
+  name_buffer_size = strlen (dir) + NAME_FIELD_SIZE;
+  name_buffer = xmalloc (name_buffer_size + 2);
+  strcpy (name_buffer, dir);
+  zap_slashes (name_buffer);
+  
+  if (deref_stat (dereference_option, name_buffer, &stat_data))
+    {
+      stat_diag (name_buffer);
+      /* FIXME: used to be
+           children = CHANGED_CHILDREN;
+        but changed to: */
+      free (name_buffer);
+      free (dirp);
+      return NULL;
+    }

 
 

-    free (name_buffer);
-    closedir (dirp);
-  }
+  directory = procdir (name_buffer, &stat_data, device,
+                      (cmdline ? PD_FORCE_INIT : 0),
+                      &ch);
+      
+  name_length = strlen (name_buffer); 
+  if (! ISSLASH (name_buffer[name_length - 1]))
+    {
+      name_buffer[name_length] = DIRECTORY_SEPARATOR;
+      /* name_buffer has been allocated an extra slot */
+      name_buffer[++name_length] = 0;
+    }

 
 

-  /* Sort the contents of the directory, now that we have it all.  */
+  if (dirp && directory->children != NO_CHILDREN)
+    {
+      char *entry;     /* directory entry being scanned */
+      size_t entrylen; /* length of directory entry */
+      dumpdir_iter_t itr;

 
 

-  {
-    char *pointer = get_accumulator (accumulator);
-    size_t counter;
-    char *cursor;
-    char *buffer;
-    char **array;
-    char **array_cursor;
-
-    counter = 0;
-    for (cursor = pointer; *cursor; cursor += strlen (cursor) + 1)
-      counter++;
-
-    if (counter == 0)
-      {
-       delete_accumulator (accumulator);
-       return NULL;
-      }
+      makedumpdir (directory, dirp);
+
+      for (entry = dumpdir_first (directory->dump, 1, &itr);
+          entry;
+          entry = dumpdir_next (itr))
+       {
+         entrylen = strlen (entry);
+         if (name_buffer_size <= entrylen - 1 + name_length)
+           {
+             do
+               name_buffer_size += NAME_FIELD_SIZE;
+             while (name_buffer_size <= entrylen - 1 + name_length);
+             name_buffer = xrealloc (name_buffer, name_buffer_size + 2);
+           }
+         strcpy (name_buffer + name_length, entry + 1);

 
 

-    array = (char **) xmalloc (sizeof (char *) * (counter + 1));
+         if (*entry == 'I') /* Ignored entry */
+           *entry = 'N';
+         else if (excluded_name (name_buffer))
+           *entry = 'N';
+         else
+           {
+             if (deref_stat (dereference_option, name_buffer, &stat_data))
+               {
+                 stat_diag (name_buffer);
+                 *entry = 'N';
+                 continue;
+               }

 
 

-    array_cursor = array;
-    for (cursor = pointer; *cursor; cursor += strlen (cursor) + 1)
-      *array_cursor++ = cursor;
-    *array_cursor = NULL;
+             if (S_ISDIR (stat_data.st_mode))
+               {
+                 int pd_flag = 0;
+                 if (!recursion_option)
+                   pd_flag |= PD_FORCE_CHILDREN | NO_CHILDREN;
+                 else if (directory->children == ALL_CHILDREN)
+                   pd_flag |= PD_FORCE_CHILDREN | ALL_CHILDREN;
+                 *entry = 'D';
+                 procdir (name_buffer, &stat_data, device, pd_flag, entry);
+               }

 
 

-    qsort ((voidstar) array, counter, sizeof (char *), compare_dirents);
+             else if (one_file_system_option && device != stat_data.st_dev)
+               *entry = 'N';

 
 

-    buffer = (char *) xmalloc ((size_t) (cursor - pointer + 2));
+             else if (*entry == 'Y')
+               /* New entry, skip further checks */;

 
 

-    cursor = buffer;
-    for (array_cursor = array; *array_cursor; array_cursor++)
-      {
-       char *string = *array_cursor;
+             /* FIXME: if (S_ISHIDDEN (stat_data.st_mode))?? */

 
 

-       while ((*cursor++ = *string++))
-         continue;
-      }
-    *cursor = '\0';
+             else if (OLDER_STAT_TIME (stat_data, m)
+                      && (!after_date_option
+                          || OLDER_STAT_TIME (stat_data, c)))
+               *entry = 'N';
+             else
+               *entry = 'Y';
+           }
+       }
+      free (itr);
+    }
+
+  free (name_buffer);
+  if (dirp)
+    free (dirp);

 
 

-    delete_accumulator (accumulator);
-    free (array);
-    return buffer;
-  }
+  return directory->dump ? directory->dump->contents : NULL;
+}
+
+const char *
+get_directory_contents (char *dir, dev_t device, bool force)
+{
+  return scan_directory (dir, device, force);

 }
 
 }
 

-/*----------------------------------------------------------------------.
-| Add all the files in PATH, which is a directory, to the namelist.  If |
-| any of the files is a directory, recurse on the subdirectory.                |
-`----------------------------------------------------------------------*/
+\f
+static void
+obstack_code_rename (struct obstack *stk, char *from, char *to)
+{
+  char *s;
+
+  s = from[0] == 0 ? from :
+                     safer_name_suffix (from, false, absolute_names_option);
+  obstack_1grow (stk, 'R');
+  obstack_grow (stk, s, strlen (s) + 1);
+
+  s = to[0] == 0 ? to:
+                   safer_name_suffix (to, false, absolute_names_option);
+  obstack_1grow (stk, 'T');
+  obstack_grow (stk, s, strlen (s) + 1);
+}

 
 static void
 
 static void

-add_hierarchy_to_namelist (char *path, int device)
+store_rename (struct directory *dir, struct obstack *stk)

 {
 {

-  char *buffer = get_directory_contents (path, device);
+  if (DIR_IS_RENAMED (dir))
+    {
+      struct directory *prev, *p;

 
 

-  {
-    struct name *name;
+      /* Detect eventual cycles and clear DIRF_RENAMED flag, so these entries
+        are ignored when hit by this function next time.
+        If the chain forms a cycle, prev points to the entry DIR is renamed
+        from. In this case it still retains DIRF_RENAMED flag, which will be
+        cleared in the `else' branch below */
+      for (prev = dir; prev && prev->orig != dir; prev = prev->orig)
+       DIR_CLEAR_FLAG (prev, DIRF_RENAMED);

 
 

-    for (name = namelist; name; name = name->next)
-      if (strcmp (name->name, path) == 0)
-         break;
-    if (name)
-      name->dir_contents = buffer ? buffer : "\0\0\0\0";
-  }
-
-  if (buffer)
-    {
-      int name_length = strlen (path);
-      int allocated_length = (name_length >= NAME_FIELD_SIZE
-                             ? name_length + NAME_FIELD_SIZE
-                             : NAME_FIELD_SIZE);
-      char *name_buffer = xmalloc ((size_t) (allocated_length + 1));
-                               /* FIXME: + 2 above?  */
-      char *string;
-      int string_length;
-
-      strcpy (name_buffer, path);
-      if (name_buffer[name_length - 1] != '/')
+      if (prev == NULL)

        {
        {

-         name_buffer[name_length++] = '/';
-         name_buffer[name_length] = '\0';
+         for (p = dir; p && p->orig; p = p->orig)
+           obstack_code_rename (stk, p->orig->name, p->name);

        }
        }

-
-      for (string = buffer; *string; string += string_length + 1)
+      else

        {
        {

-         string_length = strlen (string);
-         if (*string == 'D')
-           {
-             if (name_length + string_length >= allocated_length)
-               {
-                 while (name_length + string_length >= allocated_length)
-                   allocated_length += NAME_FIELD_SIZE;
-                 name_buffer = (char *)
-                   xrealloc (name_buffer, (size_t) (allocated_length + 1));
-               }
-             strcpy (name_buffer + name_length, string + 1);
-             addname (name_buffer);
-             add_hierarchy_to_namelist (name_buffer, device);
-           }
+         char *temp_name;
+
+         DIR_CLEAR_FLAG (prev, DIRF_RENAMED);
+
+         /* Break the cycle by using a temporary name for one of its
+            elements.
+            First, create a temp name stub entry. */
+         temp_name = dir_name (dir->name);
+         obstack_1grow (stk, 'X');
+         obstack_grow (stk, temp_name, strlen (temp_name) + 1);
+
+         obstack_code_rename (stk, dir->name, "");
+
+         for (p = dir; p != prev; p = p->orig)
+           obstack_code_rename (stk, p->orig->name, p->name);
+
+         obstack_code_rename (stk, "", prev->name);

        }
        }

+    }
+}

 
 

-      free (name_buffer);
+const char *
+append_incremental_renames (const char *dump)
+{
+  struct obstack stk;
+  size_t size;
+  struct directory *dp;
+  
+  if (dirhead == NULL)
+    return dump;
+
+  obstack_init (&stk);
+  if (dump)
+    {
+      size = dumpdir_size (dump) - 1;
+      obstack_grow (&stk, dump, size);

     }
     }

+  else
+    size = 0;
+
+  for (dp = dirhead; dp; dp = dp->next)
+    store_rename (dp, &stk);
+
+  if (obstack_object_size (&stk) != size)
+    {
+      obstack_1grow (&stk, 0);
+      dump = obstack_finish (&stk);
+    }
+  else
+    obstack_free (&stk, NULL);
+  return dump;

 }
 }

+

 \f
 \f

-/*---.
-| ?  |
-`---*/

 
 

-static void
-read_directory_file (void)
-{
-  dev_t device_number;
-  ino_t inode_number;
-  char *strp;
-  FILE *fp;
-  char buf[512];
-  static char *path = NULL;
-
-  if (path == NULL)
-    path = xmalloc (PATH_MAX);
-  time (&time_now);
-  if (listed_incremental_option[0] != '/')
-    {
-#if HAVE_GETCWD
-      if (!getcwd (path, PATH_MAX))
-       FATAL_ERROR ((0, 0, _("Could not get current directory")));
-#else
-      char *getwd ();
+static FILE *listed_incremental_stream;

 
 

-      if (!getwd (path))
-       FATAL_ERROR ((0, 0, _("Could not get current directory: %s"), path));
-#endif
+/* Version of incremental format snapshots (directory files) used by this
+   tar. Currently it is supposed to be a single decimal number. 0 means
+   incremental snapshots as per tar version before 1.15.2.
+
+   The current tar version supports incremental versions from
+   0 up to TAR_INCREMENTAL_VERSION, inclusive.
+   It is able to create only snapshots of TAR_INCREMENTAL_VERSION */

 
 

-      if (strlen (path) + 1 + strlen (listed_incremental_option) + 1 > PATH_MAX)
-       ERROR ((TAREXIT_FAILURE, 0, _("File name %s/%s too long"),
-               path, listed_incremental_option));
+#define TAR_INCREMENTAL_VERSION 2

 
 

-      strcat (path, "/");
-      strcat (path, listed_incremental_option);
-      listed_incremental_option = path;
+/* Read incremental snapshot formats 0 and 1 */
+static void
+read_incr_db_01 (int version, const char *initbuf)
+{
+  int n;
+  uintmax_t u;
+  time_t sec;
+  long int nsec;
+  char *buf = 0;
+  size_t bufsize;
+  char *ebuf;
+  long lineno = 1;
+
+  if (version == 1)
+    {
+      if (getline (&buf, &bufsize, listed_incremental_stream) <= 0)
+       {
+         read_error (listed_incremental_option);
+         free (buf);
+         return;
+       }
+      ++lineno;

     }
     }

-  fp = fopen (listed_incremental_option, "r");
-  if (fp == 0 && errno != ENOENT)
+  else

     {
     {

-      ERROR ((0, errno, _("Cannot open %s"), listed_incremental_option));
-      return;
+      buf = strdup (initbuf);
+      bufsize = strlen (buf) + 1;

     }
     }

-  if (!fp)
-    return;
-  fgets (buf, sizeof (buf), fp);
-
-  /* FIXME: Using after_date_option as a first time flag looks fairly
-     dubious to me!  So, using -N with incremental might be buggy just
-     because of the next few lines.  I saw a few unexplained, almost harsh
-     advices, from other GNU people, about *not* using -N with incremental
-     dumps, and here might lie (part of) the reason.  */
-  if (!after_date_option)
-    {
-      newer_mtime_option = atol (buf);
-      after_date_option = 1;
-    }
-
-  while (fgets (buf, sizeof (buf), fp))
-    {
-      strp = &buf[strlen (buf)];
-      if (strp[-1] == '\n')
-       strp[-1] = '\0';
-      /* FIXME: For files ending with an incomplete line, maybe a NUL might
-        be missing, here...  */
-
-      strp = buf;
-      device_number = atol (strp);
-      while (ISDIGIT (*strp))
-       strp++;
-      inode_number = atol (strp);
-      while (ISSPACE (*strp))
-       strp++;
-      while (ISDIGIT (*strp))
-       strp++;
+
+  sec = TYPE_MINIMUM (time_t);
+  nsec = -1;
+  errno = 0;
+  u = strtoumax (buf, &ebuf, 10);
+  if (!errno && TYPE_MAXIMUM (time_t) < u)
+    errno = ERANGE;
+  if (errno || buf == ebuf)
+    ERROR ((0, errno, "%s:%ld: %s",
+           quotearg_colon (listed_incremental_option),
+           lineno,
+           _("Invalid time stamp")));
+  else
+    {
+      sec = u;
+
+      if (version == 1 && *ebuf)
+       {
+         char const *buf_ns = ebuf + 1;
+         errno = 0;
+         u = strtoumax (buf_ns, &ebuf, 10);
+         if (!errno && BILLION <= u)
+           errno = ERANGE;
+         if (errno || buf_ns == ebuf)
+           {
+             ERROR ((0, errno, "%s:%ld: %s",
+                     quotearg_colon (listed_incremental_option),
+                     lineno,
+                     _("Invalid time stamp")));
+             sec = TYPE_MINIMUM (time_t);
+           }
+         else
+           nsec = u;
+       }
+      else
+       {
+         /* pre-1 incremental format does not contain nanoseconds */
+         nsec = 0;
+       }
+    }
+  newer_mtime_option.tv_sec = sec;
+  newer_mtime_option.tv_nsec = nsec;
+
+
+  while (0 < (n = getline (&buf, &bufsize, listed_incremental_stream)))
+    {
+      dev_t dev;
+      ino_t ino;
+      bool nfs = buf[0] == '+';
+      char *strp = buf + nfs;
+      struct timespec mtime;
+
+      lineno++;
+
+      if (buf[n - 1] == '\n')
+       buf[n - 1] = '\0';
+
+      if (version == 1)
+       {
+         errno = 0;
+         u = strtoumax (strp, &ebuf, 10);
+         if (!errno && TYPE_MAXIMUM (time_t) < u)
+           errno = ERANGE;
+         if (errno || strp == ebuf || *ebuf != ' ')
+           {
+             ERROR ((0, errno, "%s:%ld: %s",
+                     quotearg_colon (listed_incremental_option), lineno,
+                     _("Invalid modification time (seconds)")));
+             sec = (time_t) -1;
+           }
+         else
+           sec = u;
+         strp = ebuf;
+
+         errno = 0;
+         u = strtoumax (strp, &ebuf, 10);
+         if (!errno && BILLION <= u)
+           errno = ERANGE;
+         if (errno || strp == ebuf || *ebuf != ' ')
+           {
+             ERROR ((0, errno, "%s:%ld: %s",
+                     quotearg_colon (listed_incremental_option), lineno,
+                     _("Invalid modification time (nanoseconds)")));
+             nsec = -1;
+           }
+         else
+           nsec = u;
+         mtime.tv_sec = sec;
+         mtime.tv_nsec = nsec;
+         strp = ebuf;
+       }
+      else
+       memset (&mtime, 0, sizeof mtime);
+
+      errno = 0;
+      u = strtoumax (strp, &ebuf, 10);
+      if (!errno && TYPE_MAXIMUM (dev_t) < u)
+       errno = ERANGE;
+      if (errno || strp == ebuf || *ebuf != ' ')
+       {
+         ERROR ((0, errno, "%s:%ld: %s",
+                 quotearg_colon (listed_incremental_option), lineno,
+                 _("Invalid device number")));
+         dev = (dev_t) -1;
+       }
+      else
+       dev = u;
+      strp = ebuf;
+
+      errno = 0;
+      u = strtoumax (strp, &ebuf, 10);
+      if (!errno && TYPE_MAXIMUM (ino_t) < u)
+       errno = ERANGE;
+      if (errno || strp == ebuf || *ebuf != ' ')
+       {
+         ERROR ((0, errno, "%s:%ld: %s",
+                 quotearg_colon (listed_incremental_option), lineno,
+                 _("Invalid inode number")));
+         ino = (ino_t) -1;
+       }
+      else
+       ino = u;
+      strp = ebuf;
+

       strp++;
       unquote_string (strp);
       strp++;
       unquote_string (strp);

-      note_directory (strp, device_number, inode_number, NULL);
+      note_directory (strp, mtime, dev, ino, nfs, false, NULL);

     }
     }

-  if (fclose (fp) == EOF)
-    ERROR ((0, errno, "%s", listed_incremental_option));
+  free (buf);

 }
 
 }
 

-/*---.
-| ?  |
-`---*/
+/* Read a nul-terminated string from FP and store it in STK.
+   Store the number of bytes read (including nul terminator) in PCOUNT.

 
 

-void
-write_dir_file (void)
+   Return the last character read or EOF on end of file. */
+static int
+read_obstack (FILE *fp, struct obstack *stk, size_t *pcount)

 {
 {

-  FILE *fp;
-  struct directory *directory;
-  char *str;
+  int c;
+  size_t i;

 
 

-  fp = fopen (listed_incremental_option, "w");
-  if (fp == 0)
+  for (i = 0, c = getc (fp); c != EOF && c != 0; c = getc (fp), i++)
+    obstack_1grow (stk, c);
+  obstack_1grow (stk, 0);
+
+  *pcount = i;
+  return c;
+}
+
+/* Read from file FP a nul-terminated string and convert it to
+   intmax_t.  Return the resulting value in PVAL.  Assume '-' has
+   already been read.
+
+   Throw a fatal error if the string cannot be converted or if the
+   converted value is less than MIN_VAL.  */
+
+static void
+read_negative_num (FILE *fp, intmax_t min_val, intmax_t *pval)
+{
+  int c;
+  size_t i;
+  char buf[INT_BUFSIZE_BOUND (intmax_t)];
+  char *ep;
+  buf[0] = '-';
+
+  for (i = 1; ISDIGIT (c = getc (fp)); i++)

     {
     {

-      ERROR ((0, errno, _("Cannot write to %s"), listed_incremental_option));
-      return;
+      if (i == sizeof buf - 1)
+       FATAL_ERROR ((0, 0, _("Field too long while reading snapshot file")));
+      buf[i] = c;

     }
     }

-  fprintf (fp, "%lu\n", time_now);
-  for (directory = directory_list; directory; directory = directory->next)
+
+  if (c < 0)

     {
     {

-      if (!directory->dir_text)
-       continue;
-      str = quote_copy_string (directory->name);
-      if (str)
-       {
-         fprintf (fp, "%u %u %s\n", directory->device_number,
-                  directory->inode_number, str);
-         free (str);
-       }
+      if (ferror (fp))
+       FATAL_ERROR ((0, errno, _("Read error in snapshot file")));
+      else
+       FATAL_ERROR ((0, 0, _("Unexpected EOF in snapshot file")));
+    }
+
+  buf[i] = 0;
+  errno = 0;
+  *pval = strtoimax (buf, &ep, 10);
+  if (c || errno || *pval < min_val)
+    FATAL_ERROR ((0, errno, _("Unexpected field value in snapshot file")));
+}
+
+/* Read from file FP a nul-terminated string and convert it to
+   uintmax_t.  Return the resulting value in PVAL.  Assume C has
+   already been read.
+
+   Throw a fatal error if the string cannot be converted or if the
+   converted value exceeds MAX_VAL.
+
+   Return the last character read or EOF on end of file. */
+
+static int
+read_unsigned_num (int c, FILE *fp, uintmax_t max_val, uintmax_t *pval)
+{
+  size_t i;
+  char buf[UINTMAX_STRSIZE_BOUND], *ep;
+
+  for (i = 0; ISDIGIT (c); i++)
+    {
+      if (i == sizeof buf - 1)
+       FATAL_ERROR ((0, 0, _("Field too long while reading snapshot file")));
+      buf[i] = c;
+      c = getc (fp);
+    }
+
+  if (c < 0)
+    {
+      if (ferror (fp))
+       FATAL_ERROR ((0, errno, _("Read error in snapshot file")));
+      else if (i == 0)
+       return c;

       else
       else

-       fprintf (fp, "%u %u %s\n", directory->device_number,
-                directory->inode_number, directory->name);
+       FATAL_ERROR ((0, 0, _("Unexpected EOF in snapshot file")));

     }
     }

-  if (fclose (fp) == EOF)
-    ERROR ((0, errno, "%s", listed_incremental_option));
+
+  buf[i] = 0;
+  errno = 0;
+  *pval = strtoumax (buf, &ep, 10);
+  if (c || errno || max_val < *pval)
+    FATAL_ERROR ((0, errno, _("Unexpected field value in snapshot file")));
+  return c;

 }
 
 }
 

-/*---.
-| ?  |
-`---*/
+/* Read from file FP a nul-terminated string and convert it to
+   uintmax_t.  Return the resulting value in PVAL.
+
+   Throw a fatal error if the string cannot be converted or if the
+   converted value exceeds MAX_VAL.
+
+   Return the last character read or EOF on end of file. */

 
 static int
 
 static int

-compare_names (char *param1, char *param2)
+read_num (FILE *fp, uintmax_t max_val, uintmax_t *pval)

 {
 {

-  struct name *n1 = (struct name *) param1;
-  struct name *n2 = (struct name *) param2;
+  return read_unsigned_num (getc (fp), fp, max_val, pval);
+}
+
+/* Read from FP two NUL-terminated strings representing a struct
+   timespec.  Return the resulting value in PVAL.

 
 

-  if (n1->found)
-    return n2->found ? strcmp (n1->name, n2->name) : -1;
+   Throw a fatal error if the string cannot be converted.  */

 
 

-  if (n2->found)
-    return 1;
+static void
+read_timespec (FILE *fp, struct timespec *pval)
+{
+  int c = getc (fp);
+  intmax_t i;
+  uintmax_t u;
+
+  if (c == '-')
+    {
+      read_negative_num (fp, TYPE_MINIMUM (time_t), &i);
+      c = 0;
+      pval->tv_sec = i;
+    }
+  else
+    {
+      c = read_unsigned_num (c, fp, TYPE_MAXIMUM (time_t), &u);
+      pval->tv_sec = u;
+    }

 
 

-  return strcmp (n1->name, n2->name);
+  if (c || read_num (fp, BILLION - 1, &u))
+    FATAL_ERROR ((0, 0, "%s: %s",
+                 quotearg_colon (listed_incremental_option),
+                 _("Unexpected EOF in snapshot file")));
+  pval->tv_nsec = u;

 }
 
 }
 

-/*-------------------------------------------------------------------------.
-| Collect all the names from argv[] (or whatever), then expand them into a |
-| directory tree, and put all the directories at the beginning.                   |
-`-------------------------------------------------------------------------*/
+/* Read incremental snapshot format 2 */
+static void
+read_incr_db_2 ()
+{
+  uintmax_t u;
+  struct obstack stk;
+
+  obstack_init (&stk);
+
+  read_timespec (listed_incremental_stream, &newer_mtime_option);
+
+  for (;;)
+    {
+      struct timespec mtime;
+      dev_t dev;
+      ino_t ino;
+      bool nfs;
+      char *name;
+      char *content;
+      size_t s;
+
+      if (read_num (listed_incremental_stream, 1, &u))
+       return; /* Normal return */
+
+      nfs = u;
+
+      read_timespec (listed_incremental_stream, &mtime);
+
+      if (read_num (listed_incremental_stream, TYPE_MAXIMUM (dev_t), &u))
+       break;
+      dev = u;
+
+      if (read_num (listed_incremental_stream, TYPE_MAXIMUM (ino_t), &u))
+       break;
+      ino = u;
+
+      if (read_obstack (listed_incremental_stream, &stk, &s))
+       break;
+
+      name = obstack_finish (&stk);
+
+      while (read_obstack (listed_incremental_stream, &stk, &s) == 0 && s > 1)
+       ;
+      if (getc (listed_incremental_stream) != 0)
+       FATAL_ERROR ((0, 0, "%s: %s",
+                     quotearg_colon (listed_incremental_option),
+                     _("Missing record terminator")));
+
+      content = obstack_finish (&stk);
+      note_directory (name, mtime, dev, ino, nfs, false, content);
+      obstack_free (&stk, content);
+    }
+  FATAL_ERROR ((0, 0, "%s: %s",
+               quotearg_colon (listed_incremental_option),
+               _("Unexpected EOF in snapshot file")));
+}

 
 

+/* Read incremental snapshot file (directory file).
+   If the file has older incremental version, make sure that it is processed
+   correctly and that tar will use the most conservative backup method among
+   possible alternatives (i.e. prefer ALL_CHILDREN over CHANGED_CHILDREN,
+   etc.) This ensures that the snapshots are updated to the recent version
+   without any loss of data. */

 void
 void

-collect_and_sort_names (void)
-{
-  struct name *name;
-  struct name *next_name;
-  int num_names;
-  struct stat statbuf;
-
-  name_gather ();
-
-  if (listed_incremental_option)
-    read_directory_file ();
-
-  if (!namelist)
-    addname (".");
-
-  for (name = namelist; name; name = next_name)
-    {
-      next_name = name->next;
-      if (name->found || name->dir_contents)
-       continue;
-      if (name->regexp)                /* FIXME: just skip regexps for now */
-       continue;
-      if (name->change_dir)
-       if (chdir (name->change_dir) < 0)
-         {
-           ERROR ((0, errno, _("Cannot chdir to %s"), name->change_dir));
-           continue;
-         }
-
-      if (
-#ifdef AIX
-         statx (name->name, &statbuf, STATSIZE, STX_HIDDEN | STX_LINK)
-#else
-         lstat (name->name, &statbuf) < 0
-#endif
-         )
+read_directory_file (void)
+{
+  int fd;
+  char *buf = 0;
+  size_t bufsize;
+  int flags = O_RDWR | O_CREAT;
+
+  if (incremental_level == 0)
+    flags |= O_TRUNC;
+  /* Open the file for both read and write.  That way, we can write
+     it later without having to reopen it, and don't have to worry if
+     we chdir in the meantime.  */
+  fd = open (listed_incremental_option, flags, MODE_RW);
+  if (fd < 0)
+    {
+      open_error (listed_incremental_option);
+      return;
+    }
+
+  listed_incremental_stream = fdopen (fd, "r+");
+  if (! listed_incremental_stream)
+    {
+      open_error (listed_incremental_option);
+      close (fd);
+      return;
+    }
+
+  if (0 < getline (&buf, &bufsize, listed_incremental_stream))
+    {
+      char *ebuf;
+      uintmax_t incremental_version;
+
+      if (strncmp (buf, PACKAGE_NAME, sizeof PACKAGE_NAME - 1) == 0)

        {
        {

-         ERROR ((0, errno, _("Cannot stat %s"), name->name));
-         continue;
+         ebuf = buf + sizeof PACKAGE_NAME - 1;
+         if (*ebuf++ != '-')
+           ERROR((1, 0, _("Bad incremental file format")));
+         for (; *ebuf != '-'; ebuf++)
+           if (!*ebuf)
+             ERROR((1, 0, _("Bad incremental file format")));
+
+         incremental_version = strtoumax (ebuf + 1, NULL, 10);

        }
        }

-      if (S_ISDIR (statbuf.st_mode))
+      else
+       incremental_version = 0;
+
+      switch (incremental_version)

        {
        {

-         name->found = 1;
-         add_hierarchy_to_namelist (name->name, statbuf.st_dev);
+       case 0:
+       case 1:
+         read_incr_db_01 (incremental_version, buf);
+         break;
+
+       case TAR_INCREMENTAL_VERSION:
+         read_incr_db_2 ();
+         break;
+
+       default:
+         ERROR ((1, 0, _("Unsupported incremental format version: %"PRIuMAX),
+                 incremental_version));

        }
        }

+

     }
 
     }
 

-  num_names = 0;
-  for (name = namelist; name; name = name->next)
-    num_names++;
-  namelist = (struct name *)
-    merge_sort ((voidstar) namelist, num_names,
-               (char *) (&(namelist->next)) - (char *) namelist,
-               compare_names);
+  if (ferror (listed_incremental_stream))
+    read_error (listed_incremental_option);
+  if (buf)
+    free (buf);
+}

 
 

-  for (name = namelist; name; name = name->next)
-    name->found = 0;
+/* Output incremental data for the directory ENTRY to the file DATA.
+   Return nonzero if successful, preserving errno on write failure.  */
+static bool
+write_directory_file_entry (void *entry, void *data)
+{
+  struct directory const *directory = entry;
+  FILE *fp = data;

 
 

-  if (listed_incremental_option)
-    write_dir_file ();
-}
-\f
-/* Restoration of incremental dumps.  */
+  if (DIR_IS_FOUND (directory))
+    {
+      char buf[UINTMAX_STRSIZE_BOUND];
+      char *s;
+
+      s = DIR_IS_NFS (directory) ? "1" : "0";
+      fwrite (s, 2, 1, fp);
+      s = (TYPE_SIGNED (time_t)
+          ? imaxtostr (directory->mtime.tv_sec, buf)
+          : umaxtostr (directory->mtime.tv_sec, buf));
+      fwrite (s, strlen (s) + 1, 1, fp);
+      s = umaxtostr (directory->mtime.tv_nsec, buf);
+      fwrite (s, strlen (s) + 1, 1, fp);
+      s = umaxtostr (directory->device_number, buf);
+      fwrite (s, strlen (s) + 1, 1, fp);
+      s = umaxtostr (directory->inode_number, buf);
+      fwrite (s, strlen (s) + 1, 1, fp);
+
+      fwrite (directory->name, strlen (directory->name) + 1, 1, fp);
+      if (directory->dump)
+       {
+         const char *p;
+         dumpdir_iter_t itr;
+
+         for (p = dumpdir_first (directory->dump, 0, &itr);
+              p;
+              p = dumpdir_next (itr))
+           fwrite (p, strlen (p) + 1, 1, fp);
+         free (itr);
+       }
+      fwrite ("\0\0", 2, 1, fp);
+    }

 
 

-/*---.
-| ?  |
-`---*/
+  return ! ferror (fp);
+}

 
 void
 
 void

-gnu_restore (int skipcrud)
+write_directory_file (void)

 {
 {

-  char *current_dir;
-  char *archive_dir;
-  struct accumulator *accumulator;
-  char *p;
-  DIR *dirp;
-  struct dirent *d;
-  char *cur, *arc;
-  long size, copied;
-  union block *data_block;
-  char *to;
+  FILE *fp = listed_incremental_stream;
+  char buf[UINTMAX_STRSIZE_BOUND];
+  char *s;

 
 

-#define CURRENT_FILE_NAME (skipcrud + current_file_name)
+  if (! fp)
+    return;

 
 

-  dirp = opendir (CURRENT_FILE_NAME);
+  if (fseek (fp, 0L, SEEK_SET) != 0)
+    seek_error (listed_incremental_option);
+  if (sys_truncate (fileno (fp)) != 0)
+    truncate_error (listed_incremental_option);

 
 

-  if (!dirp)
-    {
-      /* The directory doesn't exist now.  It'll be created.  In any
-        case, we don't have to delete any files out of it.  */
+  fprintf (fp, "%s-%s-%d\n", PACKAGE_NAME, PACKAGE_VERSION,
+          TAR_INCREMENTAL_VERSION);

 
 

-      skip_file ((long) current_stat.st_size);
-      return;
-    }
+  s = (TYPE_SIGNED (time_t)
+       ? imaxtostr (start_time.tv_sec, buf)
+       : umaxtostr (start_time.tv_sec, buf));
+  fwrite (s, strlen (s) + 1, 1, fp);
+  s = umaxtostr (start_time.tv_nsec, buf);
+  fwrite (s, strlen (s) + 1, 1, fp);

 
 

-  accumulator = new_accumulator ();
-  while (d = readdir (dirp), d)
-    {
-      if (is_dot_or_dotdot (d->d_name))
-       continue;
+  if (! ferror (fp) && directory_table)
+    hash_do_for_each (directory_table, write_directory_file_entry, fp);

 
 

-      add_to_accumulator (accumulator, d->d_name, (int) (NAMLEN (d) + 1));
-    }
-  closedir (dirp);
-  add_to_accumulator (accumulator, "", 1);
+  if (ferror (fp))
+    write_error (listed_incremental_option);
+  if (fclose (fp) != 0)
+    close_error (listed_incremental_option);
+}
+
+\f
+/* Restoration of incremental dumps.  */

 
 

-  current_dir = get_accumulator (accumulator);
-  archive_dir = (char *) xmalloc ((size_t) current_stat.st_size);
+static void
+get_gnu_dumpdir (struct tar_stat_info *stat_info)
+{
+  size_t size;
+  size_t copied;
+  union block *data_block;
+  char *to;
+  char *archive_dir;
+
+  size = stat_info->stat.st_size;
+
+  archive_dir = xmalloc (size);

   to = archive_dir;
   to = archive_dir;

-  for (size = current_stat.st_size; size > 0; size -= copied)
+
+  set_next_block_after (current_header);
+  mv_begin (stat_info);
+
+  for (; size > 0; size -= copied)

     {
     {

+      mv_size_left (size);

       data_block = find_next_block ();
       if (!data_block)
       data_block = find_next_block ();
       if (!data_block)

-       {
-         ERROR ((0, 0, _("Unexpected EOF in archive")));
-         break;                /* FIXME: What happens then?  */
-       }
+       ERROR ((1, 0, _("Unexpected EOF in archive")));

       copied = available_space_after (data_block);
       if (copied > size)
        copied = size;
       copied = available_space_after (data_block);
       if (copied > size)
        copied = size;

-      memcpy (to, data_block->buffer, (size_t) copied);
+      memcpy (to, data_block->buffer, copied);

       to += copied;
       set_next_block_after ((union block *)
                            (data_block->buffer + copied - 1));
     }
 
       to += copied;
       set_next_block_after ((union block *)
                            (data_block->buffer + copied - 1));
     }
 

+  mv_end ();
+
+  stat_info->dumpdir = archive_dir;
+  stat_info->skipped = true; /* For skip_member() and friends
+                               to work correctly */
+}
+
+/* Return T if STAT_INFO represents a dumpdir archive member.
+   Note: can invalidate current_header. It happens if flush_archive()
+   gets called within get_gnu_dumpdir() */
+bool
+is_dumpdir (struct tar_stat_info *stat_info)
+{
+  if (stat_info->is_dumpdir && !stat_info->dumpdir)
+    get_gnu_dumpdir (stat_info);
+  return stat_info->is_dumpdir;
+}
+
+static bool
+dumpdir_ok (char *dumpdir)
+{
+  char *p;
+  int has_tempdir = 0;
+  int expect = 0;
+
+  for (p = dumpdir; *p; p += strlen (p) + 1)
+    {
+      if (expect && *p != expect)
+       {
+         ERROR ((0, 0,
+                 _("Malformed dumpdir: expected '%c' but found %#3o"),
+                 expect, *p));
+         return false;
+       }
+      switch (*p)
+       {
+       case 'X':
+         if (has_tempdir)
+           {
+             ERROR ((0, 0,
+                     _("Malformed dumpdir: 'X' duplicated")));
+             return false;
+           }
+         else
+           has_tempdir = 1;
+         break;
+
+       case 'R':
+         if (p[1] == 0)
+           {
+             if (!has_tempdir)
+               {
+                 ERROR ((0, 0,
+                         _("Malformed dumpdir: empty name in 'R'")));
+                 return false;
+               }
+             else
+               has_tempdir = 0;
+           }
+         expect = 'T';
+         break;
+
+       case 'T':
+         if (expect != 'T')
+           {
+             ERROR ((0, 0,
+                     _("Malformed dumpdir: 'T' not preceeded by 'R'")));
+             return false;
+           }
+         if (p[1] == 0 && !has_tempdir)
+           {
+             ERROR ((0, 0,
+                     _("Malformed dumpdir: empty name in 'T'")));
+             return false;
+           }
+         expect = 0;
+         break;
+
+       case 'N':
+       case 'Y':
+       case 'D':
+         break;
+
+       default:
+         /* FIXME: bail out? */
+         break;
+       }
+    }
+
+  if (expect)
+    {
+      ERROR ((0, 0,
+             _("Malformed dumpdir: expected '%c' but found end of data"),
+             expect));
+      return false;
+    }
+
+  if (has_tempdir)
+    WARNOPT (WARN_BAD_DUMPDIR,
+            (0, 0, _("Malformed dumpdir: 'X' never used")));
+
+  return true;
+}
+
+/* Examine the directories under directory_name and delete any
+   files that were not there at the time of the back-up. */
+static bool
+try_purge_directory (char const *directory_name)
+{
+  char *current_dir;
+  char *cur, *arc, *p;
+  char *temp_stub = NULL;
+  struct dumpdir *dump;
+
+  if (!is_dumpdir (&current_stat_info))
+    return false;
+
+  current_dir = savedir (directory_name);
+
+  if (!current_dir)
+    /* The directory doesn't exist now.  It'll be created.  In any
+       case, we don't have to delete any files out of it.  */
+    return false;
+
+  /* Verify if dump directory is sane */
+  if (!dumpdir_ok (current_stat_info.dumpdir))
+    return false;
+
+  /* Process renames */
+  for (arc = current_stat_info.dumpdir; *arc; arc += strlen (arc) + 1)
+    {
+      if (*arc == 'X')
+       {
+#define TEMP_DIR_TEMPLATE "tar.XXXXXX"
+         size_t len = strlen (arc + 1);
+         temp_stub = xrealloc (temp_stub, len + 1 + sizeof TEMP_DIR_TEMPLATE);
+         memcpy (temp_stub, arc + 1, len);
+         temp_stub[len] = '/';
+         memcpy (temp_stub + len + 1, TEMP_DIR_TEMPLATE,
+                 sizeof TEMP_DIR_TEMPLATE);
+         if (!mkdtemp (temp_stub))
+           {
+             ERROR ((0, errno,
+                     _("Cannot create temporary directory using template %s"),
+                     quote (temp_stub)));
+             free (temp_stub);
+             free (current_dir);
+             return false;
+           }
+       }
+      else if (*arc == 'R')
+       {
+         char *src, *dst;
+         src = arc + 1;
+         arc += strlen (arc) + 1;
+         dst = arc + 1;
+
+         /* Ensure that neither source nor destination are absolute file
+            names (unless permitted by -P option), and that they do not
+            contain dubious parts (e.g. ../).
+
+            This is an extra safety precaution. Besides, it might be
+            necessary to extract from archives created with tar versions
+            prior to 1.19. */
+
+         if (*src)
+           src = safer_name_suffix (src, false, absolute_names_option);
+         if (*dst)
+           dst = safer_name_suffix (dst, false, absolute_names_option);
+
+         if (*src == 0)
+           src = temp_stub;
+         else if (*dst == 0)
+           dst = temp_stub;
+
+         if (!rename_directory (src, dst))
+           {
+             free (temp_stub);
+             free (current_dir);
+             /* FIXME: Make sure purge_directory(dst) will return
+                immediately */
+             return false;
+           }
+       }
+    }
+
+  free (temp_stub);
+
+  /* Process deletes */
+  dump = dumpdir_create (current_stat_info.dumpdir);
+  p = NULL;

   for (cur = current_dir; *cur; cur += strlen (cur) + 1)
     {
   for (cur = current_dir; *cur; cur += strlen (cur) + 1)
     {

-      for (arc = archive_dir; *arc; arc += strlen (arc) + 1)
+      const char *entry;
+      struct stat st;
+      if (p)
+       free (p);
+      p = new_name (directory_name, cur);
+
+      if (deref_stat (false, p, &st))

        {
        {

-         arc++;
-         if (!strcmp (arc, cur))
-           break;
+         if (errno != ENOENT) /* FIXME: Maybe keep a list of renamed
+                                 dirs and check it here? */
+           {
+             stat_diag (p);
+             WARN ((0, 0, _("%s: Not purging directory: unable to stat"),
+                    quotearg_colon (p)));
+           }
+         continue;

        }
        }

-      if (*arc == '\0')
+
+      if (!(entry = dumpdir_locate (dump, cur))
+         || (*entry == 'D' && !S_ISDIR (st.st_mode))
+         || (*entry == 'Y' && S_ISDIR (st.st_mode)))

        {
        {

-         p = new_name (CURRENT_FILE_NAME, cur);
-         if (interactive_option && !confirm ("delete", p))
+         if (one_file_system_option && st.st_dev != root_device)

            {
            {

-             free (p);
+             WARN ((0, 0,
+                    _("%s: directory is on a different device: not purging"),
+                    quotearg_colon (p)));

              continue;
            }
              continue;
            }

-         if (verbose_option)
-           fprintf (stdlis, _("%s: Deleting %s\n"), program_name, p);
-         if (!remove_any_file (p, 1))
-           ERROR ((0, errno, _("Error while deleting %s"), p));
-         free (p);
-       }

 
 

+         if (! interactive_option || confirm ("delete", p))
+           {
+             if (verbose_option)
+               fprintf (stdlis, _("%s: Deleting %s\n"),
+                        program_name, quote (p));
+             if (! remove_any_file (p, RECURSIVE_REMOVE_OPTION))
+               {
+                 int e = errno;
+                 ERROR ((0, e, _("%s: Cannot remove"), quotearg_colon (p)));
+               }
+           }
+       }

     }
     }

-  delete_accumulator (accumulator);
-  free (archive_dir);
+  free (p);
+  dumpdir_free (dump);
+  
+  free (current_dir);
+  return true;
+}

 
 

-#undef CURRENT_FILE_NAME
+void
+purge_directory (char const *directory_name)
+{
+  if (!try_purge_directory (directory_name))
+    skip_member ();
+}
+
+void
+list_dumpdir (char *buffer, size_t size)
+{
+  int state = 0;
+  while (size)
+    {
+      switch (*buffer)
+       {
+       case 'Y':
+       case 'N':
+       case 'D':
+       case 'R':
+       case 'T':
+       case 'X':
+         fprintf (stdlis, "%c", *buffer);
+         if (state == 0)
+           {
+             fprintf (stdlis, " ");
+             state = 1;
+           }
+         buffer++;
+         size--;
+         break;
+
+       case 0:
+         fputc ('\n', stdlis);
+         buffer++;
+         size--;
+         state = 0;
+         break;
+
+       default:
+         fputc (*buffer, stdlis);
+         buffer++;
+         size--;
+       }
+    }

 }
 }