protect ftw and nftw against cancellation

diff --git a/src/misc/nftw.c b/src/misc/nftw.c
index 1b94ac158aa106b7c4d0fb1777c932c0470ad3c3..63d6aff54d665768235a22f4684cf25edd059879 100644 (file)
--- a/src/misc/nftw.c
+++ b/src/misc/nftw.c
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <limits.h>
+#include <pthread.h>
 #include "libc.h"
 
 struct history
@@ -103,6 +104,7 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
 
 int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, struct FTW *), int fd_limit, int flags)
 {
+       int r, cs;
        size_t l;
        char pathbuf[PATH_MAX+1];
 
@@ -115,7 +117,10 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
        }
        memcpy(pathbuf, path, l+1);
        
-       return do_nftw(pathbuf, fn, fd_limit, flags, NULL);
+       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+       r = do_nftw(pathbuf, fn, fd_limit, flags, NULL);
+       pthread_setcancelstate(cs, 0);
+       return r;
 }
 
 LFS64(nftw);