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

diff --git a/src/names.c b/src/names.c
index 32403b3..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;