d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r187093 failed to keep the lifetime of the pointer suitable for reentrancy.

Browse Source 
Fix that.  Also move the current buffer size into the 'cpa' structure.
This commit is contained in:
obrien 2009-01-13 06:08:37 +00:00
parent 044ff6b386
commit 2819cd77d0
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/mount/mount.c
View File

@ -70,6 +70,7 @@ int debug, fstab_style, verbose;
struct cpa { struct cpa {
char **a; char **a;
ssize_t sz;
int c; int c;
}; };
@ -503,11 +504,9 @@ hasopt(const char *mntopts, const char *option)
static void static void
append_arg(struct cpa *sa, char *arg) append_arg(struct cpa *sa, char *arg)
{ {
static int a_sz; if (sa->c + 1 == sa->sz) {
sa->sz = sa->sz == 0 ? 8 : sa->sz * 2;
if (sa->c + 1 == a_sz) { sa->a = realloc(sa->a, sizeof(sa->a) * sa->sz);
a_sz = a_sz == 0 ? 8 : a_sz * 2;
sa->a = realloc(sa->a, sizeof(sa->a) * a_sz);
if (sa->a == NULL) if (sa->a == NULL)
errx(1, "realloc failed"); errx(1, "realloc failed");
} }
@ -518,11 +517,10 @@ int
mountfs(const char *vfstype, const char *spec, const char *name, int flags, mountfs(const char *vfstype, const char *spec, const char *name, int flags,
const char *options, const char *mntopts) const char *options, const char *mntopts)
{ {
struct cpa mnt_argv;
struct statfs sf; struct statfs sf;
int i, ret; int i, ret;
char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX]; char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX];
static int mnt_argv_inited; static struct cpa mnt_argv;
/* resolve the mountpoint with realpath(3) */ /* resolve the mountpoint with realpath(3) */
(void)checkpath(name, mntpath); (void)checkpath(name, mntpath);
@ -557,10 +555,6 @@ mountfs(const char *vfstype, const char *spec, const char *name, int flags,
/* Construct the name of the appropriate mount command */ /* Construct the name of the appropriate mount command */
(void)snprintf(execname, sizeof(execname), "mount_%s", vfstype); (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype);
if (!mnt_argv_inited) {
mnt_argv_inited++;
mnt_argv.a = NULL;
}
mnt_argv.c = -1; mnt_argv.c = -1;
append_arg(&mnt_argv, execname); append_arg(&mnt_argv, execname);
mangle(optbuf, &mnt_argv); mangle(optbuf, &mnt_argv);