X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=src%2Fnames.c;h=fc9841e25410d45f9ff3c3871ab676863af39d09;hp=85049b12efb0c552d5f2d1d511d65202ac7ec531;hb=6e8bca8b5664f9070fe9cc0d16dff324eb24c069;hpb=dd549cc257c7ec9e0780f649ac8ae384a84baba0

diff --git a/src/names.c b/src/names.c
index 85049b1..fc9841e 100644
--- a/src/names.c
+++ b/src/names.c
@@ -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 ();
@@ -578,13 +581,11 @@ name_next_elt (int change_dirs)
 	case NELT_CHDIR:
 	  if (change_dirs)
 	    {
-	      copy_name (ep);
-	      if (chdir (name_buffer) < 0)
-		chdir_fatal (name_buffer);
+	      chdir_do (chdir_arg (xstrdup (ep->v.name)));
 	      name_list_advance ();
 	      break;
 	    }
-	  /* fall trhough */
+	  /* fall through */
 	case NELT_NAME:
 	  copy_name (ep);
 	  if (unquote_option)
@@ -1240,13 +1241,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);