X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fnames.c;h=03eece6655a44b629ab25ec99ee0008548e53206;hb=85cf996677770c517b4b6c138155c79d7c86b28f;hp=72b928003cf8f516f64232e6cc7a47c84e5e2007;hpb=85e724550f9a0acb454c0fbd836a2f74a2cb1f0b;p=chaz%2Ftar diff --git a/src/names.c b/src/names.c index 72b9280..03eece6 100644 --- a/src/names.c +++ b/src/names.c @@ -1,5 +1,7 @@ /* Various processing of names. - Copyright 1988, 92, 94, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. + + Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001, + 2003, 2004, 2005 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 @@ -13,14 +15,12 @@ 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 #include "common.h" @@ -41,104 +41,106 @@ struct group *getgrgid (); This code should also be modified for non-UNIX systems to do something reasonable. */ -static char cached_uname[UNAME_FIELD_SIZE]; -static char cached_gname[GNAME_FIELD_SIZE]; +static char *cached_uname; +static char *cached_gname; static uid_t cached_uid; /* valid only if cached_uname is not empty */ static gid_t cached_gid; /* valid only if cached_gname is not empty */ /* These variables are valid only if nonempty. */ -static char cached_no_such_uname[UNAME_FIELD_SIZE]; -static char cached_no_such_gname[GNAME_FIELD_SIZE]; +static char *cached_no_such_uname; +static char *cached_no_such_gname; /* These variables are valid only if nonzero. It's not worth optimizing the case for weird systems where 0 is not a valid uid or gid. */ static uid_t cached_no_such_uid; static gid_t cached_no_such_gid; +static void register_individual_file (char const *name); + /* Given UID, find the corresponding UNAME. */ void -uid_to_uname (uid_t uid, char uname[UNAME_FIELD_SIZE]) +uid_to_uname (uid_t uid, char **uname) { struct passwd *passwd; if (uid != 0 && uid == cached_no_such_uid) { - *uname = '\0'; + *uname = xstrdup (""); return; } - if (!cached_uname[0] || uid != cached_uid) + if (!cached_uname || uid != cached_uid) { passwd = getpwuid (uid); if (passwd) { cached_uid = uid; - strncpy (cached_uname, passwd->pw_name, UNAME_FIELD_SIZE); + assign_string (&cached_uname, passwd->pw_name); } else { cached_no_such_uid = uid; - *uname = '\0'; + *uname = xstrdup (""); return; } } - strncpy (uname, cached_uname, UNAME_FIELD_SIZE); + *uname = xstrdup (cached_uname); } /* Given GID, find the corresponding GNAME. */ void -gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) +gid_to_gname (gid_t gid, char **gname) { struct group *group; if (gid != 0 && gid == cached_no_such_gid) { - *gname = '\0'; + *gname = xstrdup (""); return; } - if (!cached_gname[0] || gid != cached_gid) + if (!cached_gname || gid != cached_gid) { group = getgrgid (gid); if (group) { cached_gid = gid; - strncpy (cached_gname, group->gr_name, GNAME_FIELD_SIZE); + assign_string (&cached_gname, group->gr_name); } else { cached_no_such_gid = gid; - *gname = '\0'; + *gname = xstrdup (""); return; } } - strncpy (gname, cached_gname, GNAME_FIELD_SIZE); + *gname = xstrdup (cached_gname); } /* Given UNAME, set the corresponding UID and return 1, or else, return 0. */ int -uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *uidp) +uname_to_uid (char const *uname, uid_t *uidp) { struct passwd *passwd; - if (cached_no_such_uname[0] - && strncmp (uname, cached_no_such_uname, UNAME_FIELD_SIZE) == 0) + if (cached_no_such_uname + && strcmp (uname, cached_no_such_uname) == 0) return 0; - if (!cached_uname[0] + if (!cached_uname || uname[0] != cached_uname[0] - || strncmp (uname, cached_uname, UNAME_FIELD_SIZE) != 0) + || strcmp (uname, cached_uname) != 0) { passwd = getpwnam (uname); if (passwd) { cached_uid = passwd->pw_uid; - strncpy (cached_uname, uname, UNAME_FIELD_SIZE); + assign_string (&cached_uname, passwd->pw_name); } else { - strncpy (cached_no_such_uname, uname, UNAME_FIELD_SIZE); + assign_string (&cached_no_such_uname, uname); return 0; } } @@ -148,33 +150,34 @@ uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *uidp) /* Given GNAME, set the corresponding GID and return 1, or else, return 0. */ int -gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *gidp) +gname_to_gid (char const *gname, gid_t *gidp) { struct group *group; - if (cached_no_such_gname[0] - && strncmp (gname, cached_no_such_gname, GNAME_FIELD_SIZE) == 0) + if (cached_no_such_gname + && strcmp (gname, cached_no_such_gname) == 0) return 0; - if (!cached_gname[0] + if (!cached_gname || gname[0] != cached_gname[0] - || strncmp (gname, cached_gname, GNAME_FIELD_SIZE) != 0) + || strcmp (gname, cached_gname) != 0) { group = getgrnam (gname); if (group) { cached_gid = group->gr_gid; - strncpy (cached_gname, gname, GNAME_FIELD_SIZE); + assign_string (&cached_gname, gname); } else { - strncpy (cached_no_such_gname, gname, GNAME_FIELD_SIZE); + assign_string (&cached_no_such_gname, gname); return 0; } } *gidp = cached_gid; return 1; } + /* Names from the command call. */ @@ -206,10 +209,10 @@ name_add (const char *name) } name_array[names++] = name; } + /* Names from external name file. */ -static FILE *name_file; /* file to read names from */ static char *name_buffer; /* buffer to hold the current file name */ static size_t name_buffer_length; /* allocated length of name_buffer */ @@ -226,21 +229,10 @@ is_pattern (const char *string) /* Set up to gather file names for tar. They can either come from a file or were saved from decoding arguments. */ void -name_init (int argc, char *const *argv) +name_init (void) { name_buffer = xmalloc (NAME_FIELD_SIZE + 2); name_buffer_length = NAME_FIELD_SIZE; - - if (files_from_option) - { - if (!strcmp (files_from_option, "-")) - { - request_stdin ("-T"); - name_file = stdin; - } - else if (name_file = fopen (files_from_option, "r"), !name_file) - open_fatal (files_from_option); - } } void @@ -250,43 +242,6 @@ name_term (void) free (name_array); } -/* Read the next filename from name_file and null-terminate it. Put - it into name_buffer, reallocating and adjusting name_buffer_length - if necessary. Return 0 at end of file, 1 otherwise. */ -static int -read_name_from_file (void) -{ - int character; - size_t counter = 0; - - /* FIXME: getc may be called even if character was EOF the last time here. */ - - /* FIXME: This + 2 allocation might serve no purpose. */ - - while (character = getc (name_file), - character != EOF && character != filename_terminator) - { - if (counter == name_buffer_length) - { - name_buffer_length += NAME_FIELD_SIZE; - name_buffer = xrealloc (name_buffer, name_buffer_length + 2); - } - name_buffer[counter++] = character; - } - - if (counter == 0 && character == EOF) - return 0; - - if (counter == name_buffer_length) - { - name_buffer_length += NAME_FIELD_SIZE; - name_buffer = xrealloc (name_buffer, name_buffer_length + 2); - } - name_buffer[counter] = '\0'; - - return 1; -} - /* Get the next name from ARGV or the file of names. Result is in static storage and can't be relied upon across two calls. @@ -304,33 +259,30 @@ name_next (int change_dirs) if (filename_terminator == '\0') change_dirs = 0; - while (1) + while (name_index != names) { - /* Get a name, either from file or from saved arguments. */ - - if (name_index == names) - { - if (! name_file) - break; - if (! read_name_from_file ()) - break; - } - else + size_t source_len; + source = name_array[name_index++]; + source_len = strlen (source); + if (name_buffer_length < source_len) { - source = name_array[name_index++]; - if (strlen (source) > name_buffer_length) + do { - free (name_buffer); - name_buffer_length = strlen (source); - name_buffer = xmalloc (name_buffer_length + 2); + name_buffer_length *= 2; + if (! name_buffer_length) + xalloc_die (); } - strcpy (name_buffer, source); + while (name_buffer_length < source_len); + + free (name_buffer); + name_buffer = xmalloc (name_buffer_length + 2); } + strcpy (name_buffer, source); /* Zap trailing slashes. */ cursor = name_buffer + strlen (name_buffer) - 1; - while (cursor > name_buffer && *cursor == '/') + while (cursor > name_buffer && ISSLASH (*cursor)) *cursor-- = '\0'; if (chdir_flag) @@ -343,28 +295,17 @@ name_next (int change_dirs) chdir_flag = 1; else { - unquote_string (name_buffer); + if (unquote_option) + unquote_string (name_buffer); + if (incremental_option) + register_individual_file (name_buffer); return name_buffer; } } - /* No more names in file. */ - - if (name_file && chdir_flag) - FATAL_ERROR ((0, 0, _("Missing file name after -C"))); - return 0; } -/* Close the name file, if any. */ -void -name_close (void) -{ - if (name_file && name_file != stdin) - if (fclose (name_file) != 0) - close_error (name_buffer); -} - /* Gather names in a list for scanning. Could hash them later if we really care. @@ -380,7 +321,7 @@ name_gather (void) { /* Buffer able to hold a single name. */ static struct name *buffer; - static size_t allocated_length; + static size_t allocated_size; char const *name; @@ -388,12 +329,12 @@ name_gather (void) { static int change_dir; - if (allocated_length == 0) + if (allocated_size == 0) { - allocated_length = sizeof (struct name) + NAME_FIELD_SIZE; - buffer = xmalloc (allocated_length); + allocated_size = offsetof (struct name, name) + NAME_FIELD_SIZE + 1; + buffer = xmalloc (allocated_size); /* FIXME: This memset is overkill, and ugly... */ - memset (buffer, 0, allocated_length); + memset (buffer, 0, allocated_size); } while ((name = name_next (0)) && strcmp (name, "-C") == 0) @@ -406,20 +347,31 @@ name_gather (void) if (name) { + size_t needed_size; buffer->length = strlen (name); - if (sizeof (struct name) + buffer->length >= allocated_length) + needed_size = offsetof (struct name, name) + buffer->length + 1; + if (allocated_size < needed_size) { - allocated_length = sizeof (struct name) + buffer->length; - buffer = xrealloc (buffer, allocated_length); + do + { + allocated_size *= 2; + if (! allocated_size) + xalloc_die (); + } + while (allocated_size < needed_size); + + buffer = xrealloc (buffer, allocated_size); } buffer->change_dir = change_dir; - memcpy (buffer->name, name, buffer->length + 1); + strcpy (buffer->name, name); buffer->next = 0; - buffer->found = 0; + buffer->found_count = 0; namelist = buffer; nametail = &namelist->next; } + else if (change_dir) + addname (0, change_dir); } else { @@ -452,29 +404,33 @@ name_gather (void) struct name * addname (char const *string, int change_dir) { - struct name *name; - size_t length; - - length = string ? strlen (string) : 0; - name = xmalloc (sizeof (struct name) + length); - memset (name, 0, sizeof (struct name) + length); - name->next = 0; + size_t length = string ? strlen (string) : 0; + struct name *name = xmalloc (offsetof (struct name, name) + length + 1); if (string) { name->fake = 0; - name->length = length; - memcpy (name->name, string, length + 1); + strcpy (name->name, string); } else - name->fake = 1; + { + name->fake = 1; + + /* FIXME: This initialization (and the byte of memory that it + initializes) is probably not needed, but we are currently in + bug-fix mode so we'll leave it in for now. */ + name->name[0] = 0; + } - name->found = 0; + name->next = 0; + name->length = length; + name->found_count = 0; name->regexp = 0; /* assume not a regular expression */ name->firstch = 1; /* assume first char is literal */ name->change_dir = change_dir; name->dir_contents = 0; - + name->explicit = 1; + if (string && is_pattern (string)) { name->regexp = 1; @@ -487,65 +443,83 @@ addname (char const *string, int change_dir) return name; } -/* Return true if and only if name PATH (from an archive) matches any +/* Find a match for FILE_NAME (whose string length is LENGTH) in the name + list. */ +static struct name * +namelist_match (char const *file_name, size_t length, bool exact) +{ + struct name *p; + + for (p = namelist; p; p = p->next) + { + /* If first chars don't match, quick skip. */ + + if (p->firstch && p->name[0] != file_name[0]) + continue; + + if (p->regexp + ? fnmatch (p->name, file_name, recursion_option) == 0 + : exact ? (p->length == length + && memcmp (file_name, p->name, length) == 0) + : (p->length <= length + && (file_name[p->length] == '\0' + || (ISSLASH (file_name[p->length]) && recursion_option)) + && memcmp (file_name, p->name, p->length) == 0)) + return p; + } + + return 0; +} + +/* Return true if and only if name FILE_NAME (from an archive) matches any name from the namelist. */ int -name_match (const char *path) +name_match (const char *file_name) { - size_t length = strlen (path); + size_t length = strlen (file_name); while (1) { struct name *cursor = namelist; if (!cursor) - return ! files_from_option; + return 1; if (cursor->fake) { chdir_do (cursor->change_dir); namelist = 0; nametail = &namelist; - return ! files_from_option; + return 1; } - for (; cursor; cursor = cursor->next) + cursor = namelist_match (file_name, length, false); + if (cursor) { - /* If first chars don't match, quick skip. */ - - if (cursor->firstch && cursor->name[0] != path[0]) - continue; - - if (cursor->regexp - ? fnmatch (cursor->name, path, FNM_LEADING_DIR) == 0 - : (cursor->length <= length - && (path[cursor->length] == '\0' - || path[cursor->length] == '/') - && memcmp (path, cursor->name, cursor->length) == 0)) + if (!(ISSLASH (file_name[cursor->length]) && recursion_option) + || cursor->found_count == 0) + cursor->found_count++; /* remember it matched */ + if (starting_file_option) { - cursor->found = 1; /* remember it matched */ - if (starting_file_option) - { - free (namelist); - namelist = 0; - nametail = &namelist; - } - chdir_do (cursor->change_dir); - - /* We got a match. */ - return 1; + free (namelist); + namelist = 0; + nametail = &namelist; } + chdir_do (cursor->change_dir); + + /* We got a match. */ + return ISFOUND (cursor); } /* Filename from archive not found in namelist. If we have the whole namelist here, just return 0. Otherwise, read the next name in and - compare it. If this was the last name, namelist->found will remain - on. If not, we loop to compare the newly read name. */ + compare it. If this was the last name, namelist->found_count will + remain on. If not, we loop to compare the newly read name. */ - if (same_order_option && namelist->found) + if (same_order_option && namelist->found_count) { name_gather (); /* read one more */ - if (namelist->found) + if (namelist->found_count) return 0; } else @@ -553,29 +527,54 @@ name_match (const char *path) } } +/* Returns true if all names from the namelist were processed. + P is the stat_info of the most recently processed entry. + The decision is postponed until the next entry is read if: + + 1) P ended with a slash (i.e. it was a directory) + 2) P matches any entry from the namelist *and* represents a subdirectory + or a file lying under this entry (in the terms of directory structure). + + This is necessary to handle contents of directories. */ +bool +all_names_found (struct tar_stat_info *p) +{ + struct name const *cursor; + size_t len; + + if (test_label_option) + return true; + if (!p->file_name || occurrence_option == 0 || p->had_trailing_slash) + return false; + len = strlen (p->file_name); + for (cursor = namelist; cursor; cursor = cursor->next) + { + if (cursor->regexp + || (!WASFOUND(cursor) && !cursor->fake) + || (len >= cursor->length && ISSLASH (p->file_name[cursor->length]))) + return false; + } + return true; +} + /* Print the names of things in the namelist that were not matched. */ void names_notfound (void) { - struct name *cursor; - struct name *next; - - for (cursor = namelist; cursor; cursor = next) - { - next = cursor->next; - if (!cursor->found && !cursor->fake) - ERROR ((0, 0, _("%s: Not found in archive"), - quotearg_colon (cursor->name))); + struct name const *cursor; - /* We could free the list, but the process is about to die anyway, so - save some CPU time. Amigas and other similarly broken software - will need to waste the time, though. */ + for (cursor = namelist; cursor; cursor = cursor->next) + if (!WASFOUND(cursor) && !cursor->fake) + { + if (cursor->found_count == 0) + ERROR ((0, 0, _("%s: Not found in archive"), + quotearg_colon (cursor->name))); + else + ERROR ((0, 0, _("%s: Required occurrence not found in archive"), + quotearg_colon (cursor->name))); + } -#ifdef amiga - if (!same_order_option) - free (cursor); -#endif - } + /* Don't bother freeing the name list; we're about to exit. */ namelist = 0; nametail = &namelist; @@ -583,7 +582,7 @@ names_notfound (void) { char *name; - while (name = name_next (1), name) + while ((name = name_next (1)) != NULL) ERROR ((0, 0, _("%s: Not found in archive"), quotearg_colon (name))); } @@ -672,20 +671,19 @@ merge_sort (struct name *list, int length, static int compare_names (struct name const *n1, struct name const *n2) { - int found_diff = n2->found - n1->found; + int found_diff = WASFOUND(n2) - WASFOUND(n1); return found_diff ? found_diff : strcmp (n1->name, n2->name); } /* Add all the dirs under NAME, which names a directory, to the namelist. - DIRSIZE is the size of the directory, or -1 if not known. If any of the files is a directory, recurse on the subdirectory. DEVICE is the device not to leave, if the -l option is specified. */ static void -add_hierarchy_to_namelist (struct name *name, off_t dirsize, dev_t device) +add_hierarchy_to_namelist (struct name *name, dev_t device) { - char *path = name->name; - char *buffer = get_directory_contents (path, dirsize, device); + char *file_name = name->name; + char *buffer = get_directory_contents (file_name, device); if (! buffer) name->dir_contents = "\0\0\0\0"; @@ -695,18 +693,18 @@ add_hierarchy_to_namelist (struct name *name, off_t dirsize, dev_t device) size_t allocated_length = (name_length >= NAME_FIELD_SIZE ? name_length + NAME_FIELD_SIZE : NAME_FIELD_SIZE); - char *name_buffer = xmalloc (allocated_length + 1); + char *namebuf = xmalloc (allocated_length + 1); /* FIXME: + 2 above? */ char *string; size_t string_length; int change_dir = name->change_dir; name->dir_contents = buffer; - strcpy (name_buffer, path); - if (name_buffer[name_length - 1] != '/') + strcpy (namebuf, file_name); + if (! ISSLASH (namebuf[name_length - 1])) { - name_buffer[name_length++] = '/'; - name_buffer[name_length] = '\0'; + namebuf[name_length++] = '/'; + namebuf[name_length] = '\0'; } for (string = buffer; *string; string += string_length + 1) @@ -714,19 +712,28 @@ add_hierarchy_to_namelist (struct name *name, off_t dirsize, dev_t device) string_length = strlen (string); if (*string == 'D') { - if (name_length + string_length >= allocated_length) + struct name *np; + + if (allocated_length <= name_length + string_length) { - while (name_length + string_length >= allocated_length) - allocated_length += NAME_FIELD_SIZE; - name_buffer = xrealloc (name_buffer, allocated_length + 1); + do + { + allocated_length *= 2; + if (! allocated_length) + xalloc_die (); + } + while (allocated_length <= name_length + string_length); + + namebuf = xrealloc (namebuf, allocated_length + 1); } - strcpy (name_buffer + name_length, string + 1); - add_hierarchy_to_namelist (addname (name_buffer, change_dir), - -1, device); + strcpy (namebuf + name_length, string + 1); + np = addname (namebuf, change_dir); + np->explicit = 0; + add_hierarchy_to_namelist (np, device); } } - free (name_buffer); + free (namebuf); } } @@ -753,7 +760,7 @@ collect_and_sort_names (void) for (name = namelist; name; name = next_name) { next_name = name->next; - if (name->found || name->dir_contents) + if (name->found_count || name->dir_contents) continue; if (name->regexp) /* FIXME: just skip regexps for now */ continue; @@ -763,13 +770,13 @@ collect_and_sort_names (void) if (deref_stat (dereference_option, name->name, &statbuf) != 0) { - stat_error (name->name); + stat_diag (name->name); continue; } if (S_ISDIR (statbuf.st_mode)) { - name->found = 1; - add_hierarchy_to_namelist (name, statbuf.st_size, statbuf.st_dev); + name->found_count++; + add_hierarchy_to_namelist (name, statbuf.st_dev); } } @@ -779,50 +786,37 @@ collect_and_sort_names (void) namelist = merge_sort (namelist, num_names, compare_names); for (name = namelist; name; name = name->next) - name->found = 0; + name->found_count = 0; } -/* This is like name_match, except that it returns a pointer to the - name it matched, and doesn't set FOUND in structure. The caller - will have to do that if it wants to. Oh, and if the namelist is - empty, it returns null, unlike name_match, which returns TRUE. */ +/* This is like name_match, except that + 1. It returns a pointer to the name it matched, and doesn't set FOUND + in structure. The caller will have to do that if it wants to. + 2. If the namelist is empty, it returns null, unlike name_match, which + returns TRUE. + 3. The second argument (EXACT) controls matching algorithm. If it + is TRUE, the exact matching is used. However, regular expressions are + always matched as such, no matter what the value of EXACT is. */ struct name * -name_scan (const char *path) +name_scan (const char *file_name, bool exact) { - size_t length = strlen (path); + size_t length = strlen (file_name); while (1) { - struct name *cursor = namelist; - - if (!cursor) - return 0; - - for (; cursor; cursor = cursor->next) - { - /* If first chars don't match, quick skip. */ - - if (cursor->firstch && cursor->name[0] != path[0]) - continue; - - if (cursor->regexp - ? fnmatch (cursor->name, path, FNM_LEADING_DIR) == 0 - : (cursor->length <= length - && (path[cursor->length] == '\0' - || path[cursor->length] == '/') - && memcmp (path, cursor->name, cursor->length) == 0)) - return cursor; /* we got a match */ - } + struct name *cursor = namelist_match (file_name, length, exact); + if (cursor) + return cursor; /* Filename from archive not found in namelist. If we have the whole namelist here, just return 0. Otherwise, read the next name in and - compare it. If this was the last name, namelist->found will remain - on. If not, we loop to compare the newly read name. */ + compare it. If this was the last name, namelist->found_count will + remain on. If not, we loop to compare the newly read name. */ - if (same_order_option && namelist->found) + if (same_order_option && namelist && namelist->found_count) { name_gather (); /* read one more */ - if (namelist->found) + if (namelist->found_count) return 0; } else @@ -840,11 +834,11 @@ name_from_list (void) { if (!gnu_list_name) gnu_list_name = namelist; - while (gnu_list_name && (gnu_list_name->found | gnu_list_name->fake)) + while (gnu_list_name && (gnu_list_name->found_count || gnu_list_name->fake)) gnu_list_name = gnu_list_name->next; if (gnu_list_name) { - gnu_list_name->found = 1; + gnu_list_name->found_count++; chdir_do (gnu_list_name->change_dir); return gnu_list_name->name; } @@ -858,77 +852,113 @@ blank_name_list (void) gnu_list_name = 0; for (name = namelist; name; name = name->next) - name->found = 0; + name->found_count = 0; } -/* Yield a newly allocated file name consisting of PATH concatenated to - NAME, with an intervening slash if PATH does not already end in one. */ +/* Yield a newly allocated file name consisting of FILE_NAME concatenated to + NAME, with an intervening slash if FILE_NAME does not already end in one. */ char * -new_name (const char *path, const char *name) +new_name (const char *file_name, const char *name) { - size_t pathlen = strlen (path); + size_t file_name_len = strlen (file_name); size_t namesize = strlen (name) + 1; - int slash = pathlen && path[pathlen - 1] != '/'; - char *buffer = xmalloc (pathlen + slash + namesize); - memcpy (buffer, path, pathlen); - buffer[pathlen] = '/'; - memcpy (buffer + pathlen + slash, name, namesize); + int slash = file_name_len && ! ISSLASH (file_name[file_name_len - 1]); + char *buffer = xmalloc (file_name_len + slash + namesize); + memcpy (buffer, file_name, file_name_len); + buffer[file_name_len] = '/'; + memcpy (buffer + file_name_len + slash, name, namesize); return buffer; } -/* Return nonzero if file NAME is excluded. Exclude a name if its - prefix matches a pattern that contains slashes, or if one of its - components matches a pattern that contains no slashes. */ -int +/* Return nonzero if file NAME is excluded. */ +bool excluded_name (char const *name) { - char const *p; - name += FILESYSTEM_PREFIX_LEN (name); - - if (excluded_filename (excluded_with_slash, name, - FNM_FILE_NAME | FNM_LEADING_DIR)) - return 1; - - for (p = name; *p; p++) - if (((p == name || ISSLASH (p[-1])) && !ISSLASH (p[0])) - && excluded_filename (excluded_without_slash, p, - FNM_FILE_NAME | FNM_LEADING_DIR)) - return 1; - - return 0; + return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name)); } /* Names to avoid dumping. */ static Hash_table *avoided_name_table; -/* Calculate the hash of an avoided name. */ -static unsigned -hash_avoided_name (void const *name, unsigned n_buckets) +/* Remember to not archive NAME. */ +void +add_avoided_name (char const *name) +{ + hash_string_insert (&avoided_name_table, name); +} + +/* Should NAME be avoided when archiving? */ +bool +is_avoided_name (char const *name) { - return hash_string (name, n_buckets); + return hash_string_lookup (avoided_name_table, name); } -/* Compare two avoided names for equality. */ -static bool -compare_avoided_names (void const *name1, void const *name2) + +static Hash_table *individual_file_table; + +static void +register_individual_file (char const *name) { - return strcmp (name1, name2) == 0; + struct stat st; + + if (deref_stat (dereference_option, name, &st) != 0) + return; /* Will be complained about later */ + if (S_ISDIR (st.st_mode)) + return; + + hash_string_insert (&individual_file_table, name); } -/* Remember to not archive NAME. */ -void -add_avoided_name (char const *name) +bool +is_individual_file (char const *name) { - if (! ((avoided_name_table - || (avoided_name_table = hash_initialize (0, 0, hash_avoided_name, - compare_avoided_names, 0))) - && hash_insert (avoided_name_table, xstrdup (name)))) - xalloc_die (); + return hash_string_lookup (individual_file_table, name); } -/* Should NAME be avoided when archiving? */ -int -is_avoided_name (char const *name) + + +/* Return the size of the prefix of FILE_NAME that is removed after + stripping NUM leading file name components. NUM must be + positive. */ + +size_t +stripped_prefix_len (char const *file_name, size_t num) +{ + char const *p = file_name + FILE_SYSTEM_PREFIX_LEN (file_name); + while (ISSLASH (*p)) + p++; + while (*p) + { + bool slash = ISSLASH (*p); + p++; + if (slash) + { + if (--num == 0) + return p - file_name; + while (ISSLASH (*p)) + p++; + } + } + return -1; +} + +/* Return nonzero if NAME contains ".." as a file name component. */ +bool +contains_dot_dot (char const *name) { - return avoided_name_table && hash_lookup (avoided_name_table, name); + char const *p = name + FILE_SYSTEM_PREFIX_LEN (name); + + for (;; p++) + { + if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) + return 1; + + do + { + if (! *p++) + return 0; + } + while (! ISSLASH (*p)); + } }