/* Various processing of names.
- Copyright 1988, 92, 94, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+
+ Copyright 1988, 1992, 1994, 1996, 1997, 1998, 1999, 2000, 2001 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
/* Zap trailing slashes. */
cursor = name_buffer + strlen (name_buffer) - 1;
- while (cursor > name_buffer && *cursor == '/')
+ while (cursor > name_buffer && ISSLASH (*cursor))
*cursor-- = '\0';
if (chdir_flag)
if (p->regexp
? fnmatch (p->name, path, recursion_option) == 0
: (p->length <= length
- && (path[p->length] == '\0' || path[p->length] == '/')
+ && (path[p->length] == '\0' || ISSLASH (path[p->length]))
&& memcmp (path, p->name, p->length) == 0))
return p;
}
}
\f
/* Add all the dirs under NAME, which names a directory, to the namelist.
- DIRSIZE is the size of the directory, or -1 if not known.
If any of the files is a directory, recurse on the subdirectory.
DEVICE is the device not to leave, if the -l option is specified. */
static void
-add_hierarchy_to_namelist (struct name *name, off_t dirsize, dev_t device)
+add_hierarchy_to_namelist (struct name *name, dev_t device)
{
char *path = name->name;
- char *buffer = get_directory_contents (path, dirsize, device);
+ char *buffer = get_directory_contents (path, device);
if (! buffer)
name->dir_contents = "\0\0\0\0";
name->dir_contents = buffer;
strcpy (name_buffer, path);
- if (name_buffer[name_length - 1] != '/')
+ if (! ISSLASH (name_buffer[name_length - 1]))
{
name_buffer[name_length++] = '/';
name_buffer[name_length] = '\0';
}
strcpy (name_buffer + name_length, string + 1);
add_hierarchy_to_namelist (addname (name_buffer, change_dir),
- -1, device);
+ device);
}
}
if (deref_stat (dereference_option, name->name, &statbuf) != 0)
{
- stat_error (name->name);
+ if (ignore_failed_read_option)
+ stat_warn (name->name);
+ else
+ stat_error (name->name);
continue;
}
if (S_ISDIR (statbuf.st_mode))
{
name->found = 1;
- add_hierarchy_to_namelist (name, statbuf.st_size, statbuf.st_dev);
+ add_hierarchy_to_namelist (name, statbuf.st_dev);
}
}
{
size_t pathlen = strlen (path);
size_t namesize = strlen (name) + 1;
- int slash = pathlen && path[pathlen - 1] != '/';
+ int slash = pathlen && ! ISSLASH (path[pathlen - 1]);
char *buffer = xmalloc (pathlen + slash + namesize);
memcpy (buffer, path, pathlen);
buffer[pathlen] = '/';
/* Return nonzero if file NAME is excluded. Exclude a name if its
prefix matches a pattern that contains slashes, or if one of its
components matches a pattern that contains no slashes. */
-int
+bool
excluded_name (char const *name)
{
- char const *p;
- name += FILESYSTEM_PREFIX_LEN (name);
-
- if (excluded_filename (excluded_with_slash, name,
- FNM_FILE_NAME | recursion_option))
- return 1;
-
- for (p = name; *p; p++)
- if (((p == name || ISSLASH (p[-1])) && !ISSLASH (p[0]))
- && excluded_filename (excluded_without_slash, p,
- FNM_FILE_NAME | FNM_LEADING_DIR))
- return 1;
-
- return 0;
+ return excluded_filename (excluded, name + FILESYSTEM_PREFIX_LEN (name));
}
\f
/* Names to avoid dumping. */