diff options
author | mckusick <mckusick@FreeBSD.org> | 2009-02-13 19:56:59 +0000 |
---|---|---|
committer | mckusick <mckusick@FreeBSD.org> | 2009-02-13 19:56:59 +0000 |
commit | 987cbdc1c9562a835426a263ddcb2c330666f50c (patch) | |
tree | 604aa840a032757c89d2272ab58491491c47038c /lib/libutil | |
parent | 71ad94ecbb545e5a6d3544f912ab8ab0f21253b8 (diff) | |
download | FreeBSD-src-987cbdc1c9562a835426a263ddcb2c330666f50c.zip FreeBSD-src-987cbdc1c9562a835426a263ddcb2c330666f50c.tar.gz |
Make hasquota thread safe.
Diffstat (limited to 'lib/libutil')
-rw-r--r-- | lib/libutil/libutil.h | 2 | ||||
-rw-r--r-- | lib/libutil/quotafile.c | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h index 7796de0..b9aec78 100644 --- a/lib/libutil/libutil.h +++ b/lib/libutil/libutil.h @@ -148,7 +148,7 @@ struct quotafile *quota_create(const char *); void quota_close(struct quotafile *); int quota_read(struct quotafile *, struct dqblk *, int); int quota_write(struct quotafile *, const struct dqblk *, int); -int hasquota(struct fstab *, int, char **); +int hasquota(struct fstab *, int, char *, int); #endif __END_DECLS diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c index 2520e9f..2b43b65 100644 --- a/lib/libutil/quotafile.c +++ b/lib/libutil/quotafile.c @@ -280,13 +280,13 @@ quota_write(struct quotafile *qf, const struct dqblk *dqb, int id) * Check to see if a particular quota is to be enabled. */ int -hasquota(struct fstab *fs, int type, char **qfnamep) +hasquota(struct fstab *fs, int type, char *qfnamep, int qfbufsize) { char *opt; char *cp; struct statfs sfb; + char buf[BUFSIZ]; static char initname, usrname[100], grpname[100]; - static char buf[BUFSIZ]; if (!initname) { (void)snprintf(usrname, sizeof(usrname), "%s%s", @@ -306,13 +306,6 @@ hasquota(struct fstab *fs, int type, char **qfnamep) } if (!opt) return (0); - if (cp) - *qfnamep = cp; - else { - (void)snprintf(buf, sizeof(buf), "%s/%s.%s", fs->fs_file, - QUOTAFILENAME, qfextension[type]); - *qfnamep = buf; - } /* * Ensure that the filesystem is mounted. */ @@ -320,5 +313,11 @@ hasquota(struct fstab *fs, int type, char **qfnamep) strcmp(fs->fs_file, sfb.f_mntonname)) { return (0); } + if (cp) { + strncpy(qfnamep, cp, qfbufsize); + } else { + (void)snprintf(qfnamep, qfbufsize, "%s/%s.%s", fs->fs_file, + QUOTAFILENAME, qfextension[type]); + } return (1); } |