projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add struct msgbuf to sys/msg.h
[musl]
/
src
/
passwd
/
getgr_r.c
diff --git
a/src/passwd/getgr_r.c
b/src/passwd/getgr_r.c
index
33e35d3
..
234c901
100644
(file)
--- a/
src/passwd/getgr_r.c
+++ b/
src/passwd/getgr_r.c
@@
-1,4
+1,5
@@
#include "pwf.h"
#include "pwf.h"
+#include <pthread.h>
#define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
#define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
@@
-11,9
+12,15
@@
static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
size_t nmem = 0;
int rv = 0;
size_t i;
size_t nmem = 0;
int rv = 0;
size_t i;
+ int cs;
- f = fopen("/etc/group", "rb");
- if (!f) return errno;
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+ f = fopen("/etc/group", "rbe");
+ if (!f) {
+ rv = errno;
+ goto done;
+ }
*res = 0;
while (__getgrent_a(f, gr, &line, &len, &mem, &nmem)) {
*res = 0;
while (__getgrent_a(f, gr, &line, &len, &mem, &nmem)) {
@@
-39,6
+46,8
@@
static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
free(mem);
free(line);
fclose(f);
free(mem);
free(line);
fclose(f);
+done:
+ pthread_setcancelstate(cs, 0);
return rv;
}
return rv;
}