D38028.id115004.diff
No OneTemporary
Actions

Size

738 B

Referenced Files

None

Subscribers

None

D38028.id115004.diff
View Options

	diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c
	--- a/usr.sbin/makefs/zfs/fs.c
	+++ b/usr.sbin/makefs/zfs/fs.c
	@@ -297,15 +297,23 @@
	char *buf, size_t bufsz)
	{
	char path[PATH_MAX];
	- ssize_t n;
	int fd;

	- fs_populate_path(cur, arg, path, sizeof(path), &fd);
	+ if (cur->symlink != NULL) {
	+ size_t n;

	- n = readlinkat(fd, path, buf, bufsz - 1);
	- if (n == -1)
	- err(1, "readlinkat(%s)", cur->name);
	- buf[n] = '\0';
	+ n = strlcpy(buf, cur->symlink, bufsz);
	+ assert(n < bufsz);
	+ } else {
	+ ssize_t n;
	+
	+ fs_populate_path(cur, arg, path, sizeof(path), &fd);
	+
	+ n = readlinkat(fd, path, buf, bufsz - 1);
	+ if (n == -1)
	+ err(1, "readlinkat(%s)", cur->name);
	+ buf[n] = '\0';
	+ }
	}

	static void