1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
From 6f1143425a3afc4eb5086e9c90e7efb3affd7cb7 Mon Sep 17 00:00:00 2001
From: Tony Ambardar <Tony.Ambardar@gmail.com>
Date: Sat, 11 Jul 2020 06:35:46 -0700
Subject: [PATCH 2/2] nftw: support common gnu extension
Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
---
include/ftw.h | 8 ++++++++
src/misc/nftw.c | 35 ++++++++++++++++++++++++++++++-----
2 files changed, 38 insertions(+), 5 deletions(-)
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -21,6 +21,14 @@ extern "C" {
#define FTW_CHDIR 4
#define FTW_DEPTH 8
+#ifdef _GNU_SOURCE
+#define FTW_ACTIONRETVAL 16
+#define FTW_CONTINUE 0
+#define FTW_STOP 1
+#define FTW_SKIP_SUBTREE 2
+#define FTW_SKIP_SIBLINGS 3
+#endif
+
struct FTW {
int base;
int level;
--- a/src/misc/nftw.c
+++ b/src/misc/nftw.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
#include <ftw.h>
#include <dirent.h>
#include <sys/stat.h>
@@ -63,8 +64,20 @@ static int do_nftw(char *path, int (*fn)
lev.base = k;
}
- if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
- return r;
+ if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) {
+ if (flags & FTW_ACTIONRETVAL)
+ switch (r) {
+ case FTW_SKIP_SUBTREE:
+ h = NULL;
+ case FTW_CONTINUE:
+ break;
+ case FTW_SKIP_SIBLINGS:
+ case FTW_STOP:
+ return r;
+ }
+ else
+ return r;
+ }
for (; h; h = h->chain)
if (h->dev == st.st_dev && h->ino == st.st_ino)
@@ -88,7 +101,10 @@ static int do_nftw(char *path, int (*fn)
strcpy(path+j+1, de->d_name);
if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) {
closedir(d);
- return r;
+ if ((flags & FTW_ACTIONRETVAL) && r == FTW_SKIP_SIBLINGS)
+ break;
+ else
+ return r;
}
}
closedir(d);
@@ -98,8 +114,16 @@ static int do_nftw(char *path, int (*fn)
}
path[l] = 0;
- if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
- return r;
+ if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) {
+ if (flags & FTW_ACTIONRETVAL)
+ switch (r) {
+ case FTW_SKIP_SIBLINGS:
+ case FTW_STOP:
+ return r;
+ }
+ else
+ return r;
+ }
return 0;
}
@@ -125,4 +149,5 @@ int nftw(const char *path, int (*fn)(con
return r;
}
+#undef nftw64
weak_alias(nftw, nftw64);
|
