X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fnames.c;h=8674ec92613c052eb46d6bd4d76cd2cbe4eeb5ab;hb=04f1deefad399bcf5bec6bb6afc2a0a53c498025;hp=b339ef13a90172fb2e041c1dd01783928f89e997;hpb=f3531f64fb63f785eac9bbd80fecd2912e535566;p=chaz%2Ftar diff --git a/src/names.c b/src/names.c index b339ef1..8674ec9 100644 --- a/src/names.c +++ b/src/names.c @@ -1,5 +1,5 @@ /* Various processing of names. - Copyright (C) 1988, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1988, 92, 94, 96, 97, 98, 1999 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,16 +13,18 @@ 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. */ + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Enable GNU extensions in fnmatch.h. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif #include "system.h" #include #include - -#ifndef FNM_LEADING_DIR -# include -#endif +#include #include "common.h" @@ -42,12 +44,21 @@ extern 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[UNAME_FIELD_SIZE]; +static char cached_gname[GNAME_FIELD_SIZE]; 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]; + +/* 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; + /*------------------------------------------. | Given UID, find the corresponding UNAME. | `------------------------------------------*/ @@ -57,6 +68,12 @@ uid_to_uname (uid_t uid, char uname[UNAME_FIELD_SIZE]) { struct passwd *passwd; + if (uid != 0 && uid == cached_no_such_uid) + { + *uname = '\0'; + return; + } + if (!cached_uname[0] || uid != cached_uid) { passwd = getpwuid (uid); @@ -66,7 +83,11 @@ uid_to_uname (uid_t uid, char uname[UNAME_FIELD_SIZE]) strncpy (cached_uname, passwd->pw_name, UNAME_FIELD_SIZE); } else - *uname = '\0'; + { + cached_no_such_uid = uid; + *uname = '\0'; + return; + } } strncpy (uname, cached_uname, UNAME_FIELD_SIZE); } @@ -80,6 +101,12 @@ gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) { struct group *group; + if (gid != 0 && gid == cached_no_such_gid) + { + *gname = '\0'; + return; + } + if (!cached_gname[0] || gid != cached_gid) { setgrent (); /* FIXME: why?! */ @@ -90,7 +117,11 @@ gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) strncpy (cached_gname, group->gr_name, GNAME_FIELD_SIZE); } else - *gname = '\0'; + { + cached_no_such_gid = gid; + *gname = '\0'; + return; + } } strncpy (gname, cached_gname, GNAME_FIELD_SIZE); } @@ -104,6 +135,10 @@ uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *uidp) { struct passwd *passwd; + if (cached_no_such_uname[0] + && strncmp (uname, cached_no_such_uname, UNAME_FIELD_SIZE) == 0) + return 0; + if (!cached_uname[0] || uname[0] != cached_uname[0] || strncmp (uname, cached_uname, UNAME_FIELD_SIZE) != 0) @@ -115,7 +150,10 @@ uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *uidp) strncpy (cached_uname, uname, UNAME_FIELD_SIZE); } else - return 0; + { + strncpy (cached_no_such_uname, uname, UNAME_FIELD_SIZE); + return 0; + } } *uidp = cached_uid; return 1; @@ -130,6 +168,10 @@ gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *gidp) { struct group *group; + if (cached_no_such_gname[0] + && strncmp (gname, cached_no_such_gname, GNAME_FIELD_SIZE) == 0) + return 0; + if (!cached_gname[0] || gname[0] != cached_gname[0] || strncmp (gname, cached_gname, GNAME_FIELD_SIZE) != 0) @@ -141,7 +183,10 @@ gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *gidp) strncpy (cached_gname, gname, GNAME_FIELD_SIZE); } else - return 0; + { + strncpy (cached_no_such_gname, gname, GNAME_FIELD_SIZE); + return 0; + } } *gidp = cached_gid; return 1; @@ -152,7 +197,7 @@ gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *gidp) static const char **name_array; /* store an array of names */ static int allocated_names; /* how big is the array? */ static int names; /* how many entries does it have? */ -static int name_index = 0; /* how many of the entries have we scanned? */ +static int name_index; /* how many of the entries have we scanned? */ /*------------------------. | Initialize structures. | @@ -162,8 +207,7 @@ void init_names (void) { allocated_names = 10; - name_array = (const char **) - xmalloc (sizeof (const char *) * allocated_names); + name_array = xmalloc (sizeof (const char *) * allocated_names); names = 0; } @@ -177,7 +221,7 @@ name_add (const char *name) if (names == allocated_names) { allocated_names *= 2; - name_array = (const char **) + name_array = xrealloc (name_array, sizeof (const char *) * allocated_names); } name_array[names++] = name; @@ -336,13 +380,10 @@ name_next (int change_dirs) else if (change_dirs && strcmp (name_buffer, "-C") == 0) chdir_flag = 1; else -#if 0 - if (!exclude_option || !check_exclude (name_buffer)) -#endif - { - unquote_string (name_buffer); - return name_buffer; - } + { + unquote_string (name_buffer); + return name_buffer; + } } /* No more names in file. */ @@ -350,7 +391,7 @@ name_next (int change_dirs) if (name_file && chdir_flag) FATAL_ERROR ((0, 0, _("Missing file name after -C"))); - return NULL; + return 0; } /*------------------------------. @@ -360,7 +401,7 @@ name_next (int change_dirs) void name_close (void) { - if (name_file != NULL && name_file != stdin) + if (name_file && name_file != stdin) if (fclose (name_file) == EOF) ERROR ((0, errno, "%s", name_buffer)); } @@ -382,53 +423,74 @@ name_gather (void) { /* Buffer able to hold a single name. */ static struct name *buffer; - static size_t allocated_length = 0; + static size_t allocated_length; - char *name; + char const *name; if (same_order_option) { + static int change_dir; + if (allocated_length == 0) { allocated_length = sizeof (struct name) + NAME_FIELD_SIZE; - buffer = (struct name *) xmalloc (allocated_length); + buffer = xmalloc (allocated_length); /* FIXME: This memset is overkill, and ugly... */ memset (buffer, 0, allocated_length); } - name = name_next (0); - if (name) + + while ((name = name_next (0)) && strcmp (name, "-C") == 0) { - if (strcmp (name, "-C") == 0) - { - char *copy = xstrdup (name_next (0)); + char const *dir = name_next (0); + if (! dir) + FATAL_ERROR ((0, 0, _("Missing file name after -C"))); + change_dir = chdir_arg (xstrdup (dir)); + } - name = name_next (0); - if (!name) - FATAL_ERROR ((0, 0, _("Missing file name after -C"))); - buffer->change_dir = copy; - } + if (name) + { buffer->length = strlen (name); if (sizeof (struct name) + buffer->length >= allocated_length) { allocated_length = sizeof (struct name) + buffer->length; - buffer = (struct name *) xrealloc (buffer, allocated_length); + buffer = xrealloc (buffer, allocated_length); } - strncpy (buffer->name, name, (size_t) buffer->length); + buffer->change_dir = change_dir; + strncpy (buffer->name, name, buffer->length); buffer->name[buffer->length] = 0; - buffer->next = NULL; + buffer->next = 0; buffer->found = 0; /* FIXME: Poorly named globals, indeed... */ namelist = buffer; namelast = namelist; } - return; } + else + { + /* Non sorted names -- read them all in. */ + int change_dir = 0; - /* Non sorted names -- read them all in. */ - - while (name = name_next (0), name) - addname (name); + for (;;) + { + int change_dir0 = change_dir; + while ((name = name_next (0)) && strcmp (name, "-C") == 0) + { + char const *dir = name_next (0); + if (! dir) + FATAL_ERROR ((0, 0, _("Missing file name after -C"))); + change_dir = chdir_arg (xstrdup (dir)); + } + if (name) + addname (name, change_dir); + else + { + if (change_dir != change_dir0) + addname (0, change_dir); + break; + } + } + } } /*-----------------------------. @@ -436,53 +498,21 @@ name_gather (void) `-----------------------------*/ void -addname (const char *string) +addname (char const *string, int change_dir) { - /* FIXME: This is ugly. How is memory managed? */ - static char *chdir_name = NULL; - struct name *name; size_t length; - if (strcmp (string, "-C") == 0) - { - chdir_name = xstrdup (name_next (0)); - string = name_next (0); - if (!chdir_name) - FATAL_ERROR ((0, 0, _("Missing file name after -C"))); - - if (chdir_name[0] != '/') - { - char *path = xmalloc (PATH_MAX); - - /* FIXME: Shouldn't we use xgetcwd? */ -#if HAVE_GETCWD - if (!getcwd (path, PATH_MAX)) - FATAL_ERROR ((0, 0, _("Could not get current directory"))); -#else - char *getwd (); - - if (!getwd (path)) - FATAL_ERROR ((0, 0, _("Could not get current directory: %s"), - path)); -#endif - chdir_name = new_name (path, chdir_name); - free (path); - } - } - length = string ? strlen (string) : 0; - name = (struct name *) xmalloc (sizeof (struct name) + length); + name = xmalloc (sizeof (struct name) + length); memset (name, 0, sizeof (struct name) + length); - name->next = NULL; + name->next = 0; if (string) { name->fake = 0; name->length = length; - /* FIXME: Possibly truncating a string, here? Tss, tss, tss! */ - strncpy (name->name, string, length); - name->name[length] = '\0'; + memcpy (name->name, string, length + 1); } else name->fake = 1; @@ -490,7 +520,7 @@ addname (const char *string) name->found = 0; name->regexp = 0; /* assume not a regular expression */ name->firstch = 1; /* assume first char is literal */ - name->change_dir = chdir_name; + name->change_dir = change_dir; name->dir_contents = 0; if (string && is_pattern (string)) @@ -522,15 +552,13 @@ name_match (const char *path) struct name *cursor = namelist; if (!cursor) - return 1; /* empty namelist is easy */ + return ! files_from_option; if (cursor->fake) { - if (cursor->change_dir && chdir (cursor->change_dir)) - FATAL_ERROR ((0, errno, _("Cannot change to directory %s"), - cursor->change_dir)); + chdir_do (cursor->change_dir); namelist = 0; - return 1; + return ! files_from_option; } for (; cursor; cursor = cursor->next) @@ -540,48 +568,21 @@ name_match (const char *path) if (cursor->firstch && cursor->name[0] != path[0]) continue; - /* Regular expressions (shell globbing, actually). */ - - if (cursor->regexp) - { - if (fnmatch (cursor->name, path, FNM_LEADING_DIR) == 0) - { - cursor->found = 1; /* remember it matched */ - if (starting_file_option) - { - free (namelist); - namelist = NULL; - } - if (cursor->change_dir && chdir (cursor->change_dir)) - FATAL_ERROR ((0, errno, _("Cannot change to directory %s"), - cursor->change_dir)); - - /* We got a match. */ - return 1; - } - continue; - } - - /* Plain Old Strings. */ - - if (cursor->length <= length - /* archive length >= specified */ - && (path[cursor->length] == '\0' - || path[cursor->length] == '/') - /* full match on file/dirname */ - && strncmp (path, cursor->name, cursor->length) == 0) - /* name compare */ + 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)) { - cursor->found = 1; /* remember it matched */ + cursor->found = 1; /* remember it matched */ if (starting_file_option) { - free ((void *) namelist); + free (namelist); namelist = 0; } - if (cursor->change_dir && chdir (cursor->change_dir)) - FATAL_ERROR ((0, errno, _("Cannot change to directory %s"), - cursor->change_dir)); - + chdir_do (cursor->change_dir); + /* We got a match. */ return 1; } @@ -628,8 +629,8 @@ names_notfound (void) free (cursor); #endif } - namelist = (struct name *) NULL; - namelast = (struct name *) NULL; + namelist = 0; + namelast = 0; if (same_order_option) { @@ -639,20 +640,211 @@ names_notfound (void) ERROR ((0, 0, _("%s: Not found in archive"), name)); } } + +/* Sorting name lists. */ -/*---. -| ? | -`---*/ +/* Sort linked LIST of names, of given LENGTH, using COMPARE to order + names. Return the sorted list. Apart from the type `struct name' + and the definition of SUCCESSOR, this is a generic list-sorting + function, but it's too painful to make it both generic and portable + in C. */ + +static struct name * +merge_sort (struct name *list, int length, + int (*compare) (struct name const*, struct name const*)) +{ + struct name *first_list; + struct name *second_list; + int first_length; + int second_length; + struct name *result; + struct name **merge_point; + struct name *cursor; + int counter; + +# define SUCCESSOR(name) ((name)->next) + + if (length == 1) + return list; + + if (length == 2) + { + if ((*compare) (list, SUCCESSOR (list)) > 0) + { + result = SUCCESSOR (list); + SUCCESSOR (result) = list; + SUCCESSOR (list) = 0; + return result; + } + return list; + } + + first_list = list; + first_length = (length + 1) / 2; + second_length = length / 2; + for (cursor = list, counter = first_length - 1; + counter; + cursor = SUCCESSOR (cursor), counter--) + continue; + second_list = SUCCESSOR (cursor); + SUCCESSOR (cursor) = 0; + + first_list = merge_sort (first_list, first_length, compare); + second_list = merge_sort (second_list, second_length, compare); + + merge_point = &result; + while (first_list && second_list) + if ((*compare) (first_list, second_list) < 0) + { + cursor = SUCCESSOR (first_list); + *merge_point = first_list; + merge_point = &SUCCESSOR (first_list); + first_list = cursor; + } + else + { + cursor = SUCCESSOR (second_list); + *merge_point = second_list; + merge_point = &SUCCESSOR (second_list); + second_list = cursor; + } + if (first_list) + *merge_point = first_list; + else + *merge_point = second_list; + + return result; + +#undef SUCCESSOR +} + +/* A comparison function for sorting names. Put found names last; + break ties by string comparison. */ + +static int +compare_names (struct name const *n1, struct name const *n2) +{ + int found_diff = n2->found - n1->found; + return found_diff ? found_diff : strcmp (n1->name, n2->name); +} + +/* Add all the dirs in PATH, which is a directory, to the namelist. + If any of the files is a directory, recurse on the subdirectory. + CHANGE_DIR is the number of the directory that PATH is relative to. + DEVICE is the device not to leave, if the -l option is specified. */ + +static void +add_hierarchy_to_namelist (char *path, int change_dir, dev_t device) +{ + char *buffer = get_directory_contents (path, device); + + { + struct name *name; + + 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) + { + size_t name_length = strlen (path); + size_t allocated_length = (name_length >= NAME_FIELD_SIZE + ? name_length + NAME_FIELD_SIZE + : NAME_FIELD_SIZE); + char *name_buffer = xmalloc (allocated_length + 1); + /* FIXME: + 2 above? */ + char *string; + size_t string_length; + + strcpy (name_buffer, path); + if (name_buffer[name_length - 1] != '/') + { + name_buffer[name_length++] = '/'; + name_buffer[name_length] = '\0'; + } + + for (string = buffer; *string; string += string_length + 1) + { + 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 = xrealloc (name_buffer, allocated_length + 1); + } + strcpy (name_buffer + name_length, string + 1); + addname (name_buffer, change_dir); + if (*string == 'D') + add_hierarchy_to_namelist (name_buffer, change_dir, device); + } + } + + free (name_buffer); + } +} + +/* Collect all the names from argv[] (or whatever), expand them into a + directory tree, and sort them. This gets only subdirectories, not + all files. */ void -name_expand (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 (".", 0); + + 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; + chdir_do (name->change_dir); + if (name->fake) + continue; + + if (deref_stat (dereference_option, name->name, &statbuf) != 0) + { + ERROR ((0, errno, _("Cannot stat %s"), name->name)); + continue; + } + if (S_ISDIR (statbuf.st_mode)) + { + name->found = 1; + add_hierarchy_to_namelist (name->name, name->change_dir, + statbuf.st_dev); + } + } + + num_names = 0; + for (name = namelist; name; name = name->next) + num_names++; + namelist = merge_sort (namelist, num_names, compare_names); + + for (name = namelist; name; name = name->next) + name->found = 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, | +| that if it wants to. Oh, and if the namelist is empty, it returns null, | | unlike name_match, which returns TRUE. | `-------------------------------------------------------------------------*/ @@ -666,7 +858,7 @@ name_scan (const char *path) struct name *cursor = namelist; if (!cursor) - return NULL; /* empty namelist is easy */ + return 0; for (; cursor; cursor = cursor->next) { @@ -675,24 +867,12 @@ name_scan (const char *path) if (cursor->firstch && cursor->name[0] != path[0]) continue; - /* Regular expressions. */ - - if (cursor->regexp) - { - if (fnmatch (cursor->name, path, FNM_LEADING_DIR) == 0) - return cursor; /* we got a match */ - continue; - } - - /* Plain Old Strings. */ - - if (cursor->length <= length - /* archive length >= specified */ - && (path[cursor->length] == '\0' - || path[cursor->length] == '/') - /* full match on file/dirname */ - && strncmp (path, cursor->name, cursor->length) == 0) - /* name compare */ + 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 */ } @@ -705,10 +885,10 @@ name_scan (const char *path) { name_gather (); /* read one more */ if (namelist->found) - return NULL; + return 0; } else - return NULL; + return 0; } } @@ -718,25 +898,22 @@ name_scan (const char *path) | return all the non-found names in the namelist | `-----------------------------------------------------------------------*/ -struct name *gnu_list_name = NULL; +struct name *gnu_list_name; char * name_from_list (void) { if (!gnu_list_name) gnu_list_name = namelist; - while (gnu_list_name && gnu_list_name->found) + while (gnu_list_name && (gnu_list_name->found | gnu_list_name->fake)) gnu_list_name = gnu_list_name->next; if (gnu_list_name) { gnu_list_name->found = 1; - if (gnu_list_name->change_dir) - if (chdir (gnu_list_name->change_dir) < 0) - FATAL_ERROR ((0, errno, _("Cannot change to directory %s"), - gnu_list_name->change_dir)); + chdir_do (gnu_list_name->change_dir); return gnu_list_name->name; } - return NULL; + return 0; } /*---. @@ -760,142 +937,61 @@ blank_name_list (void) char * new_name (const char *path, const char *name) { - char *buffer = (char *) xmalloc (strlen (path) + strlen (name) + 2); + char *buffer = xmalloc (strlen (path) + strlen (name) + 2); sprintf (buffer, "%s/%s", path, name); return buffer; } - -/* Excludes names. */ -static char *exclude_pool = NULL; -static size_t exclude_pool_size = 0; -static size_t allocated_exclude_pool_size = 0; - -static char **simple_exclude_array = NULL; -static int simple_excludes = 0; -static int allocated_simple_excludes = 0; - -static char **pattern_exclude_array = NULL; -static int pattern_excludes = 0; -static int allocated_pattern_excludes = 0; - -/*---. -| ? | -`---*/ - -void -add_exclude (char *name) +/* 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 +excluded_name (char const *name) { - size_t name_size; + char const *p; + name += FILESYSTEM_PREFIX_LEN (name); - unquote_string (name); /* FIXME: unquote in all cases? If ever? */ - name_size = strlen (name) + 1; - - if (exclude_pool_size + name_size > allocated_exclude_pool_size) - { - char *previous_exclude_pool = exclude_pool; - char **cursor; - - allocated_exclude_pool_size = exclude_pool_size + name_size + 1024; - exclude_pool = (char *) - xrealloc (exclude_pool, allocated_exclude_pool_size); - - for (cursor = simple_exclude_array; - cursor < simple_exclude_array + simple_excludes; - cursor++) - *cursor = exclude_pool + (*cursor - previous_exclude_pool); - for (cursor = pattern_exclude_array; - cursor < pattern_exclude_array + pattern_excludes; - cursor++) - *cursor = exclude_pool + (*cursor - previous_exclude_pool); - } + if (excluded_filename (excluded_with_slash, name, + FNM_FILE_NAME | FNM_LEADING_DIR)) + return 1; - if (is_pattern (name)) - { - if (pattern_excludes == allocated_pattern_excludes) - { - allocated_pattern_excludes += 32; - pattern_exclude_array = (char **) - xrealloc (pattern_exclude_array, - allocated_pattern_excludes * sizeof (char *)); - } - pattern_exclude_array[pattern_excludes++] - = exclude_pool + exclude_pool_size; - } - else - { - if (simple_excludes == allocated_simple_excludes) - { - allocated_simple_excludes += 32; - simple_exclude_array = (char **) - xrealloc (simple_exclude_array, - allocated_simple_excludes * sizeof (char *)); - } - simple_exclude_array[simple_excludes++] - = exclude_pool + exclude_pool_size; - } + 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; - strcpy (exclude_pool + exclude_pool_size, name); - exclude_pool_size += name_size; + return 0; } + +/* Names to avoid dumping. */ -/*---. -| ? | -`---*/ - -void -add_exclude_file (const char *name) +struct avoided_name { - FILE *file; - char buffer[1024]; - - if (strcmp (name, "-")) - file = fopen (name, "r"); - else - { - request_stdin ("-X"); - file = stdin; - } - if (!file) - FATAL_ERROR ((0, errno, _("Cannot open %s"), name)); + struct avoided_name const *next; + char name[1]; +}; - while (fgets (buffer, 1024, file)) - { - char *end_of_line = strrchr (buffer, '\n'); +static struct avoided_name *avoided_names; - if (end_of_line) - *end_of_line = '\0'; - add_exclude (buffer); - } - if (fclose (file) == EOF) - ERROR ((0, errno, "%s", name)); +/* Remember to not archive NAME. */ +void +add_avoided_name (char const *name) +{ + struct avoided_name *p = xmalloc (sizeof *p + strlen (name)); + p->next = avoided_names; + avoided_names = p; + strcpy (p->name, name); } -/*------------------------------------------------------------------. -| Returns true if the file NAME should not be added nor extracted. | -`------------------------------------------------------------------*/ - +/* Should NAME be avoided when archiving? */ int -check_exclude (const char *name) +is_avoided_name (char const *name) { - int counter; - - for (counter = 0; counter < pattern_excludes; counter++) - if (fnmatch (pattern_exclude_array[counter], name, FNM_LEADING_DIR) == 0) + struct avoided_name const *p; + for (p = avoided_names; p; p = p->next) + if (strcmp (p->name, name) == 0) return 1; - - for (counter = 0; counter < simple_excludes; counter++) - { - /* Accept the output from strstr only if it is the last part of the - string. FIXME: Find a faster way to do this. */ - - char *string = strstr (name, simple_exclude_array[counter]); - - if (string - && (string == name || string[-1] == '/') - && string[strlen (simple_exclude_array[counter])] == '\0') - return 1; - } return 0; }