(collect_and_sort_names): Update dir_contents of the first non-fake name entry when...

[chaz/tar] / src / names.c

diff --git a/src/names.c b/src/names.c
index e6082d856af00b1532edca3c2fe133652b5dc9d7..d65b04f6de5ba28243a9c112e3f28132e4b3fefe 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,7 @@
 /* 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
@@ -209,6 +209,7 @@ name_add (const char *name)
     }
   name_array[names++] = name;
 }
+
 \f
 /* Names from external name file.  */
 
@@ -428,6 +429,7 @@ addname (char const *string, int change_dir)
   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))
     {
@@ -444,7 +446,7 @@ addname (char const *string, int change_dir)
 /* 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;
 
@@ -457,6 +459,8 @@ namelist_match (char const *file_name, size_t length)
 
       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))
@@ -489,7 +493,7 @@ name_match (const char *file_name)
          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)
@@ -708,6 +712,8 @@ add_hierarchy_to_namelist (struct name *name, dev_t device)
          string_length = strlen (string);
          if (*string == 'D')
            {
+             struct name *np;
+
              if (allocated_length <= name_length + string_length)
                {
                  do
@@ -721,8 +727,9 @@ add_hierarchy_to_namelist (struct name *name, dev_t device)
                  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);
            }
        }
 
@@ -780,20 +787,32 @@ collect_and_sort_names (void)
 
   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;