projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
math: fix two fma issues (only affects non-nearest rounding mode, x86)
[musl]
/
src
/
misc
/
nftw.c
diff --git
a/src/misc/nftw.c
b/src/misc/nftw.c
index
1b94ac1
..
63d6aff
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 <unistd.h>
#include <string.h>
#include <limits.h>
+#include <pthread.h>
#include "libc.h"
struct history
#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 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];
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);
}
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);