(procdir): If name_scan() returns something, check if it was explicitely given in the command line
This commit is contained in:
@@ -150,6 +150,7 @@ procdir (char *name_buffer, struct stat *stat_data,
|
|||||||
{
|
{
|
||||||
struct directory *directory;
|
struct directory *directory;
|
||||||
bool nfs = NFS_FILE_STAT (*stat_data);
|
bool nfs = NFS_FILE_STAT (*stat_data);
|
||||||
|
struct name *np;
|
||||||
|
|
||||||
if ((directory = find_directory (name_buffer)) != NULL)
|
if ((directory = find_directory (name_buffer)) != NULL)
|
||||||
{
|
{
|
||||||
@@ -207,7 +208,7 @@ procdir (char *name_buffer, struct stat *stat_data,
|
|||||||
omit it... */
|
omit it... */
|
||||||
if (one_file_system_option && device != stat_data->st_dev
|
if (one_file_system_option && device != stat_data->st_dev
|
||||||
/* ... except if it was explicitely given in the command line */
|
/* ... except if it was explicitely given in the command line */
|
||||||
&& !name_scan (name_buffer))
|
&& !((np = name_scan (name_buffer)) && np->explicit))
|
||||||
directory->children = NO_CHILDREN;
|
directory->children = NO_CHILDREN;
|
||||||
else if (children == ALL_CHILDREN)
|
else if (children == ALL_CHILDREN)
|
||||||
directory->children = ALL_CHILDREN;
|
directory->children = ALL_CHILDREN;
|
||||||
|
|||||||
Reference in New Issue
Block a user