fix an eternal loop in handle_option

[chaz/tar] / src / names.c

diff --git a/src/names.c b/src/names.c
index 85049b12efb0c552d5f2d1d511d65202ac7ec531..594e7fdd591a3116fb54dfc796c3562e7b5e983b 100644 (file)
--- 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"
 \f
@@ -438,7 +439,7 @@ handle_option (const char *str)
   int i;
 
   while (*str && isspace (*str))
-    ;
+    ++str;
   if (*str != '-')
     return 1;
 
@@ -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;
 
@@ -578,13 +582,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 +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);
@@ -1373,12 +1373,6 @@ new_name (const char *file_name, const char *name)
   return buffer;
 }
 
-/* Return nonzero if file NAME is excluded.  */
-bool
-excluded_name (char const *name)
-{
-  return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name));
-}
 \f
 
 /* Return the size of the prefix of FILE_NAME that is removed after