(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 a19afd7a20c80571ddfc440d0f4a98485f2879a2..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,13 +1021,8 @@ safer_name_suffix (char const *file_name, bool link_target)
 
       for (p = file_name + prefix_len; *p; )
        {
-         if (p[0] == '.')
-           {
-             if (p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
-               prefix_len = p + 2 - file_name;
-             else if (ISSLASH (p[1]))
-               prefix_len = p + 1 - file_name;
-           }
+          if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+           prefix_len = p + 2 - file_name;
          
          do
            {
@@ -1075,8 +1067,8 @@ safer_name_suffix (char const *file_name, bool link_target)
          };
          WARN ((0, 0, _(diagnostic[link_target])));
        }
-
-      p = ISSLASH (file_name[strlen(file_name)-1]) ? "./" : ".";
+      
+      p = ".";
     }
 
   return (char *) p;