#include "pwf.h"
+#include <pthread.h>
#define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
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)) {
if (name && !strcmp(name, gr->gr_name)
|| !name && gr->gr_gid == gid) {
- if (size < len + nmem*sizeof(char *) + 32) {
+ if (size < len + (nmem+1)*sizeof(char *) + 32) {
rv = ERANGE;
break;
}
*res = gr;
buf += (16-(uintptr_t)buf)%16;
gr->gr_mem = (void *)buf;
- buf += nmem*sizeof(char *);
+ buf += (nmem+1)*sizeof(char *);
memcpy(buf, line, len);
FIX(name);
FIX(passwd);
free(mem);
free(line);
fclose(f);
+done:
+ pthread_setcancelstate(cs, 0);
return rv;
}
return getgr_r(name, 0, gr, buf, size, res);
}
-int getgruid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
+int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
{
return getgr_r(0, gid, gr, buf, size, res);
}