X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=src%2Fnames.c;h=60a5f700c3acaa3412e14b4da7cf6c3b900c96a7;hp=8b32de196e77d96c9aebb29730bdf304c0205599;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=b41b004638faa8b446fe37bb8b178a6be496c666

diff --git a/src/names.c b/src/names.c
index 8b32de1..60a5f70 100644
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,7 @@
 /* Various processing of names.
 
-   Copyright 1988, 1992, 1994, 1996-2001, 2003-2007, 2009, 2013 Free
-   Software Foundation, Inc.
+   Copyright 1988, 1992, 1994, 1996-2001, 2003-2007, 2009, 2013-2014
+   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
@@ -22,6 +22,7 @@
 #include <hash.h>
 #include <quotearg.h>
 #include <wordsplit.h>
+#include <argp.h>
 
 #include "common.h"
 
@@ -491,6 +492,8 @@ read_next_name (struct name_elt *ent, struct name_elt *ret)
 	  ent->v.file.term = 0;
 	  /* fall through */
 	case file_list_success:
+	  if (unquote_option)
+	    unquote_string (name_buffer);
 	  if (handle_option (name_buffer) == 0)
 	    {
 	      name_list_adjust ();
@@ -567,6 +570,7 @@ name_next_elt (int change_dirs)
 
 	case NELT_FMASK:
 	  matching_flags = ep->v.matching_flags;
+	  recursion_option = matching_flags & FNM_LEADING_DIR;
 	  name_list_advance ();
 	  continue;
 
@@ -1238,13 +1242,11 @@ collect_and_sort_names (void)
   namelist = merge_sort (namelist, num_names, compare_names);
 
   num_names = 0;
-  nametab = hash_initialize (0, 0,
-			     name_hash,
-			     name_compare, NULL);
+  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);
+      name->caname = normalize_filename (name->change_dir, name->name);
       if (prev_name)
 	{
 	  struct name *p = hash_lookup (nametab, name);