summaryrefslogtreecommitdiff
path: root/libc/misc/mntent
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-01-06 08:51:00 +0000
committerEric Andersen <andersen@codepoet.org>2002-01-06 08:51:00 +0000
commite077f341ca5758360b4c050c493a1d81b06c72a0 (patch)
tree799972c6664367540864241cf6df377e706e1d1c /libc/misc/mntent
parent35a3f28ef419657978e9a62adb01a9a82c654158 (diff)
Support statvfs and statfs. Added getmntent_r (and made it use
strtok_r instead of strtok), taught getmntent to use getmntent_r. -Erik
Diffstat (limited to 'libc/misc/mntent')
-rw-r--r--libc/misc/mntent/mntent.c54
1 files changed, 35 insertions, 19 deletions
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index 9e8fda613..ea5cf23d8 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -4,15 +4,18 @@
#include <mntent.h>
-
-struct mntent *getmntent(FILE * filep)
+/* Reentrant version of the above function. */
+struct mntent *getmntent_r (FILE *filep,
+ struct mntent *mnt, char *buff, int bufsize)
{
char *cp, *sep = " \t\n";
- static char buff[BUFSIZ];
- static struct mntent mnt;
+ static char *ptrptr = 0;
+
+ if (!filep || !mnt || !buff)
+ return NULL;
/* Loop on the file, skipping comment lines. - FvK 03/07/93 */
- while ((cp = fgets(buff, sizeof buff, filep)) != NULL) {
+ while ((cp = fgets(buff, bufsize, filep)) != NULL) {
if (buff[0] == '#' || buff[0] == '\n')
continue;
break;
@@ -24,29 +27,42 @@ struct mntent *getmntent(FILE * filep)
if (cp == NULL)
return NULL;
- mnt.mnt_fsname = strtok(buff, sep);
- if (mnt.mnt_fsname == NULL)
+ ptrptr = 0;
+ mnt->mnt_fsname = strtok_r(buff, sep, &ptrptr);
+ if (mnt->mnt_fsname == NULL)
return NULL;
- mnt.mnt_dir = strtok(NULL, sep);
- if (mnt.mnt_dir == NULL)
+ ptrptr = 0;
+ mnt->mnt_dir = strtok_r(NULL, sep, &ptrptr);
+ if (mnt->mnt_dir == NULL)
return NULL;
- mnt.mnt_type = strtok(NULL, sep);
- if (mnt.mnt_type == NULL)
+ ptrptr = 0;
+ mnt->mnt_type = strtok_r(NULL, sep, &ptrptr);
+ if (mnt->mnt_type == NULL)
return NULL;
- mnt.mnt_opts = strtok(NULL, sep);
- if (mnt.mnt_opts == NULL)
- mnt.mnt_opts = "";
+ ptrptr = 0;
+ mnt->mnt_opts = strtok_r(NULL, sep, &ptrptr);
+ if (mnt->mnt_opts == NULL)
+ mnt->mnt_opts = "";
- cp = strtok(NULL, sep);
- mnt.mnt_freq = (cp != NULL) ? atoi(cp) : 0;
+ ptrptr = 0;
+ cp = strtok_r(NULL, sep, &ptrptr);
+ mnt->mnt_freq = (cp != NULL) ? atoi(cp) : 0;
- cp = strtok(NULL, sep);
- mnt.mnt_passno = (cp != NULL) ? atoi(cp) : 0;
+ ptrptr = 0;
+ cp = strtok_r(NULL, sep, &ptrptr);
+ mnt->mnt_passno = (cp != NULL) ? atoi(cp) : 0;
- return &mnt;
+ return mnt;
+}
+
+struct mntent *getmntent(FILE * filep)
+{
+ static char buff[BUFSIZ];
+ static struct mntent mnt;
+ return(getmntent_r(filep, &mnt, buff, sizeof buff));
}
int addmntent(FILE * filep, const struct mntent *mnt)