RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-09 13:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

protect ftw and nftw against cancellation

Browse Source
This commit is contained in:
Rich Felker 2011-04-18 21:17:03 -04:00
parent d2c604d5a4
commit df9e11bb06
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/misc/nftw.c
View File

@ -7,6 +7,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <pthread.h>
#include "libc.h" #include "libc.h"
struct history 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 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; size_t l;
char pathbuf[PATH_MAX+1]; 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); 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); LFS64(nftw);