RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-02-24 06:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve error handling in mntent stuff...

Browse Source 
not sure if this is correct/ideal. it needs further attention.
This commit is contained in:
Rich Felker 2011-09-27 17:00:38 -04:00
parent f135ef3f34
commit 7e76095180
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/linux/mntent.c
View File

@ -1,6 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <mntent.h>
#include <errno.h>
FILE *setmntent(const char *name, const char *mode)
{
@ -22,7 +23,13 @@ struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int bufle
do {
fgets(linebuf, buflen, f);
if (feof(f)) return NULL;
if (feof(f) || ferror(f)) return 0;
if (!strchr(linebuf, '\n')) {
if (fseeko(f, -(off_t)strlen(linebuf), SEEK_CUR))
fscanf(f, "%*[^\n]%*[\n]");
errno = ERANGE;
return 0;
}
cnt = sscanf(linebuf, " %n%*s%n %n%*s%n %n%*s%n %n%*s%n %d %d",
n, n+1, n+2, n+3, n+4, n+5, n+6, n+7,
&mnt->mnt_freq, &mnt->mnt_passno);
@ -50,7 +57,7 @@ struct mntent *getmntent(FILE *f)
int addmntent(FILE *f, const struct mntent *mnt)
{
fseek(f, 0, SEEK_END);
if (fseek(f, 0, SEEK_END)) return 1;
return fprintf(f, "%s\t%s\t%s\t%s\t%d\t%d\n",
mnt->mnt_fsname, mnt->mnt_dir, mnt->mnt_type, mnt->mnt_opts,
mnt->mnt_freq, mnt->mnt_passno) < 0;