Port: Replace readdir_r by nftw

[babeltrace.git] / tests / lib / common.c

diff --git a/tests/lib/common.c b/tests/lib/common.c
index 08bc1185bebddca93cfefa4c37b4d26aa1f40b74..1878d777d3eba4b78f43523a4dcc8f48fd8719a0 100644 (file)
--- a/tests/lib/common.c
+++ b/tests/lib/common.c
@@ -22,37 +22,29 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <dirent.h>
-#include <babeltrace/compat/limits-internal.h>
-#include <sys/stat.h>
+#include <ftw.h>
 
-void recursive_rmdir(const char *path)
-{
-       struct dirent *entry;
-       DIR *dir = opendir(path);
+#define RMDIR_NFDOPEN 8
 
-       if (!dir) {
-               perror("# opendir");
-               return;
+static
+int nftw_recursive_rmdir(const char *file, const struct stat *sb, int flag,
+               struct FTW *s)
+{
+       switch (flag) {
+       case FTW_F:
+               unlink(file);
+               break;
+       case FTW_DP:
+               rmdir(file);
+               break;
        }
 
-       while ((entry = readdir(dir))) {
-               struct stat st;
-               char filename[PATH_MAX];
-
-               if (snprintf(filename, sizeof(filename), "%s/%s",
-                               path, entry->d_name) <= 0) {
-                       continue;
-               }
-
-               if (stat(filename, &st)) {
-                       continue;
-               }
+       return 0;
+}
 
-               if (S_ISREG(st.st_mode)) {
-                       unlinkat(bt_dirfd(dir), entry->d_name, 0);
-               }
-       }
+void recursive_rmdir(const char *path)
+{
+       int nftw_flags = FTW_PHYS | FTW_DEPTH;
 
-       rmdir(path);
-       closedir(dir);
+       nftw(path, nftw_recursive_rmdir, RMDIR_NFDOPEN, nftw_flags);
 }