diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/ftw.h | 17 | ||||
| -rw-r--r-- | io/ftwtest-sh | 97 | ||||
| -rw-r--r-- | io/ftwtest.c | 2 |
3 files changed, 69 insertions, 47 deletions
diff --git a/io/ftw.h b/io/ftw.h index d788b39d16..d377f2c947 100644 --- a/io/ftw.h +++ b/io/ftw.h @@ -86,22 +86,23 @@ struct FTW /* Convenient types for callback functions. */ -typedef int (*__ftw_func_t) __P ((__const char *filename, - __const struct stat *status, int flag)); +typedef int (*__ftw_func_t) __P ((__const char *__filename, + __const struct stat *__status, int __flag)); #ifdef __USE_XOPEN_EXTENDED -typedef int (*__nftw_func_t) __P ((__const char *filename, - __const struct stat *status, int flag, - struct FTW *)); +typedef int (*__nftw_func_t) __P ((__const char *__filename, + __const struct stat *__status, int __flag, + struct FTW *__info)); #endif /* Call a function on every element in a directory tree. */ -extern int ftw __P ((__const char *dir, __ftw_func_t func, int descriptors)); +extern int ftw __P ((__const char *__dir, __ftw_func_t __func, + int __descriptors)); #ifdef __USE_XOPEN_EXTENDED /* Call a function on every element in a directory tree. FLAG allows to specify the behaviour more detailed. */ -extern int nftw __P ((__const char *dir, __nftw_func_t func, - int descriptors, int flag)); +extern int nftw __P ((__const char *__dir, __nftw_func_t __func, + int __descriptors, int __flag)); #endif __END_DECLS diff --git a/io/ftwtest-sh b/io/ftwtest-sh index 79c35d4f9c..f0cd56ab02 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -46,18 +46,18 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 -base = "$tmp/", file = "ftwtest.d", flag = FTW_D -base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_D -base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F -base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_D -base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS -base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN -base = "$tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F +base = "/tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 +base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 +base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 +base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS, level = 2 +base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, level = 5 EOF rm $testout @@ -65,18 +65,18 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --depth $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 -base = "$tmp/", file = "ftwtest.d", flag = FTW_DP -base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_DP -base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F -base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_DP -base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS -base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_DP -base = "$tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN -base = "$tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_DP -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_DP -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F +base = "/tmp/", file = "ftwtest.d", flag = FTW_DP, level = 0 +base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_DP, level = 1 +base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_DP, level = 1 +base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS, level = 2 +base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_DP, level = 2 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_DP, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_DP, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, level = 5 EOF rm $testout @@ -84,24 +84,45 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --phys $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 -base = "$tmp/", file = "ftwtest.d", flag = FTW_D -base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_D -base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F -base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_D -base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS -base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SL -base = "$tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "link@2", flag = FTW_SL -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F -base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "link@3", flag = FTW_SL +base = "/tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 +base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 +base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 +base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_NS, level = 2 +base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SL, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "link@2", flag = FTW_SL, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, level = 5 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "link@3", flag = FTW_SL, level = 5 EOF rm $testout +# For the next test everything must be readable. chmod -R a+x $tmpdir + +LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir $tmpdir | + sort > $testout + +cat <<EOF | cmp $testout - || exit 1 +base = "/tmp/", file = "ftwtest.d", flag = FTW_D, cwd = /tmp, level = 0 +base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, cwd = /tmp/ftwtest.d, level = 1 +base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, cwd = /tmp/ftwtest.d, level = 1 +base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, cwd = /tmp/ftwtest.d, level = 1 +base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, cwd = /tmp/ftwtest.d/bar, level = 2 +base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, cwd = /tmp/ftwtest.d/foo, level = 2 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, cwd = /tmp/ftwtest.d/foo/lvl1, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, cwd = /tmp/ftwtest.d/foo/lvl1, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D, cwd = /tmp/ftwtest.d/foo/lvl1, level = 3 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, cwd = /tmp/ftwtest.d/foo/lvl1/lvl2, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D, cwd = /tmp/ftwtest.d/foo/lvl1/lvl2, level = 4 +base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, cwd = /tmp/ftwtest.d/foo/lvl1/lvl2/lvl3, level = 5 +EOF +rm $testout + rm -fr $tmpdir exit 0 diff --git a/io/ftwtest.c b/io/ftwtest.c index 6daa7e9eee..6079265175 100644 --- a/io/ftwtest.c +++ b/io/ftwtest.c @@ -42,7 +42,7 @@ cb (const char *name, const struct stat *st, int flag, struct FTW *f) printf (", cwd = %s", cwd); free (cwd); } - puts (""); + printf (", level = %d\n", f->level); return 0; } |