X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fnames.c;h=72b928003cf8f516f64232e6cc7a47c84e5e2007;hb=614f749ff77c5e9817897ff8166bddd26915a78e;hp=40140234fcabe1ead7219f961e7f5700cfd67d02;hpb=bd5bbd4f65cc342dafbd2dac66febed96995fd6b;p=chaz%2Ftar diff --git a/src/names.c b/src/names.c index 4014023..72b9280 100644 --- a/src/names.c +++ b/src/names.c @@ -1,5 +1,5 @@ /* Various processing of names. - Copyright (C) 1988, 92, 94, 96, 97, 98, 1999 Free Software Foundation, Inc. + Copyright 1988, 92, 94, 96, 97, 98, 99, 2000 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,28 +15,25 @@ with this program; if not, write to the Free Software Foundation, Inc., 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 #include +#include +#include +#include +#include #include "common.h" /* User and group names. */ -extern struct group *getgrnam (); -extern struct passwd *getpwnam (); -#if !HAVE_GETPWUID -extern struct passwd *getpwuid (); +struct group *getgrnam (); +struct passwd *getpwnam (); +#if ! HAVE_DECL_GETPWUID +struct passwd *getpwuid (); #endif -#if !HAVE_GETGRGID -extern struct group *getgrgid (); +#if ! HAVE_DECL_GETGRGID +struct group *getgrgid (); #endif /* Make sure you link with the proper libraries if you are running the @@ -59,10 +56,7 @@ static char cached_no_such_gname[GNAME_FIELD_SIZE]; static uid_t cached_no_such_uid; static gid_t cached_no_such_gid; -/*------------------------------------------. -| Given UID, find the corresponding UNAME. | -`------------------------------------------*/ - +/* Given UID, find the corresponding UNAME. */ void uid_to_uname (uid_t uid, char uname[UNAME_FIELD_SIZE]) { @@ -92,10 +86,7 @@ uid_to_uname (uid_t uid, char uname[UNAME_FIELD_SIZE]) strncpy (uname, cached_uname, UNAME_FIELD_SIZE); } -/*------------------------------------------. -| Given GID, find the corresponding GNAME. | -`------------------------------------------*/ - +/* Given GID, find the corresponding GNAME. */ void gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) { @@ -109,7 +100,6 @@ gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) if (!cached_gname[0] || gid != cached_gid) { - setgrent (); /* FIXME: why?! */ group = getgrgid (gid); if (group) { @@ -126,10 +116,7 @@ gid_to_gname (gid_t gid, char gname[GNAME_FIELD_SIZE]) strncpy (gname, cached_gname, GNAME_FIELD_SIZE); } -/*-------------------------------------------------------------------------. -| Given UNAME, set the corresponding UID and return 1, or else, return 0. | -`-------------------------------------------------------------------------*/ - +/* 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) { @@ -159,10 +146,7 @@ uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *uidp) return 1; } -/*-------------------------------------------------------------------------. -| Given GNAME, set the corresponding GID and return 1, or else, return 0. | -`-------------------------------------------------------------------------*/ - +/* 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) { @@ -194,15 +178,14 @@ gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *gidp) /* Names from the command call. */ +static struct name *namelist; /* first name in list, if any */ +static struct name **nametail = &namelist; /* end of name list */ 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; /* how many of the entries have we scanned? */ -/*------------------------. -| Initialize structures. | -`------------------------*/ - +/* Initialize structures. */ void init_names (void) { @@ -211,10 +194,7 @@ init_names (void) names = 0; } -/*--------------------------------------------------------------. -| Add NAME at end of name_array, reallocating it as necessary. | -`--------------------------------------------------------------*/ - +/* Add NAME at end of name_array, reallocating it as necessary. */ void name_add (const char *name) { @@ -233,10 +213,6 @@ 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 */ -/*---. -| ? | -`---*/ - /* FIXME: I should better check more closely. It seems at first glance that is_pattern is only used when reading a file, and ignored for all command line arguments. */ @@ -247,11 +223,8 @@ is_pattern (const char *string) return strchr (string, '*') || strchr (string, '[') || strchr (string, '?'); } -/*-----------------------------------------------------------------------. -| Set up to gather file names for tar. They can either come from a file | -| or were saved from decoding arguments. | -`-----------------------------------------------------------------------*/ - +/* 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) { @@ -266,14 +239,10 @@ name_init (int argc, char *const *argv) name_file = stdin; } else if (name_file = fopen (files_from_option, "r"), !name_file) - FATAL_ERROR ((0, errno, _("Cannot open file %s"), files_from_option)); + open_fatal (files_from_option); } } -/*---. -| ? | -`---*/ - void name_term (void) { @@ -281,12 +250,9 @@ 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. | -`---------------------------------------------------------------------*/ - +/* 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) { @@ -321,15 +287,13 @@ read_name_from_file (void) 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. | -| | -| If CHANGE_DIRS is true, treat a filename of the form "-C" as meaning | -| that the next filename is the name of a directory to change to. If | -| `filename_terminator' is NUL, CHANGE_DIRS is effectively always false. | -`------------------------------------------------------------------------*/ +/* 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. + If CHANGE_DIRS is true, treat a filename of the form "-C" as + meaning that the next filename is the name of a directory to change + to. If filename_terminator is NUL, CHANGE_DIRS is effectively + always false. */ char * name_next (int change_dirs) { @@ -344,16 +308,15 @@ name_next (int change_dirs) { /* Get a name, either from file or from saved arguments. */ - if (name_file) + if (name_index == names) { - if (!read_name_from_file ()) + if (! name_file) + break; + if (! read_name_from_file ()) break; } else { - if (name_index == names) - break; - source = name_array[name_index++]; if (strlen (source) > name_buffer_length) { @@ -372,7 +335,8 @@ name_next (int change_dirs) if (chdir_flag) { - chdir_from_initial_wd (name_buffer); + if (chdir (name_buffer) < 0) + chdir_fatal (name_buffer); chdir_flag = 0; } else if (change_dirs && strcmp (name_buffer, "-C") == 0) @@ -392,29 +356,24 @@ name_next (int change_dirs) return 0; } -/*------------------------------. -| Close the name file, if any. | -`------------------------------*/ - +/* Close the name file, if any. */ void name_close (void) { if (name_file && name_file != stdin) - if (fclose (name_file) == EOF) - ERROR ((0, errno, "%s", name_buffer)); + if (fclose (name_file) != 0) + close_error (name_buffer); } -/*-------------------------------------------------------------------------. -| Gather names in a list for scanning. Could hash them later if we really | -| care. | -| | -| If the names are already sorted to match the archive, we just read them | -| one by one. name_gather reads the first one, and it is called by | -| name_match as appropriate to read the next ones. At EOF, the last name | -| read is just left in the buffer. This option lets users of small | -| machines extract an arbitrary number of files by doing "tar t" and | -| editing down the list of files. | -`-------------------------------------------------------------------------*/ +/* Gather names in a list for scanning. Could hash them later if we + really care. + + If the names are already sorted to match the archive, we just read + them one by one. name_gather reads the first one, and it is called + by name_match as appropriate to read the next ones. At EOF, the + last name read is just left in the buffer. This option lets users + of small machines extract an arbitrary number of files by doing + "tar t" and editing down the list of files. */ void name_gather (void) @@ -427,7 +386,7 @@ name_gather (void) if (same_order_option) { - char *change_dir = 0; + static int change_dir; if (allocated_length == 0) { @@ -442,9 +401,7 @@ name_gather (void) char const *dir = name_next (0); if (! dir) FATAL_ERROR ((0, 0, _("Missing file name after -C"))); - if (change_dir) - free (change_dir); - change_dir = xstrdup (dir); + change_dir = chdir_arg (xstrdup (dir)); } if (name) @@ -456,52 +413,44 @@ name_gather (void) buffer = xrealloc (buffer, allocated_length); } buffer->change_dir = change_dir; - strncpy (buffer->name, name, buffer->length); - buffer->name[buffer->length] = 0; + memcpy (buffer->name, name, buffer->length + 1); buffer->next = 0; buffer->found = 0; - /* FIXME: Poorly named globals, indeed... */ namelist = buffer; - namelast = namelist; + nametail = &namelist->next; } - else if (change_dir) - free (change_dir); - - return; } - - /* Non sorted names -- read them all in. */ - - for (;;) + else { - char *change_dir = 0; - 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"))); - if (change_dir) - free (change_dir); - change_dir = xstrdup (dir); - } - if (name) - addname (name, change_dir); - else + /* Non sorted names -- read them all in. */ + int change_dir = 0; + + for (;;) { - if (change_dir) - addname (0, change_dir); - break; + 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; + } } } } -/*-----------------------------. -| Add a name to the namelist. | -`-----------------------------*/ - -void -addname (char const *string, char const *change_dir) +/* Add a name to the namelist. */ +struct name * +addname (char const *string, int change_dir) { struct name *name; size_t length; @@ -533,23 +482,17 @@ addname (char const *string, char const *change_dir) name->firstch = 0; } - if (namelast) - namelast->next = name; - namelast = name; - if (!namelist) - namelist = name; + *nametail = name; + nametail = &name->next; + return name; } -/*------------------------------------------------------------------------. -| Return true if and only if name PATH (from an archive) matches any name | -| from the namelist. | -`------------------------------------------------------------------------*/ - +/* Return true if and only if name PATH (from an archive) matches any + name from the namelist. */ int name_match (const char *path) { size_t length = strlen (path); - char const *change_dir = 0; while (1) { @@ -560,16 +503,14 @@ name_match (const char *path) if (cursor->fake) { - chdir_from_initial_wd (cursor->change_dir); + chdir_do (cursor->change_dir); namelist = 0; + nametail = &namelist; return ! files_from_option; } for (; cursor; cursor = cursor->next) { - if (cursor->change_dir) - change_dir = cursor->change_dir; - /* If first chars don't match, quick skip. */ if (cursor->firstch && cursor->name[0] != path[0]) @@ -587,8 +528,9 @@ name_match (const char *path) { free (namelist); namelist = 0; + nametail = &namelist; } - chdir_from_initial_wd (change_dir); + chdir_do (cursor->change_dir); /* We got a match. */ return 1; @@ -611,10 +553,7 @@ name_match (const char *path) } } -/*------------------------------------------------------------------. -| Print the names of things in the namelist that were not matched. | -`------------------------------------------------------------------*/ - +/* Print the names of things in the namelist that were not matched. */ void names_notfound (void) { @@ -625,7 +564,8 @@ names_notfound (void) { next = cursor->next; if (!cursor->found && !cursor->fake) - ERROR ((0, 0, _("%s: Not found in archive"), cursor->name)); + ERROR ((0, 0, _("%s: Not found in archive"), + quotearg_colon (cursor->name))); /* We could free the list, but the process is about to die anyway, so save some CPU time. Amigas and other similarly broken software @@ -637,33 +577,215 @@ names_notfound (void) #endif } namelist = 0; - namelast = 0; + nametail = &namelist; if (same_order_option) { char *name; while (name = name_next (1), name) - ERROR ((0, 0, _("%s: Not found in archive"), name)); + ERROR ((0, 0, _("%s: Not found in archive"), + quotearg_colon (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. */ -void -name_expand (void) +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 } -/*-------------------------------------------------------------------------. -| 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. | -`-------------------------------------------------------------------------*/ +/* 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 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) +{ + char *path = name->name; + char *buffer = get_directory_contents (path, dirsize, device); + + if (! buffer) + name->dir_contents = "\0\0\0\0"; + else + { + size_t name_length = name->length; + 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; + int change_dir = name->change_dir; + + name->dir_contents = buffer; + 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); + add_hierarchy_to_namelist (addname (name_buffer, change_dir), + -1, 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 +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) + { + stat_error (name->name); + continue; + } + if (S_ISDIR (statbuf.st_mode)) + { + name->found = 1; + add_hierarchy_to_namelist (name, statbuf.st_size, 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, unlike name_match, which returns TRUE. */ struct name * name_scan (const char *path) { @@ -708,12 +830,9 @@ name_scan (const char *path) } } -/*-----------------------------------------------------------------------. -| This returns a name from the namelist which doesn't have ->found set. | -| It sets ->found before returning, so successive calls will find and | -| return all the non-found names in the namelist | -`-----------------------------------------------------------------------*/ - +/* This returns a name from the namelist which doesn't have ->found + set. It sets ->found before returning, so successive calls will + find and return all the non-found names in the namelist. */ struct name *gnu_list_name; char * @@ -721,21 +840,17 @@ 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; - chdir_from_initial_wd (gnu_list_name->change_dir); + chdir_do (gnu_list_name->change_dir); return gnu_list_name->name; } return 0; } -/*---. -| ? | -`---*/ - void blank_name_list (void) { @@ -746,16 +861,18 @@ blank_name_list (void) name->found = 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. */ char * new_name (const char *path, const char *name) { - char *buffer = xmalloc (strlen (path) + strlen (name) + 2); - - sprintf (buffer, "%s/%s", path, name); + size_t pathlen = strlen (path); + 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); return buffer; } @@ -773,10 +890,45 @@ excluded_name (char const *name) return 1; for (p = name; *p; p++) - if ((p == name || (ISSLASH (p[-1]) && !ISSLASH (p[0]))) + 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; } + +/* 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) +{ + return hash_string (name, n_buckets); +} + +/* Compare two avoided names for equality. */ +static bool +compare_avoided_names (void const *name1, void const *name2) +{ + return strcmp (name1, name2) == 0; +} + +/* Remember to not archive NAME. */ +void +add_avoided_name (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 (); +} + +/* Should NAME be avoided when archiving? */ +int +is_avoided_name (char const *name) +{ + return avoided_name_table && hash_lookup (avoided_name_table, name); +}