From f0a528b13a71beaa24def74d4b5b2233b389200e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 22 Jan 2003 15:45:48 +0000 Subject: [PATCH] (process_entry): Handle FTW_DCHP. (ftw_dir): Handle FTW_DCH. --- lib/ftw.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/ftw.c b/lib/ftw.c index 3fe76d1cd9..0843c11cfa 100644 --- a/lib/ftw.c +++ b/lib/ftw.c @@ -398,6 +398,12 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, if (__chdir ("..") < 0) result = -1; } + + if (result < 0) + { + result = (*data->func) (data->dirbuf, NULL, FTW_DCHP, + &data->ftw); + } } } } @@ -464,6 +470,10 @@ ftw_dir (struct ftw_data *data, struct STAT *st) data->actdir = data->maxdir - 1; data->dirstreams[data->actdir] = NULL; + /* We cannot change to the directory. + Signal this with a special flag. */ + result = (*data->func) (data->dirbuf, st, FTW_DCH, &data->ftw); + return result; } } -- 2.47.2