(safer_name_suffix): Reverted change made 2003-11-14. Reason: Discussion with Paul...

[chaz/tar] / src / names.c

diff --git a/src/names.c b/src/names.c
index 66648a08810460579849f18d80331b233edca67a..6fc5ee5105ba68d0ceadde88b1391fa33bbeb516 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -833,10 +833,7 @@ collect_and_sort_names (void)
 
       if (deref_stat (dereference_option, name->name, &statbuf) != 0)
        {
-         if (ignore_failed_read_option)
-           stat_warn (name->name);
-         else
-           stat_error (name->name);
+         stat_diag (name->name);
          continue;
        }
       if (S_ISDIR (statbuf.st_mode))
@@ -1024,10 +1021,8 @@ safer_name_suffix (char const *file_name, bool link_target)
 
       for (p = file_name + prefix_len; *p; )
        {
-         if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+          if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
            prefix_len = p + 2 - file_name;
-         else if (p[0] == '.' && ISSLASH (p[1]))
-           prefix_len = p + 1 - file_name;
          
          do
            {
@@ -1072,7 +1067,7 @@ safer_name_suffix (char const *file_name, bool link_target)
          };
          WARN ((0, 0, _(diagnostic[link_target])));
        }
-
+      
       p = ".";
     }