diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-06-23 00:21:02 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-06-23 00:21:02 +0200 |
| commit | 943f82dfa6ac250be30e4efe147831e9765cda93 (patch) | |
| tree | bb74ae9fc328524d7a48bfe59b0a41c7c5aab1ef | |
| parent | 6928165c52fe3a21829403c1eda93fbc5693f35a (diff) | |
| parent | 1a80c89ee88357137b598fa3357b576933c5746c (diff) | |
| download | acl-943f82dfa6ac250be30e4efe147831e9765cda93.tar.gz | |
Merge branch 'misc'
| -rw-r--r-- | include/walk_tree.h | 9 | ||||
| -rw-r--r-- | libmisc/walk_tree.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/walk_tree.h b/include/walk_tree.h index 53a8fc5..9f1ec34 100644 --- a/include/walk_tree.h +++ b/include/walk_tree.h @@ -20,10 +20,11 @@ #ifndef __WALK_TREE_H #define __WALK_TREE_H -#define WALK_TREE_RECURSIVE 0x1 -#define WALK_TREE_PHYSICAL 0x2 -#define WALK_TREE_LOGICAL 0x4 -#define WALK_TREE_DEREFERENCE 0x8 +#define WALK_TREE_RECURSIVE 0x01 +#define WALK_TREE_PHYSICAL 0x02 +#define WALK_TREE_LOGICAL 0x04 +#define WALK_TREE_DEREFERENCE 0x08 +#define WALK_TREE_DEREFERENCE_TOPLEVEL 0x10 #define WALK_TREE_TOPLEVEL 0x100 #define WALK_TREE_SYMLINK 0x200 diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c index 2777145..30ff92a 100644 --- a/libmisc/walk_tree.c +++ b/libmisc/walk_tree.c @@ -78,7 +78,9 @@ static int walk_tree_rec(const char *path, int walk_flags, return func(path, NULL, flags | WALK_TREE_FAILED, arg); if (S_ISLNK(st.st_mode)) { flags |= WALK_TREE_SYMLINK; - if (flags & WALK_TREE_DEREFERENCE) { + if ((flags & WALK_TREE_DEREFERENCE) || + ((flags & WALK_TREE_TOPLEVEL) && + (flags & WALK_TREE_DEREFERENCE_TOPLEVEL))) { if (stat(path, &st) != 0) return func(path, NULL, flags | WALK_TREE_FAILED, arg); |