mirror of git://git.musl-libc.org/musl
fix shm_open wrongly being cancellable
This commit is contained in:
parent
1d92cddb1e
commit
ce8a995782
|
@ -4,6 +4,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
char *__strchrnul(const char *, int);
|
char *__strchrnul(const char *, int);
|
||||||
|
|
||||||
|
@ -27,9 +28,13 @@ char *__shm_mapname(const char *name, char *buf)
|
||||||
|
|
||||||
int shm_open(const char *name, int flag, mode_t mode)
|
int shm_open(const char *name, int flag, mode_t mode)
|
||||||
{
|
{
|
||||||
|
int cs;
|
||||||
char buf[NAME_MAX+10];
|
char buf[NAME_MAX+10];
|
||||||
if (!(name = __shm_mapname(name, buf))) return -1;
|
if (!(name = __shm_mapname(name, buf))) return -1;
|
||||||
return open(name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode);
|
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
|
||||||
|
int fd = open(name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode);
|
||||||
|
pthread_setcancelstate(cs, 0);
|
||||||
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
int shm_unlink(const char *name)
|
int shm_unlink(const char *name)
|
||||||
|
|
Loading…
Reference in New Issue