X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fincremen.c;h=c68a88b48e83389359b57eb3cbbccefb19b0a3a9;hb=8e3f3adf9888cca4acedfe005d277867c999fcb3;hp=5e853f6bf658b74611ada2aab92dc2f5c5a674aa;hpb=463d99453f51ac4ae875d9bae97418671e7a62bc;p=chaz%2Ftar diff --git a/src/incremen.c b/src/incremen.c index 5e853f6..c68a88b 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -1,7 +1,7 @@ /* GNU dump extensions to tar. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 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 @@ -15,34 +15,60 @@ 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 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "system.h" +#include #include #include +#include #include #include "common.h" -#define obstack_chunk_alloc xmalloc -#define obstack_chunk_free free -#include /* Incremental dump specialities. */ /* Which child files to save under a directory. */ -enum children {NO_CHILDREN, CHANGED_CHILDREN, ALL_CHILDREN}; +enum children + { + NO_CHILDREN, + CHANGED_CHILDREN, + ALL_CHILDREN + }; + +#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 */ + +#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) + +#define DIR_SET_FLAG(d,f) (d)->flags |= (f) +#define DIR_CLEAR_FLAG(d,f) (d)->flags &= ~(f) /* Directory attributes. */ struct directory { + struct timespec mtime; /* Modification time */ dev_t device_number; /* device number for directory */ ino_t inode_number; /* inode number for directory */ - enum children children; - bool nfs; - bool found; + char *contents; /* Directory contents */ + char *icontents; /* 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 */ char name[1]; /* file name of directory */ }; static Hash_table *directory_table; +static Hash_table *directory_meta_table; #if HAVE_ST_FSTYPE_STRING static char const nfs_string[] = "nfs"; @@ -53,88 +79,394 @@ static Hash_table *directory_table; #endif /* Calculate the hash of a directory. */ -static unsigned -hash_directory (void const *entry, unsigned n_buckets) +static size_t +hash_directory_name (void const *entry, size_t n_buckets) { struct directory const *directory = entry; return hash_string (directory->name, n_buckets); } -/* Compare two directories for equality. */ +/* Compare two directories for equality of their names. */ static bool -compare_directories (void const *entry1, void const *entry2) +compare_directory_names (void const *entry1, void const *entry2) { struct directory const *directory1 = entry1; struct directory const *directory2 = entry2; return strcmp (directory1->name, directory2->name) == 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; +} + +/* Make a directory entry for given NAME */ +static struct directory * +make_directory (const char *name) +{ + size_t namelen = strlen (name); + size_t size = offsetof (struct directory, name) + namelen + 1; + struct directory *directory = xmalloc (size); + directory->contents = directory->icontents = NULL; + directory->orig = NULL; + directory->flags = false; + strcpy (directory->name, name); + if (ISSLASH (directory->name[namelen-1])) + directory->name[namelen-1] = 0; + return directory; +} + /* 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, dev_t dev, ino_t ino, bool nfs, bool found) +note_directory (char const *name, struct timespec mtime, + dev_t dev, ino_t ino, bool nfs, bool found, char *contents) { - size_t size = offsetof (struct directory, name) + strlen (name) + 1; - struct directory *directory = xmalloc (size); + struct directory *directory = make_directory (name); + directory->mtime = mtime; directory->device_number = dev; directory->inode_number = ino; directory->children = CHANGED_CHILDREN; - directory->nfs = nfs; - directory->found = found; - strcpy (directory->name, name); + if (nfs) + DIR_SET_FLAG (directory, DIRF_NFS); + if (found) + DIR_SET_FLAG (directory, DIRF_FOUND); + if (contents) + { + size_t size = dumpdir_size (contents); + directory->contents = xmalloc (size); + memcpy (directory->contents, contents, size); + } + else + directory->contents = NULL; if (! ((directory_table - || (directory_table = hash_initialize (0, 0, hash_directory, - compare_directories, 0))) + || (directory_table = hash_initialize (0, 0, + hash_directory_name, + compare_directory_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 * -find_directory (char *name) +find_directory (const char *name) { if (! directory_table) return 0; else { - size_t size = offsetof (struct directory, name) + strlen (name) + 1; - struct directory *dir = alloca (size); - strcpy (dir->name, name); - return hash_lookup (directory_table, dir); + struct directory *dir = make_directory (name); + struct directory *ret = hash_lookup (directory_table, dir); + free (dir); + return ret; + } +} + +/* 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 (""); + struct directory *ret; + dir->device_number = dev; + dir->inode_number = ino; + ret = hash_lookup (directory_meta_table, dir); + free (dir); + return ret; + } +} + +void +update_parent_directory (const char *name) +{ + 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); +} + +static struct directory * +procdir (char *name_buffer, struct stat *stat_data, + dev_t device, + enum children children, + bool verbose) +{ + struct directory *directory; + bool nfs = NFS_FILE_STAT (*stat_data); + + if ((directory = find_directory (name_buffer)) != NULL) + { + if (DIR_IS_INITED (directory)) + 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 (! (((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 (verbose_option) + WARN ((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); + directory->children = CHANGED_CHILDREN; + } + else + { + if (verbose_option) + WARN ((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 (verbose) + WARN ((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); + directory->children = CHANGED_CHILDREN; + } + else + { + DIR_SET_FLAG (directory, DIRF_NEW); + if (verbose) + WARN ((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; + } + } + + /* 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 (children == ALL_CHILDREN) + directory->children = ALL_CHILDREN; + + DIR_SET_FLAG (directory, DIRF_INIT); + + return directory; +} + +/* Locate NAME in the dumpdir array DUMP. + Return pointer to the slot in the array, or NULL if not found */ +const char * +dumpdir_locate (const char *dump, const char *name) +{ + if (dump) + while (*dump) + { + /* Ignore 'R' (rename) and 'X' (tempname) entries, since they break + alphabetical ordering. + They normally do not occur in dumpdirs from the snapshot files, + but this function is also used by purge_directory, which operates + on a dumpdir from the archive, hence the need for this test. */ + if (!strchr ("RX", *dump)) + { + int rc = strcmp (dump + 1, name); + if (rc == 0) + return dump; + if (rc > 1) + break; + } + dump += strlen (dump) + 1; + } + return NULL; +} + +/* Return size in bytes of the dumpdir array P */ +size_t +dumpdir_size (const char *p) +{ + size_t totsize = 0; + + while (*p) + { + size_t size = strlen (p) + 1; + totsize += size; + p += size; } + return totsize + 1; } static int -compare_dirents (const void *first, const void *second) +compare_dirnames (const void *first, const void *second) { - return strcmp ((*(char *const *) first) + 1, - (*(char *const *) second) + 1); + char const *const *name1 = first; + char const *const *name2 = second; + return strcmp (*name1, *name2); +} + +/* Compare dumpdir array from DIRECTORY with directory listing DIR and + build a new dumpdir template. + + DIR must be returned by a previous call to savedir(). + + File names in DIRECTORY->contents must be sorted + alphabetically. + + DIRECTORY->contents is replaced with the created template. Each entry is + prefixed with ' ' if it was present in DUMP and with 'Y' otherwise. */ + +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; + const char *dump; + + if (directory->children == ALL_CHILDREN) + dump = NULL; + else if (DIR_IS_RENAMED (directory)) + dump = directory->orig->icontents ? + directory->orig->icontents : directory->orig->contents; + else + dump = directory->contents; + + /* 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) + { + *new_dump_ptr++ = ' '; + dump = loc + strlen (loc) + 1; + } + else + *new_dump_ptr++ = 'Y'; /* New entry */ + + /* Copy the file name */ + for (p = array[i]; (*new_dump_ptr++ = *p++); ) + ; + } + *new_dump_ptr = 0; + directory->icontents = directory->contents; + directory->contents = new_dump; + free (array); } /* Recursively scan the given directory. */ -static void -scan_directory (struct obstack *stk, char *dir_name, dev_t device) +static char * +scan_directory (char *dir_name, dev_t device) { char *dirp = savedir (dir_name); /* for scanning directory */ - char const *entry; /* directory entry being scanned */ - size_t entrylen; /* length of directory entry */ 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 directory *directory; /* for checking if already seen */ - enum children children; + struct stat stat_data; + struct directory *directory; if (! dirp) - { - savedir_error (dir_name); - } - errno = 0; + savedir_error (dir_name); name_buffer_size = strlen (dir_name) + NAME_FIELD_SIZE; name_buffer = xmalloc (name_buffer_size + 2); @@ -143,182 +475,557 @@ scan_directory (struct obstack *stk, char *dir_name, dev_t device) strcat (name_buffer, "/"); name_length = strlen (name_buffer); - directory = find_directory (dir_name); - children = directory ? directory->children : CHANGED_CHILDREN; + 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; + } - if (dirp && children != NO_CHILDREN) - for (entry = dirp; - (entrylen = strlen (entry)) != 0; - entry += entrylen + 1) - { - if (name_buffer_size <= entrylen + name_length) - { - do - name_buffer_size += NAME_FIELD_SIZE; - while (name_buffer_size <= entrylen + name_length); - name_buffer = xrealloc (name_buffer, name_buffer_size + 2); - } - strcpy (name_buffer + name_length, entry); + directory = procdir (name_buffer, &stat_data, device, NO_CHILDREN, false); - if (excluded_name (name_buffer)) - obstack_1grow (stk, 'N'); - else - { - struct stat stat_data; - - if (deref_stat (dereference_option, name_buffer, &stat_data)) - { - stat_diag (name_buffer); - continue; - } - - if (S_ISDIR (stat_data.st_mode)) - { - bool nfs = NFS_FILE_STAT (stat_data); - - if ((directory = find_directory (name_buffer)) != NULL) - { - /* 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 (! (((directory->nfs & nfs) - || directory->device_number == stat_data.st_dev) - && directory->inode_number == stat_data.st_ino)) - { - if (verbose_option) - WARN ((0, 0, _("%s: Directory has been renamed"), - quotearg_colon (name_buffer))); - directory->children = ALL_CHILDREN; - directory->nfs = nfs; - directory->device_number = stat_data.st_dev; - directory->inode_number = stat_data.st_ino; - } - directory->found = 1; - } - else - { - if (verbose_option) - WARN ((0, 0, _("%s: Directory is new"), - quotearg_colon (name_buffer))); - directory = note_directory (name_buffer, - stat_data.st_dev, - stat_data.st_ino, nfs, 1); - directory->children = - ((listed_incremental_option - || OLDER_STAT_TIME (stat_data, m) - || (after_date_option - && OLDER_STAT_TIME (stat_data, c))) - ? ALL_CHILDREN - : CHANGED_CHILDREN); - } - - if (one_file_system_option && device != stat_data.st_dev) - directory->children = NO_CHILDREN; - else if (children == ALL_CHILDREN) - directory->children = ALL_CHILDREN; - - obstack_1grow (stk, 'D'); - } - - else if (one_file_system_option && device != stat_data.st_dev) - obstack_1grow (stk, 'N'); - -#ifdef S_ISHIDDEN - else if (S_ISHIDDEN (stat_data.st_mode)) - { - obstack_1grow (stk, 'D'); - obstack_grow (stk, entry, entrylen); - obstack_grow (stk, "A", 2); - continue; - } -#endif + if (dirp && directory->children != NO_CHILDREN) + { + char *entry; /* directory entry being scanned */ + size_t entrylen; /* length of directory entry */ - else - if (children == CHANGED_CHILDREN - && OLDER_STAT_TIME (stat_data, m) - && (!after_date_option || OLDER_STAT_TIME (stat_data, c))) - obstack_1grow (stk, 'N'); - else - obstack_1grow (stk, 'Y'); - } + makedumpdir (directory, dirp); - obstack_grow (stk, entry, entrylen + 1); - } + for (entry = directory->contents; + (entrylen = strlen (entry)) != 0; + entry += entrylen + 1) + { + 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); + + if (excluded_name (name_buffer)) + *entry = 'N'; + else + { + if (deref_stat (dereference_option, name_buffer, &stat_data)) + { + stat_diag (name_buffer); + *entry = 'N'; + continue; + } + + if (S_ISDIR (stat_data.st_mode)) + { + procdir (name_buffer, &stat_data, device, + directory->children, + verbose_option); + *entry = 'D'; + } + + else if (one_file_system_option && device != stat_data.st_dev) + *entry = 'N'; + + else if (*entry == 'Y') + /* New entry, skip further checks */; - obstack_grow (stk, "\000\000", 2); + /* FIXME: if (S_ISHIDDEN (stat_data.st_mode))?? */ + + else if (OLDER_STAT_TIME (stat_data, m) + && (!after_date_option + || OLDER_STAT_TIME (stat_data, c))) + *entry = 'N'; + else + *entry = 'Y'; + } + } + } free (name_buffer); if (dirp) free (dirp); + + return directory->contents; } -/* Sort the contents of the obstack, and convert it to the char * */ -static char * -sort_obstack (struct obstack *stk) +char * +get_directory_contents (char *dir_name, dev_t device) { - char *pointer = obstack_finish (stk); - size_t counter; - char *cursor; - char *buffer; - char **array; - char **array_cursor; + return scan_directory (dir_name, device); +} - counter = 0; - for (cursor = pointer; *cursor; cursor += strlen (cursor) + 1) - counter++; + +static void +obstack_code_rename (struct obstack *stk, char *from, char *to) +{ + obstack_1grow (stk, 'R'); + obstack_grow (stk, from, strlen (from) + 1); + obstack_1grow (stk, 'T'); + obstack_grow (stk, to, strlen (to) + 1); +} - if (!counter) - return NULL; +static bool +rename_handler (void *data, void *proc_data) +{ + struct directory *dir = data; + struct obstack *stk = proc_data; - array = obstack_alloc (stk, sizeof (char *) * (counter + 1)); + if (DIR_IS_RENAMED (dir)) + { + struct directory *prev, *p; - array_cursor = array; - for (cursor = pointer; *cursor; cursor += strlen (cursor) + 1) - *array_cursor++ = cursor; - *array_cursor = 0; + /* Detect eventual cycles and clear DIRF_RENAMED flag, so this 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); - qsort (array, counter, sizeof (char *), compare_dirents); + if (prev == NULL) + { + for (p = dir; p && p->orig; p = p->orig) + obstack_code_rename (stk, p->orig->name, p->name); + } + else + { + char *temp_name; - buffer = xmalloc (cursor - pointer + 2); + DIR_CLEAR_FLAG (prev, DIRF_RENAMED); - cursor = buffer; - for (array_cursor = array; *array_cursor; array_cursor++) - { - char *string = *array_cursor; + /* 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); - while ((*cursor++ = *string++)) - continue; + obstack_code_rename (stk, "", prev->name); + } } - *cursor = '\0'; - return buffer; + return true; } -char * -get_directory_contents (char *dir_name, dev_t device) +const char * +append_incremental_renames (const char *dump) { struct obstack stk; - char *buffer; + size_t size; + + if (directory_table == NULL) + return dump; obstack_init (&stk); - scan_directory (&stk, dir_name, device); - buffer = sort_obstack (&stk); - obstack_free (&stk, NULL); - return buffer; + if (dump) + { + size = dumpdir_size (dump) - 1; + obstack_grow (&stk, dump, size); + } + else + size = 0; + + hash_do_for_each (directory_table, rename_handler, &stk); + if (obstack_object_size (&stk) != size) + { + obstack_1grow (&stk, 0); + dump = obstack_finish (&stk); + } + else + obstack_free (&stk, NULL); + return dump; } static FILE *listed_incremental_stream; +/* 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 */ + +#define TAR_INCREMENTAL_VERSION 2 + +/* 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; + } + else + { + buf = strdup (initbuf); + bufsize = strlen (buf) + 1; + } + + 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); + note_directory (strp, mtime, dev, ino, nfs, false, NULL); + } + 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. + + Return the last character read or EOF on end of file. */ +static int +read_obstack (FILE *fp, struct obstack *stk, size_t *pcount) +{ + int c; + size_t i; + + 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++) + { + if (i == sizeof buf - 1) + FATAL_ERROR ((0, 0, _("Field too long while reading snapshot file"))); + buf[i] = c; + } + + if (c < 0) + { + 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 + FATAL_ERROR ((0, 0, _("Unexpected EOF in snapshot file"))); + } + + 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 +read_num (FILE *fp, uintmax_t max_val, uintmax_t *pval) +{ + 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. + + Throw a fatal error if the string cannot be converted. */ + +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; + } + + 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; +} + +/* 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 read_directory_file (void) { int fd; - FILE *fp; char *buf = 0; size_t bufsize; @@ -332,78 +1039,52 @@ read_directory_file (void) return; } - fp = fdopen (fd, "r+"); - if (! fp) + listed_incremental_stream = fdopen (fd, "r+"); + if (! listed_incremental_stream) { open_error (listed_incremental_option); close (fd); return; } - listed_incremental_stream = fp; - - if (0 < getline (&buf, &bufsize, fp)) + if (0 < getline (&buf, &bufsize, listed_incremental_stream)) { char *ebuf; - int n; - long lineno = 1; - unsigned long u = (errno = 0, strtoul (buf, &ebuf, 10)); - time_t t = u; - if (buf == ebuf || (u == 0 && errno == EINVAL)) - ERROR ((0, 0, "%s:1: %s", quotearg_colon (listed_incremental_option), - _("Invalid time stamp"))); - else if (t != u || (u == -1 && errno == ERANGE)) - ERROR ((0, 0, "%s:1: %s", quotearg_colon (listed_incremental_option), - _("Time stamp out of range"))); - else + uintmax_t incremental_version; + + if (strncmp (buf, PACKAGE_NAME, sizeof PACKAGE_NAME - 1) == 0) { - newer_mtime_option.tv_sec = t; - newer_mtime_option.tv_nsec = 0; + 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); } + else + incremental_version = 0; - while (0 < (n = getline (&buf, &bufsize, fp))) + switch (incremental_version) { - dev_t dev; - ino_t ino; - bool nfs = buf[0] == '+'; - char *strp = buf + nfs; - - lineno++; - - if (buf[n - 1] == '\n') - buf[n - 1] = '\0'; - - errno = 0; - dev = u = strtoul (strp, &ebuf, 10); - if (strp == ebuf || (u == 0 && errno == EINVAL)) - ERROR ((0, 0, "%s:%ld: %s", - quotearg_colon (listed_incremental_option), lineno, - _("Invalid device number"))); - else if (dev != u || (u == -1 && errno == ERANGE)) - ERROR ((0, 0, "%s:%ld: %s", - quotearg_colon (listed_incremental_option), lineno, - _("Device number out of range"))); - strp = ebuf; - - errno = 0; - ino = u = strtoul (strp, &ebuf, 10); - if (strp == ebuf || (u == 0 && errno == EINVAL)) - ERROR ((0, 0, "%s:%ld: %s", - quotearg_colon (listed_incremental_option), lineno, - _("Invalid inode number"))); - else if (ino != u || (u == -1 && errno == ERANGE)) - ERROR ((0, 0, "%s:%ld: %s", - quotearg_colon (listed_incremental_option), lineno, - _("Inode number out of range"))); - strp = ebuf; - - strp++; - unquote_string (strp); - note_directory (strp, dev, ino, nfs, 0); + 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)); } + } - if (ferror (fp)) + if (ferror (listed_incremental_stream)) read_error (listed_incremental_option); if (buf) free (buf); @@ -417,18 +1098,35 @@ write_directory_file_entry (void *entry, void *data) struct directory const *directory = entry; FILE *fp = data; - if (directory->found) + if (DIR_IS_FOUND (directory)) { - int e; - char *str = quote_copy_string (directory->name); - fprintf (fp, "+%lu %lu %s\n" + ! directory->nfs, - (unsigned long) directory->device_number, - (unsigned long) directory->inode_number, - str ? str : directory->name); - e = errno; - if (str) - free (str); - errno = e; + 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->contents) + { + char *p; + for (p = directory->contents; *p; p += strlen (p) + 1) + { + if (strchr ("YND", *p)) + fwrite (p, strlen (p) + 1, 1, fp); + } + } + fwrite ("\0\0", 2, 1, fp); } return ! ferror (fp); @@ -438,6 +1136,8 @@ void write_directory_file (void) { FILE *fp = listed_incremental_stream; + char buf[UINTMAX_STRSIZE_BOUND]; + char *s; if (! fp) return; @@ -447,9 +1147,19 @@ write_directory_file (void) if (sys_truncate (fileno (fp)) != 0) truncate_error (listed_incremental_option); - fprintf (fp, "%lu\n", (unsigned long) start_time); + fprintf (fp, "%s-%s-%d\n", PACKAGE_NAME, PACKAGE_VERSION, + TAR_INCREMENTAL_VERSION); + + 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); + if (! ferror (fp) && directory_table) hash_do_for_each (directory_table, write_directory_file_entry, fp); + if (ferror (fp)) write_error (listed_incremental_option); if (fclose (fp) != 0) @@ -459,44 +1169,29 @@ write_directory_file (void) /* Restoration of incremental dumps. */ -/* Examine the directories under directory_name and delete any - files that were not there at the time of the back-up. - FIXME: The function name is obviously a misnomer */ -void -gnu_restore (char const *directory_name) +static void +get_gnu_dumpdir (struct tar_stat_info *stat_info) { - char *archive_dir; - char *current_dir; - char *cur, *arc; size_t size; size_t copied; union block *data_block; char *to; + char *archive_dir; - 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. */ - - skip_member (); - return; - } + size = stat_info->stat.st_size; - size = current_stat_info.stat.st_size; - if (size != current_stat_info.stat.st_size) - xalloc_die (); archive_dir = xmalloc (size); to = archive_dir; + + 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) - { - 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; @@ -506,32 +1201,267 @@ gnu_restore (char const *directory_name) (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) + WARN ((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; + + if (!is_dumpdir (¤t_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; + + 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 */ + p = NULL; 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 (current_stat_info.dumpdir, cur)) + || (*entry == 'D' && !S_ISDIR (st.st_mode)) + || (*entry == 'Y' && S_ISDIR (st.st_mode))) { - char *p = new_name (directory_name, cur); + if (one_file_system_option && st.st_dev != root_device) + { + WARN ((0, 0, + _("%s: directory is on a different device: not purging"), + quotearg_colon (p))); + continue; + } + if (! interactive_option || confirm ("delete", p)) { if (verbose_option) fprintf (stdlis, _("%s: Deleting %s\n"), program_name, quote (p)); - if (! remove_any_file (p, 1)) + if (! remove_any_file (p, RECURSIVE_REMOVE_OPTION)) { int e = errno; ERROR ((0, e, _("%s: Cannot remove"), quotearg_colon (p))); } } - free (p); } - } + free (p); + free (current_dir); - free (archive_dir); + return true; +} + +void +purge_directory (char const *directory_name) +{ + if (!try_purge_directory (directory_name)) + skip_member (); +} + +void +list_dumpdir (char *buffer, size_t size) +{ + while (size) + { + switch (*buffer) + { + case 'Y': + case 'N': + case 'D': + case 'R': + case 'T': + case 'X': + fprintf (stdlis, "%c ", *buffer); + buffer++; + size--; + break; + + case 0: + fputc ('\n', stdlis); + buffer++; + size--; + break; + + default: + fputc (*buffer, stdlis); + buffer++; + size--; + } + } }