/* Various processing of names.
Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001,
- 2003, 2004 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any later
+ Free Software Foundation; either version 3, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but
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>
if (uid != 0 && uid == cached_no_such_uid)
{
- *uname = strdup ("");
+ *uname = xstrdup ("");
return;
}
else
{
cached_no_such_uid = uid;
- *uname = strdup ("");
+ *uname = xstrdup ("");
return;
}
}
- *uname = strdup (cached_uname);
+ *uname = xstrdup (cached_uname);
}
/* Given GID, find the corresponding GNAME. */
if (gid != 0 && gid == cached_no_such_gid)
{
- *gname = strdup ("");
+ *gname = xstrdup ("");
return;
}
else
{
cached_no_such_gid = gid;
- *gname = strdup ("");
+ *gname = xstrdup ("");
return;
}
}
- *gname = strdup (cached_gname);
+ *gname = xstrdup (cached_gname);
}
/* Given UNAME, set the corresponding UID and return 1, or else, return 0. */
return 1;
}
+\f
+struct name *
+make_name (const char *file_name)
+{
+ struct name *p = xzalloc (sizeof (*p));
+ if (!file_name)
+ file_name = "";
+ p->name = xstrdup (file_name);
+ p->length = strlen (p->name);
+ return p;
+}
+
+void
+free_name (struct name *p)
+{
+ if (p)
+ {
+ free (p->name);
+ free (p->caname);
+ free (p);
+ }
+}
+
\f
/* 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. */
-void
-init_names (void)
+/* File name arguments are processed in two stages: first a
+ name_array (see below) is filled, then the names from it
+ are moved into the namelist.
+
+ This awkward process is needed only to implement --same-order option,
+ which is meant to help process large archives on machines with
+ limited memory. With this option on, namelist contains at most one
+ entry, which diminishes the memory consumption.
+
+ However, I very much doubt if we still need this -- Sergey */
+
+/* A name_array element contains entries of three types: */
+
+#define NELT_NAME 0 /* File name */
+#define NELT_CHDIR 1 /* Change directory request */
+#define NELT_FMASK 2 /* Change fnmatch options request */
+
+struct name_elt /* A name_array element. */
{
- allocated_names = 10;
- name_array = xmalloc (sizeof (const char *) * allocated_names);
- names = 0;
+ char type; /* Element type, see NELT_* constants above */
+ union
+ {
+ const char *name; /* File or directory name */
+ int matching_flags;/* fnmatch options if type == NELT_FMASK */
+ } v;
+};
+
+static struct name_elt *name_array; /* store an array of names */
+static size_t allocated_names; /* how big is the array? */
+static size_t names; /* how many entries does it have? */
+static size_t name_index; /* how many of the entries have we scanned? */
+
+/* Check the size of name_array, reallocating it as necessary. */
+static void
+check_name_alloc ()
+{
+ if (names == allocated_names)
+ {
+ if (allocated_names == 0)
+ allocated_names = 10; /* Set initial allocation */
+ name_array = x2nrealloc (name_array, &allocated_names,
+ sizeof (name_array[0]));
+ }
}
-/* Add NAME at end of name_array, reallocating it as necessary. */
+/* Add to name_array the file NAME with fnmatch options MATCHING_FLAGS */
void
-name_add (const char *name)
+name_add_name (const char *name, int matching_flags)
{
- if (names == allocated_names)
+ static int prev_flags = 0; /* FIXME: Or EXCLUDE_ANCHORED? */
+ struct name_elt *ep;
+
+ check_name_alloc ();
+ ep = &name_array[names++];
+ if (prev_flags != matching_flags)
{
- allocated_names *= 2;
- name_array =
- xrealloc (name_array, sizeof (const char *) * allocated_names);
+ ep->type = NELT_FMASK;
+ ep->v.matching_flags = matching_flags;
+ prev_flags = matching_flags;
+ check_name_alloc ();
+ ep = &name_array[names++];
}
- name_array[names++] = name;
+ ep->type = NELT_NAME;
+ ep->v.name = name;
}
+
+/* Add to name_array a chdir request for the directory NAME */
+void
+name_add_dir (const char *name)
+{
+ struct name_elt *ep;
+ check_name_alloc ();
+ ep = &name_array[names++];
+ ep->type = NELT_CHDIR;
+ ep->v.name = name;
+}
+
\f
/* 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 */
-/* 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. */
-
-static inline int
-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. */
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
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)
- {
- if (name_buffer_length * 2 < name_buffer_length)
- xalloc_die ();
- name_buffer_length *= 2;
- 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)
- {
- if (name_buffer_length * 2 < name_buffer_length)
- xalloc_die ();
- name_buffer_length *= 2;
- name_buffer = xrealloc (name_buffer, name_buffer_length + 2);
- }
- name_buffer[counter] = '\0';
-
- return 1;
-}
+static int matching_flags; /* exclude_fnmatch options */
-/* Get the next name from ARGV or the file of names. Result is in
+/* Get the next NELT_NAME element from name_array. 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)
+ If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as
+ the request to change to the given directory.
+
+ Entries of type NELT_FMASK cause updates of the matching_flags
+ value. */
+struct name_elt *
+name_next_elt (int change_dirs)
{
+ static struct name_elt entry;
const char *source;
char *cursor;
- int chdir_flag = 0;
- 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)
+ struct name_elt *ep;
+ size_t source_len;
+
+ ep = &name_array[name_index++];
+ if (ep->type == NELT_FMASK)
{
- if (! name_file)
- break;
- if (! read_name_from_file ())
- break;
+ matching_flags = ep->v.matching_flags;
+ continue;
}
- else
+
+ source = ep->v.name;
+ source_len = strlen (source);
+ if (name_buffer_length < source_len)
{
- size_t source_len;
- source = name_array[name_index++];
- source_len = strlen (source);
- if (name_buffer_length < source_len)
+ do
{
- do
- {
- name_buffer_length *= 2;
- if (! name_buffer_length)
- xalloc_die ();
- }
- while (name_buffer_length < source_len);
-
- free (name_buffer);
- 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. */
while (cursor > name_buffer && ISSLASH (*cursor))
*cursor-- = '\0';
- if (chdir_flag)
+ if (change_dirs && ep->type == NELT_CHDIR)
{
if (chdir (name_buffer) < 0)
chdir_fatal (name_buffer);
- chdir_flag = 0;
}
- else if (change_dirs && strcmp (name_buffer, "-C") == 0)
- 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;
+ entry.type = ep->type;
+ entry.v.name = name_buffer;
+ return &entry;
}
}
- /* No more names in file. */
-
- if (name_file && chdir_flag)
- FATAL_ERROR ((0, 0, _("Missing file name after -C")));
-
- return 0;
+ return NULL;
}
-/* Close the name file, if any. */
-void
-name_close (void)
+const char *
+name_next (int change_dirs)
{
- if (name_file && name_file != stdin)
- if (fclose (name_file) != 0)
- close_error (name_buffer);
+ struct name_elt *nelt = name_next_elt (change_dirs);
+ return nelt ? nelt->v.name : NULL;
}
/* Gather names in a list for scanning. Could hash them later if we
name_gather (void)
{
/* Buffer able to hold a single name. */
- static struct name *buffer;
- static size_t allocated_size;
+ static struct name *buffer = NULL;
- char const *name;
+ struct name_elt *ep;
if (same_order_option)
{
static int change_dir;
- if (allocated_size == 0)
- {
- 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_size);
- }
-
- 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));
- }
+ while ((ep = name_next_elt (0)) && ep->type == NELT_CHDIR)
+ change_dir = chdir_arg (xstrdup (ep->v.name));
- if (name)
+ if (ep)
{
- size_t needed_size;
- buffer->length = strlen (name);
- needed_size = offsetof (struct name, name) + buffer->length + 1;
- if (allocated_size < needed_size)
- {
- do
- {
- allocated_size *= 2;
- if (! allocated_size)
- xalloc_die ();
- }
- while (allocated_size < needed_size);
-
- buffer = xrealloc (buffer, allocated_size);
- }
+ free_name (buffer);
+ buffer = make_name (ep->v.name);
buffer->change_dir = change_dir;
- strcpy (buffer->name, name);
buffer->next = 0;
buffer->found_count = 0;
-
+ buffer->matching_flags = matching_flags;
+ buffer->dir_contents = NULL;
+ buffer->parent = NULL;
+
namelist = buffer;
nametail = &namelist->next;
}
else if (change_dir)
- addname (0, change_dir);
+ addname (0, change_dir, NULL);
}
else
{
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);
+ while ((ep = name_next_elt (0)) && ep->type == NELT_CHDIR)
+ change_dir = chdir_arg (xstrdup (ep->v.name));
+
+ if (ep)
+ addname (ep->v.name, change_dir, NULL);
else
{
if (change_dir != change_dir0)
- addname (0, change_dir);
+ addname (0, change_dir, NULL);
break;
}
}
/* Add a name to the namelist. */
struct name *
-addname (char const *string, int change_dir)
+addname (char const *string, int change_dir, struct name *parent)
{
- size_t length = string ? strlen (string) : 0;
- struct name *name = xmalloc (offsetof (struct name, name) + length + 1);
+ struct name *name = make_name (string);
- if (string)
- {
- name->fake = 0;
- strcpy (name->name, string);
- }
- else
- {
- 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->next = 0;
- name->length = length;
+ name->prev = *nametail;
+ name->next = NULL;
name->found_count = 0;
- name->regexp = 0; /* assume not a regular expression */
- name->firstch = 1; /* assume first char is literal */
+ name->matching_flags = matching_flags;
name->change_dir = change_dir;
- name->dir_contents = 0;
-
- if (string && is_pattern (string))
- {
- name->regexp = 1;
- if (string[0] == '*' || string[0] == '[' || string[0] == '?')
- name->firstch = 0;
- }
-
+ name->dir_contents = NULL;
+ name->parent = parent;
+
*nametail = name;
nametail = &name->next;
return name;
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
- : (p->length <= length
- && (file_name[p->length] == '\0'
- || (ISSLASH (file_name[p->length]) && recursion_option))
- && memcmp (file_name, p->name, p->length) == 0))
+ if (p->name[0]
+ && exclude_fnmatch (p->name, file_name, p->matching_flags))
return p;
}
- return 0;
+ return NULL;
+}
+
+void
+remname (struct name *name)
+{
+ struct name *p;
+
+ if ((p = name->prev) != NULL)
+ p->next = name->next;
+ else
+ namelist = name->next;
+
+ if ((p = name->next) != NULL)
+ p->prev = name->prev;
+ else
+ nametail = &name->prev;
}
/* Return true if and only if name FILE_NAME (from an archive) matches any
name from the namelist. */
-int
+bool
name_match (const char *file_name)
{
size_t length = strlen (file_name);
struct name *cursor = namelist;
if (!cursor)
- return ! files_from_option;
-
- if (cursor->fake)
+ return true;
+
+ if (cursor->name[0] == 0)
{
chdir_do (cursor->change_dir);
namelist = 0;
nametail = &namelist;
- return ! files_from_option;
+ return true;
}
cursor = namelist_match (file_name, length);
{
name_gather (); /* read one more */
if (namelist->found_count)
- return 0;
+ return false;
}
else
- return 0;
+ return false;
}
}
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)
+ if ((cursor->name[0] && !WASFOUND (cursor))
|| (len >= cursor->length && ISSLASH (p->file_name[cursor->length])))
return false;
}
return true;
}
+static inline int
+is_pattern (const char *string)
+{
+ return strchr (string, '*') || strchr (string, '[') || strchr (string, '?');
+}
+
+static void
+regex_usage_warning (const char *name)
+{
+ static int warned_once = 0;
+
+ if (warn_regex_usage && is_pattern (name))
+ {
+ warned_once = 1;
+ WARN ((0, 0,
+ /* TRANSLATORS: The following three msgids form a single sentence.
+ */
+ _("Pattern matching characters used in file names. Please,")));
+ WARN ((0, 0,
+ _("use --wildcards to enable pattern matching, or --no-wildcards to")));
+ WARN ((0, 0,
+ _("suppress this warning.")));
+ }
+}
+
/* Print the names of things in the namelist that were not matched. */
void
names_notfound (void)
struct name const *cursor;
for (cursor = namelist; cursor; cursor = cursor->next)
- if (!WASFOUND(cursor) && !cursor->fake)
+ if (!WASFOUND (cursor) && cursor->name[0])
{
+ regex_usage_warning (cursor->name);
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)));
+ quotearg_colon (cursor->name)));
}
/* Don't bother freeing the name list; we're about to exit. */
if (same_order_option)
{
- char *name;
+ const char *name;
while ((name = name_next (1)) != NULL)
- ERROR ((0, 0, _("%s: Not found in archive"),
- quotearg_colon (name)));
+ {
+ regex_usage_warning (name);
+ ERROR ((0, 0, _("%s: Not found in archive"),
+ quotearg_colon (name)));
+ }
}
}
\f
/* 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
+/* Sort *singly* linked LIST of names, of given LENGTH, using COMPARE
+ to order names. Return the sorted list. Note that after calling
+ this function, the `prev' links in list elements are messed up.
+
+ 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*))
+merge_sort_sll (struct name *list, int length,
+ int (*compare) (struct name const*, struct name const*))
{
struct name *first_list;
struct name *second_list;
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);
+ first_list = merge_sort_sll (first_list, first_length, compare);
+ second_list = merge_sort_sll (second_list, second_length, compare);
merge_point = &result;
while (first_list && second_list)
#undef SUCCESSOR
}
+/* Sort doubly linked LIST of names, of given LENGTH, using COMPARE
+ to order names. Return the sorted list. */
+static struct name *
+merge_sort (struct name *list, int length,
+ int (*compare) (struct name const*, struct name const*))
+{
+ struct name *head, *p, *prev;
+ head = merge_sort_sll (list, length, compare);
+ /* Fixup prev pointers */
+ for (prev = NULL, p = head; p; prev = p, p = p->next)
+ p->prev = prev;
+ return head;
+}
+
/* 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)
+compare_names_found (struct name const *n1, struct name const *n2)
{
- int found_diff = WASFOUND(n2) - WASFOUND(n1);
+ int found_diff = WASFOUND (n2) - WASFOUND (n1);
return found_diff ? found_diff : strcmp (n1->name, n2->name);
}
+
+/* Simple comparison by names. */
+static int
+compare_names (struct name const *n1, struct name const *n2)
+{
+ return strcmp (n1->name, n2->name);
+}
+
\f
/* Add all the dirs under NAME, which names a directory, to the namelist.
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. */
+ DEVICE is the device not to leave, if the -l option is specified.
+ CMDLINE is true, if the NAME appeared on the command line. */
static void
-add_hierarchy_to_namelist (struct name *name, dev_t device)
+add_hierarchy_to_namelist (struct name *name, dev_t device, bool cmdline)
{
char *file_name = name->name;
- char *buffer = get_directory_contents (file_name, device);
-
+ const char *buffer = scan_directory (file_name, device, cmdline);
+
if (! buffer)
name->dir_contents = "\0\0\0\0";
else
{
+ struct name *child_head = NULL, *child_tail = NULL;
size_t name_length = name->length;
size_t allocated_length = (name_length >= NAME_FIELD_SIZE
? name_length + NAME_FIELD_SIZE
: NAME_FIELD_SIZE);
char *namebuf = xmalloc (allocated_length + 1);
/* FIXME: + 2 above? */
- char *string;
+ const char *string;
size_t string_length;
int change_dir = name->change_dir;
string_length = strlen (string);
if (*string == 'D')
{
+ struct name *np;
+
if (allocated_length <= name_length + string_length)
{
do
namebuf = xrealloc (namebuf, allocated_length + 1);
}
strcpy (namebuf + name_length, string + 1);
- add_hierarchy_to_namelist (addname (namebuf, change_dir),
- device);
+ np = addname (namebuf, change_dir, name);
+ if (!child_head)
+ child_head = np;
+ else
+ child_tail->sibling = np;
+ child_tail = np;
+ add_hierarchy_to_namelist (np, device, false);
}
}
free (namebuf);
+ name->child = child_head;
}
}
\f
+/* Auxiliary functions for hashed table of struct name's. */
+
+static size_t
+name_hash (void const *entry, size_t n_buckets)
+{
+ struct name const *name = entry;
+ return hash_string (name->caname, n_buckets);
+}
+
+/* Compare two directories for equality of their names. */
+static bool
+name_compare (void const *entry1, void const *entry2)
+{
+ struct name const *name1 = entry1;
+ struct name const *name2 = entry2;
+ return strcmp (name1->caname, name2->caname) == 0;
+}
+
+\f
+/* Rebase `name' member of CHILD and all its siblings to
+ the new PARENT. */
+static void
+rebase_child_list (struct name *child, struct name *parent)
+{
+ size_t old_prefix_len = child->parent->length;
+ size_t new_prefix_len = parent->length;
+ char *new_prefix = parent->name;
+
+ for (; child; child = child->sibling)
+ {
+ size_t size = child->length - old_prefix_len + new_prefix_len;
+ char *newp = xmalloc (size + 1);
+ strcpy (newp, new_prefix);
+ strcat (newp, child->name + old_prefix_len);
+ free (child->name);
+ child->name = newp;
+ child->length = size;
+
+ rebase_directory (child->name, old_prefix_len, child->parent->name,
+ new_prefix);
+ }
+}
+
/* Collect all the names from argv[] (or whatever), expand them into a
directory tree, and sort them. This gets only subdirectories, not
all files. */
collect_and_sort_names (void)
{
struct name *name;
- struct name *next_name;
+ struct name *next_name, *prev_name;
int num_names;
struct stat statbuf;
-
+ Hash_table *nametab;
+
name_gather ();
- if (listed_incremental_option)
- read_directory_file ();
-
if (!namelist)
- addname (".", 0);
+ addname (".", 0, NULL);
+ if (listed_incremental_option)
+ {
+ switch (chdir_count ())
+ {
+ case 0:
+ break;
+
+ case 1:
+ if (namelist->change_dir == 0)
+ USAGE_ERROR ((0, 0,
+ _("Using -C option inside file list is not "
+ "allowed with --listed-incremental")));
+ break;
+
+ default:
+ USAGE_ERROR ((0, 0,
+ _("Only one -C option is allowed with "
+ "--listed-incremental")));
+ }
+ chdir_do (namelist->change_dir);
+ read_directory_file ();
+ }
+
for (name = namelist; name; name = next_name)
{
next_name = name->next;
if (name->found_count || name->dir_contents)
continue;
- if (name->regexp) /* FIXME: just skip regexps for now */
+ if (name->matching_flags & EXCLUDE_WILDCARDS)
+ /* NOTE: EXCLUDE_ANCHORED is not relevant here */
+ /* FIXME: just skip regexps for now */
continue;
chdir_do (name->change_dir);
- if (name->fake)
+
+ if (name->name[0] == 0)
continue;
if (deref_stat (dereference_option, name->name, &statbuf) != 0)
if (S_ISDIR (statbuf.st_mode))
{
name->found_count++;
- add_hierarchy_to_namelist (name, statbuf.st_dev);
+ if (name->found_count == 1)
+ add_hierarchy_to_namelist (name, statbuf.st_dev, true);
}
}
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_count = 0;
+ num_names = 0;
+ nametab = hash_initialize (0, 0,
+ name_hash,
+ name_compare, NULL);
+ for (name = namelist; name; name = next_name)
+ {
+ next_name = name->next;
+ name->caname = normalize_filename (name->name);
+ if (prev_name)
+ {
+ struct name *p = hash_lookup (nametab, name);
+ if (p)
+ {
+ /* Keep the one listed in the command line */
+ if (!name->parent)
+ {
+ if (p->child)
+ rebase_child_list (p->child, name);
+ /* FIXME: remove_directory (p->caname); ? */
+ remname (p);
+ free_name (p);
+ num_names--;
+ }
+ else
+ {
+ if (name->child)
+ rebase_child_list (name->child, p);
+ /* FIXME: remove_directory (name->caname); ? */
+ remname (name);
+ free_name (name);
+ continue;
+ }
+ }
+ }
+ name->found_count = 0;
+ hash_insert (nametab, name);
+ prev_name = name;
+ num_names++;
+ }
+ nametail = &prev_name;
+ hash_free (nametab);
+
+ namelist = merge_sort (namelist, num_names, compare_names_found);
+
+ if (listed_incremental_option)
+ {
+ for (name = namelist; name && name->name[0] == 0; name++)
+ ;
+ if (name)
+ name->dir_contents = append_incremental_renames (name->dir_contents);
+ }
}
-/* 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. */
struct name *
name_scan (const char *file_name)
{
{
if (!gnu_list_name)
gnu_list_name = namelist;
- while (gnu_list_name && (gnu_list_name->found_count || gnu_list_name->fake))
+ while (gnu_list_name
+ && (gnu_list_name->found_count || gnu_list_name->name[0] == 0))
gnu_list_name = gnu_list_name->next;
if (gnu_list_name)
{
}
/* 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. */
+ NAME, with an intervening slash if FILE_NAME does not already end in one. */
char *
new_name (const char *file_name, const char *name)
{
bool
excluded_name (char const *name)
{
- return excluded_filename (excluded, name + FILE_SYSTEM_PREFIX_LEN (name));
-}
-\f
-/* Hash tables of strings. */
-
-/* Calculate the hash of a string. */
-static unsigned
-hash_string_hasher (void const *name, unsigned n_buckets)
-{
- return hash_string (name, n_buckets);
-}
-
-/* Compare two strings for equality. */
-static bool
-hash_string_compare (void const *name1, void const *name2)
-{
- return strcmp (name1, name2) == 0;
-}
-
-/* Return zero if TABLE contains a copy of STRING; otherwise, insert a
- copy of STRING to TABLE and return 1. */
-static bool
-hash_string_insert (Hash_table **table, char const *string)
-{
- Hash_table *t = *table;
- char *s = xstrdup (string);
- char *e;
-
- if (! ((t
- || (*table = t = hash_initialize (0, 0, hash_string_hasher,
- hash_string_compare, 0)))
- && (e = hash_insert (t, s))))
- xalloc_die ();
-
- if (e == s)
- return 1;
- else
- {
- free (s);
- return 0;
- }
-}
-
-/* Return 1 if TABLE contains STRING. */
-static bool
-hash_string_lookup (Hash_table const *table, char const *string)
-{
- return table && hash_lookup (table, string);
+ return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name));
}
\f
/* Names to avoid dumping. */
register_individual_file (char const *name)
{
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);
}
\f
-static Hash_table *prefix_table[2];
-
-/* Return true if file names of some members in the archive were stripped off
- their leading components. We could have used
- return prefix_table[0] || prefix_table[1]
- but the following seems to be safer: */
-bool
-removed_prefixes_p (void)
-{
- return (prefix_table[0] && hash_get_n_entries (prefix_table[0]) != 0)
- || (prefix_table[1] && hash_get_n_entries (prefix_table[1]) != 0);
-}
-
-/* Return a safer suffix of FILE_NAME, or "." if it has no safer
- suffix. Check for fully specified file names and other atrocities.
- Warn the user if we do not return NAME. If LINK_TARGET is 1,
- FILE_NAME is the target of a hard link, not a member name. */
-
-char *
-safer_name_suffix (char const *file_name, bool link_target)
-{
- char const *p;
-
- if (absolute_names_option)
- p = file_name;
- else
- {
- /* Skip file system prefixes, leading file name components that contain
- "..", and leading slashes. */
-
- size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
-
- for (p = file_name + prefix_len; *p; )
- {
- if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
- prefix_len = p + 2 - file_name;
-
- do
- {
- char c = *p++;
- if (ISSLASH (c))
- break;
- }
- while (*p);
- }
-
- for (p = file_name + prefix_len; ISSLASH (*p); p++)
- continue;
- prefix_len = p - file_name;
-
- if (prefix_len)
- {
- char *prefix = alloca (prefix_len + 1);
- memcpy (prefix, file_name, prefix_len);
- prefix[prefix_len] = '\0';
-
- if (hash_string_insert (&prefix_table[link_target], prefix))
- {
- static char const *const diagnostic[] =
- {
- N_("Removing leading `%s' from member names"),
- N_("Removing leading `%s' from hard link targets")
- };
- WARN ((0, 0, _(diagnostic[link_target]), prefix));
- }
- }
- }
-
- if (! *p)
- {
- if (p == file_name)
- {
- static char const *const diagnostic[] =
- {
- N_("Substituting `.' for empty member name"),
- N_("Substituting `.' for empty hard link target")
- };
- WARN ((0, 0, "%s", _(diagnostic[link_target])));
- }
-
- p = ".";
- }
-
- return (char *) p;
-}
-\f
/* Return the size of the prefix of FILE_NAME that is removed after
stripping NUM leading file name components. NUM must be
positive. */
if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
return 1;
- do
+ while (! ISSLASH (*p))
{
if (! *p++)
return 0;
}
- while (! ISSLASH (*p));
}
}
projects / chaz / tar / blobdiff