RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-18 21:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't set errno or return an error when getspnam[_r] finds no entry

Browse Source 
this case is specified as success with a null result, rather than an
error, and errno is not to be set on success.
This commit is contained in:
Rich Felker 2018-12-28 16:50:07 -05:00
parent 21a172dd36
commit 9db81b862d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/passwd/getspnam.c
View File

@ -8,10 +8,11 @@ struct spwd *getspnam(const char *name)
static char *line;
struct spwd *res;
int e;
int orig_errno = errno;
if (!line) line = malloc(LINE_LIM);
if (!line) return 0;
e = getspnam_r(name, &sp, line, LINE_LIM, &res);
if (e) errno = e;
errno = e ? e : orig_errno;
return res;
}

9
src/passwd/getspnam_r.c
View File

@ -67,6 +67,7 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
size_t k, l = strlen(name);
int skip = 0;
int cs;
int orig_errno = errno;
*res = 0;
@ -94,7 +95,11 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
}
} else {
f = fopen("/etc/shadow", "rbe");
if (!f) return errno;
if (!f) {
if (errno != ENOENT && errno != ENOTDIR)
return errno;
return 0;
}
}
pthread_cleanup_push(cleanup, f);
@ -113,6 +118,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
break;
}
pthread_cleanup_pop(1);
if (rv) errno = rv;
errno = rv ? rv : orig_errno;
return rv;
}