X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fnames.c;h=a19afd7a20c80571ddfc440d0f4a98485f2879a2;hb=ebeb3d4f3058b7bbb92e7ea797cf938ec03ee2ed;hp=a8a03bb6434df6945826a78aab8474eab1f828a3;hpb=91493ea9b62a24ab139eedd4c919e4fcda9750c3;p=chaz%2Ftar

diff --git a/src/names.c b/src/names.c
index a8a03bb..a19afd7 100644
--- a/src/names.c
+++ b/src/names.c
@@ -20,9 +20,7 @@
 #include "system.h"
 
 #include <fnmatch.h>
-#include <grp.h>
 #include <hash.h>
-#include <pwd.h>
 #include <quotearg.h>
 
 #include "common.h"
@@ -610,9 +608,11 @@ bool
 all_names_found (struct tar_stat_info *p)
 {
   struct name const *cursor;
-  size_t len = strlen (p->file_name);
-  if (occurrence_option == 0 || p->had_trailing_slash)
+  size_t len;
+
+  if (!p->file_name || occurrence_option == 0 || p->had_trailing_slash)
     return false;
+  len = strlen (p->file_name);
   for (cursor = namelist; cursor; cursor = cursor->next)
     {
       if (cursor->regexp
@@ -636,7 +636,7 @@ names_notfound (void)
 	  ERROR ((0, 0, _("%s: Not found in archive"),
 		  quotearg_colon (cursor->name)));
 	else
-	  ERROR ((0, 0, _("%s: Required occurence not found in archive"),
+	  ERROR ((0, 0, _("%s: Required occurrence not found in archive"),
 		  quotearg_colon (cursor->name)));
       }
   
@@ -1024,9 +1024,14 @@ 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]))
-	    prefix_len = p + 2 - file_name;
-
+	  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;
+	    }
+	  
 	  do
 	    {
 	      char c = *p++;
@@ -1071,7 +1076,7 @@ safer_name_suffix (char const *file_name, bool link_target)
 	  WARN ((0, 0, _(diagnostic[link_target])));
 	}
 
-      p = ".";
+      p = ISSLASH (file_name[strlen(file_name)-1]) ? "./" : ".";
     }
 
   return (char *) p;