/* Various processing of names.
Copyright (C) 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001,
- 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
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>
}
name_array[names++] = name;
}
+
\f
/* Names from external name file. */
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))
{
/* 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)
+namelist_match (char const *file_name, size_t length, bool exact)
{
struct name *p;
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))
return 1;
}
- cursor = namelist_match (file_name, length);
+ cursor = namelist_match (file_name, length, false);
if (cursor)
{
if (!(ISSLASH (file_name[cursor->length]) && recursion_option)
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);
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);
+ np->explicit = 0;
+ add_hierarchy_to_namelist (np, device);
}
}
for (name = namelist; name; name = name->next)
name->found_count = 0;
+
+ if (listed_incremental_option)
+ {
+ for (name = namelist; name && name->fake; 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.
+ 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 *file_name)
+name_scan (const char *file_name, bool exact)
{
size_t length = strlen (file_name);
while (1)
{
- struct name *cursor = namelist_match (file_name, length);
+ struct name *cursor = namelist_match (file_name, length, exact);
if (cursor)
return cursor;
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 size_t
-hash_string_hasher (void const *name, size_t 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. */
\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. */
projects / chaz / tar / blobdiff