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
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++;
WARN ((0, 0, _(diagnostic[link_target])));
}
- p = ".";
+ p = ISSLASH (file_name[strlen(file_name)-1]) ? "./" : ".";
}
return (char *) p;