these changes are a prerequisite to making stdio cancellable.
#define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
#define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
size_t nmem = 0;
int rv = 0;
size_t i;
size_t nmem = 0;
int rv = 0;
size_t i;
+ int cs;
+
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
f = fopen("/etc/group", "rb");
f = fopen("/etc/group", "rb");
+ 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)) {
free(mem);
free(line);
fclose(f);
free(mem);
free(line);
fclose(f);
+done:
+ pthread_setcancelstate(cs, 0);
struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem)
{
ssize_t l;
char *s, *mems;
size_t i;
struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem)
{
ssize_t l;
char *s, *mems;
size_t i;
+ int cs;
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
for (;;) {
if ((l=getline(line, size, f)) < 0) {
free(*line);
*line = 0;
for (;;) {
if ((l=getline(line, size, f)) < 0) {
free(*line);
*line = 0;
mem[0][0] = 0;
}
gr->gr_mem = *mem;
mem[0][0] = 0;
}
gr->gr_mem = *mem;
+end:
+ pthread_setcancelstate(cs, 0);
#define FIX(x) (pw->pw_##x = pw->pw_##x-line+buf)
#define FIX(x) (pw->pw_##x = pw->pw_##x-line+buf)
char *line = 0;
size_t len = 0;
int rv = 0;
char *line = 0;
size_t len = 0;
int rv = 0;
+ int cs;
+
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
f = fopen("/etc/passwd", "rb");
f = fopen("/etc/passwd", "rb");
+ if (!f) {
+ rv = errno;
+ goto done;
+ }
*res = 0;
while (__getpwent_a(f, pw, &line, &len)) {
*res = 0;
while (__getpwent_a(f, pw, &line, &len)) {
+done:
+ pthread_setcancelstate(cs, 0);
struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size)
{
ssize_t l;
char *s;
struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size)
{
ssize_t l;
char *s;
+ int cs;
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
for (;;) {
if ((l=getline(line, size, f)) < 0) {
free(*line);
*line = 0;
for (;;) {
if ((l=getline(line, size, f)) < 0) {
free(*line);
*line = 0;
if (!(s = strchr(s, ':'))) continue;
*s++ = 0; pw->pw_shell = s;
if (!(s = strchr(s, ':'))) continue;
*s++ = 0; pw->pw_shell = s;
+ pthread_setcancelstate(cs, 0);
+ return pw;