D12232.id32678.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12232.id32678.diff
View Options

	Index: head/cddl/compat/opensolaris/misc/zmount.c
	===================================================================
	--- head/cddl/compat/opensolaris/misc/zmount.c
	+++ head/cddl/compat/opensolaris/misc/zmount.c
	@@ -74,7 +74,7 @@
	char dataptr, int datalen, char optptr, int optlen)
	{
	struct iovec *iov;
	- char optstr, os, *p;
	+ char optstr, os, p, tofree;
	int iovlen, rv;

	assert(spec != NULL);
	@@ -87,7 +87,7 @@
	assert(optptr != NULL);
	assert(optlen > 0);

	- optstr = strdup(optptr);
	+ tofree = optstr = strdup(optptr);
	assert(optstr != NULL);

	iov = NULL;
	@@ -98,11 +98,9 @@
	build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
	(size_t)-1);
	build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
	- for (p = optstr; p != NULL; strsep(&p, ",/ ")) {
	- if (*p != '\0')
	- build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
	- }
	+ while ((p = strsep(&optstr, ",/")) != NULL)
	+ build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
	rv = nmount(iov, iovlen, 0);
	- free(optstr);
	+ free(tofree);
	return (rv);
	}