Attachment 604550 Details for Bug 848230 – Possible fix for bad --update matching.

Possible fix for bad --update matching.

wild.patch (text/plain), 3.05 KB, created by Pavel Raiskup on 2012-08-15 08:44:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2012-08-15 08:44:32 UTC

Size: 3.05 KB

patch

obsolete

>diff --git a/src/common.h b/src/common.h
>index 439bf42..13809f8 100644
>--- a/src/tar.c
>+++ b/src/tar.c
>@@ -1509,7 +1509,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
> 
>     case 'K':
>       starting_file_option = true;
>-      addname (arg, 0, true, NULL);
>+      addname (arg, 0, true, NULL, 0);
>       break;
> 
>     case ONE_FILE_SYSTEM_OPTION:
>--- a/src/common.h
>+++ b/src/common.h
>@@ -670,7 +670,8 @@ void name_term (void);
> const char *name_next (int change_dirs);
> void name_gather (void);
> struct name *addname (char const *string, int change_dir,
>-		      bool cmdline, struct name *parent);
>+                      bool cmdline, struct name *parent, int
>+                      mask_matching_flags);
> void remname (struct name *name);
> bool name_match (const char *name);
> void names_notfound (void);
>diff --git a/src/names.c b/src/names.c
>index 3911f8c..a63c6b5 100644
>--- a/src/names.c
>+++ b/src/names.c
>@@ -414,7 +414,7 @@ name_gather (void)
> 	  namelist = nametail = buffer;
> 	}
>       else if (change_dir)
>-	addname (0, change_dir, false, NULL);
>+	addname (0, change_dir, false, NULL, 0);
>     }
>   else
>     {
>@@ -428,11 +428,11 @@ name_gather (void)
> 	    change_dir = chdir_arg (xstrdup (ep->v.name));
> 
> 	  if (ep)
>-	    addname (ep->v.name, change_dir, true, NULL);
>+	    addname (ep->v.name, change_dir, true, NULL, 0);
> 	  else
> 	    {
> 	      if (change_dir != change_dir0)
>-		addname (NULL, change_dir, false, NULL);
>+		addname (NULL, change_dir, false, NULL, 0);
> 	      break;
> 	    }
> 	}
>@@ -441,14 +441,15 @@ name_gather (void)
> 
> /*  Add a name to the namelist.  */
> struct name *
>-addname (char const *string, int change_dir, bool cmdline, struct name *parent)
>+addname (char const *string, int change_dir, bool cmdline, struct name *parent,
>+         int mask_matching_flags)
> {
>   struct name *name = make_name (string);
> 
>   name->prev = nametail;
>   name->next = NULL;
>   name->found_count = 0;
>-  name->matching_flags = matching_flags;
>+  name->matching_flags = matching_flags & ~mask_matching_flags;
>   name->change_dir = change_dir;
>   name->directory = NULL;
>   name->parent = parent;
>@@ -829,7 +830,7 @@ add_hierarchy_to_namelist (struct tar_stat_info *st, struct name *name)
> 		  namebuf = xrealloc (namebuf, allocated_length + 1);
> 		}
> 	      strcpy (namebuf + name_length, string + 1);
>-	      np = addname (namebuf, change_dir, false, name);
>+	      np = addname (namebuf, change_dir, false, name, 0);
> 	      if (!child_head)
> 		child_head = np;
> 	      else
>@@ -934,7 +935,7 @@ collect_and_sort_names (void)
>   name_gather ();
> 
>   if (!namelist)
>-    addname (".", 0, false, NULL);
>+    addname (".", 0, false, NULL, 0);
> 
>   if (listed_incremental_option)
>     {
>diff --git a/src/update.c b/src/update.c
>index 4739e0d..0afeb2a 100644
>--- a/src/update.c
>+++ b/src/update.c
>@@ -159,7 +159,7 @@ update_archive (void)
> 
> 			    for (p = dirp; *p; p += strlen (p) + 1)
> 			      addname (namebuf_name (nbuf, p),
>-				       name->change_dir, false, NULL);
>+				       name->change_dir, false, NULL, EXCLUDE_WILDCARDS);
> 
> 			    namebuf_free (nbuf);
> 			    free (dirp);

Actions: View

Attachments on bug 848230: 604483 | 604550