Revamp tar_getcwd/normalize_filename stuff.

[chaz/tar] / src / names.c

diff --git a/src/names.c b/src/names.c
index 85049b12efb0c552d5f2d1d511d65202ac7ec531..32403b3995f8193638dd522de5f50d37dd80f988 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -578,13 +578,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 +1238,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);