From nobody Thu Jan 12 18:20:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NtCWy2XYrz2pKFL; Thu, 12 Jan 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NtCWy1k0Zz4CxG; Thu, 12 Jan 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673547614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ/xaGi4KoU3M47MrOl56tofHRpzoHsQrESRkEoZdXo=; b=BHfVCbFbVvsT6ita6KF4cKhvZgHtzQWccJ3pRlp3OHZ0m4B7atWu2mntdhqrN6/YmX1vSo apcMJvotYVSvBjG5Yd2Es45ADFKqtRRgUkJJ4e4fO/r9YVbqIKKIR5NouqZWJd1KLy+EhL r2VQpPmmK5+NWiqjaIHFZWFEtKseeTwi65J8M4bShK17uDpBG+rTKSUb1rJ/VF4AGC46VY GcQWpQ67dpidy3vKY5+7s+2f6Ap5KFgDAv2eQS6rSLz1WzGGi7I0O55FQ+W7++tlQK87Ch L7XFOhDMU+AZxUlpWwA5VaCHE7Udyty/rChNkIzhAE2F5dzgMBa/uEfV5r0CjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673547614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ/xaGi4KoU3M47MrOl56tofHRpzoHsQrESRkEoZdXo=; b=ljFpOPTE7MRXdBtyoAYUr+PFlVF3L6BEZ8YFr68gcUCX/YgEMisFCEPblPkMNZNIQhrnnw Z0A8uY6mBPU9HChuQ1W9Si3f2UuzDTxB2UpVJQ5Rs58HjueFj7uhF8fa1znH49aGJN4i++ jb9I12dl4RDwVu46qsSilbVxKvdXvrI3XesQi8CrqCaR9vDzchnLGdh54GsfozuMDRxx/D zt7fjJaqZ7gs3cIxI4/q9/UT+vb9xVuzZ09Y9VAZ7ovwEG0jQpk4Oj89vuaaK7XYH6EZwj bjM1vV+RcrrxZ0avXOKcUWA1TIz6u/H06MLIXH1GJt2s1AsnWLDE8VxzjAs5uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673547614; a=rsa-sha256; cv=none; b=WqH+OeXsky3NSVADi0YaByPqjVfiUCuweuh+gqn1QCLoXgr0Hh/RPwB0AnY6vbQXQDi5S3 vqfmba2MqJWC5IfL4EZDkchFdoC/EIT5QP0jh+wkrovtqIhbSlutuYarLdgcQru9Bcv9wO eKsvxqXU4H2q8Hkxn8RIayuPICZosMnpYCYcKhqT5v+4IyBRTmtqPbmJeIT0VrjLq2gdyd YixCNcTbVuuNsB5YcXYwl2H0BPeZyiqqeDDo7wpg0BtLfGnhb9LeKiAvfI1TYHAKC1hT+C QWt5hgIyYaO7BoZMbR+sO+ffEhV1xCwwJ7n856zhAmtmf5Xto8ec/Lh3gRQYQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NtCWy0jr2zdK0; Thu, 12 Jan 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30CIKELu013990; Thu, 12 Jan 2023 18:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CIKEYM013984; Thu, 12 Jan 2023 18:20:14 GMT (envelope-from git) Date: Thu, 12 Jan 2023 18:20:14 GMT Message-Id: <202301121820.30CIKEYM013984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b78d5b424145 - main - makefs: handle mtree link= for ZFS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b78d5b42414518dd85b2ebf2f15ba8a742ead399 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b78d5b42414518dd85b2ebf2f15ba8a742ead399 commit b78d5b42414518dd85b2ebf2f15ba8a742ead399 Author: Brooks Davis AuthorDate: 2023-01-12 18:18:45 +0000 Commit: Brooks Davis CommitDate: 2023-01-12 18:18:45 +0000 makefs: handle mtree link= for ZFS When a link target is specified use it rather than attempting to read a potentially non-existant file. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38028 --- usr.sbin/makefs/zfs/fs.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index b9cc860c2e29..3cf328122df8 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -297,15 +297,23 @@ fs_readlink(const fsnode *cur, struct fs_populate_arg *arg, 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