From 86ef91adffd13b771e0e244eeedf2385f3f82851 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 12 Dec 2005 22:55:39 +0000 Subject: [PATCH] If --one-file-system is given and a directory is found to be on another device, *and* this directory is explicitely given in the command line, then do not omit it. --- src/incremen.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/incremen.c b/src/incremen.c index ec8a86d..269b4ce 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -202,8 +202,12 @@ procdir (char *name_buffer, struct stat *stat_data, ? 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; -- 2.44.0