From eb7c2001aaece98f2d80249cb526381a57d2be1b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 5 Jan 2000 20:49:52 +0000 Subject: Update. * io/ftw.c (process_entry): Cache object dev/inode only for directories (PR libc/1514). 2000-01-05 Andreas Schwab * locale/programs/charmap.c (charmap_read): Fix typo. 2000-01-05 Ulrich Drepper * locale/programs/charset.c: Removed. --- io/ftw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'io') diff --git a/io/ftw.c b/io/ftw.c index f1e2fd9..3428fcf 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -1,5 +1,5 @@ /* File tree walker functions. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -288,12 +288,12 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, && (flag == FTW_NS || !(data->flags & FTW_MOUNT) || st.st_dev == data->dev)) { - if ((data->flags & FTW_PHYS) || flag == FTW_NS - || (!find_object (data, &st) - /* Remember the object. */ - && (result = add_object (data, &st)) == 0)) + if (flag == FTW_D) { - if (flag == FTW_D) + if ((data->flags & FTW_PHYS) + || (!find_object (data, &st) + /* Remember the object. */ + && (result = add_object (data, &st)) == 0)) { result = ftw_dir (data, &st); @@ -325,10 +325,10 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, } } } - else - result = (*data->func) (data->dirbuf, &st, data->cvt_arr[flag], - &data->ftw); } + else + result = (*data->func) (data->dirbuf, &st, data->cvt_arr[flag], + &data->ftw); } return result; -- cgit v1.1