directory is found to be on another device, *and* this directory
is explicitely given in the command line, then do not omit it.
? ALL_CHILDREN
: CHANGED_CHILDREN;
}
? ALL_CHILDREN
: CHANGED_CHILDREN;
}
-
- if (one_file_system_option && device != stat_data->st_dev)
+
+ /* If the directory is on another device and --one-file-system was given,
+ omit it... */
+ if (one_file_system_option && device != stat_data->st_dev
+ /* ... except if it was explicitely given in the command line */
+ && !name_scan (name_buffer))
directory->children = NO_CHILDREN;
else if (children == ALL_CHILDREN)
directory->children = ALL_CHILDREN;
directory->children = NO_CHILDREN;
else if (children == ALL_CHILDREN)
directory->children = ALL_CHILDREN;