RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add getmntent_r interface (all of mntent is nonstandard anyway)

This commit is contained in:
Rich Felker 2011-04-05 14:11:14 -04:00
parent e86cc888df
commit 2c4e9e6e4b
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/linux/mntent.c
View File

@ -13,21 +13,19 @@ int endmntent(FILE *f)
return 1; return 1;
} }
struct mntent *getmntent(FILE *f) struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int buflen)
{ {
static char linebuf[256];
static struct mntent mnt;
int cnt, n[8]; int cnt, n[8];
mnt.mnt_freq = 0; mnt->mnt_freq = 0;
mnt.mnt_passno = 0; mnt->mnt_passno = 0;
do { do {
fgets(linebuf, sizeof linebuf, f); fgets(linebuf, buflen, f);
if (feof(f)) return NULL; if (feof(f)) return NULL;
cnt = sscanf(linebuf, " %n%*s%n %n%*s%n %n%*s%n %n%*s%n %d %d", 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, n, n+1, n+2, n+3, n+4, n+5, n+6, n+7,
&mnt.mnt_freq, &mnt.mnt_passno); &mnt->mnt_freq, &mnt->mnt_passno);
} while (cnt >= 8 && linebuf[n[0]] != '#'); } while (cnt >= 8 && linebuf[n[0]] != '#');
linebuf[n[1]] = 0; linebuf[n[1]] = 0;
@ -35,12 +33,19 @@ struct mntent *getmntent(FILE *f)
linebuf[n[5]] = 0; linebuf[n[5]] = 0;
linebuf[n[7]] = 0; linebuf[n[7]] = 0;
mnt.mnt_fsname = linebuf+n[0]; mnt->mnt_fsname = linebuf+n[0];
mnt.mnt_dir = linebuf+n[2]; mnt->mnt_dir = linebuf+n[2];
mnt.mnt_type = linebuf+n[4]; mnt->mnt_type = linebuf+n[4];
mnt.mnt_opts = linebuf+n[6]; mnt->mnt_opts = linebuf+n[6];
return &mnt; return mnt;
}
struct mntent *getmntent(FILE *f)
{
static char linebuf[256];
static struct mntent mnt;
return getmntent_r(f, &mnt, linebuf, sizeof linebuf);
} }
int addmntent(FILE *f, const struct mntent *mnt) int addmntent(FILE *f, const struct mntent *mnt)