From nobody Wed Mar 27 11:26:24 2024 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 4V4PWP0Vq8z5FJ2F; Wed, 27 Mar 2024 11:26:25 +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 4V4PWN5J2nz4cJb; Wed, 27 Mar 2024 11:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711538784; 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=RVmuH1zymsJYfJF4hFueBGq5IpRxMW4Ws0hSx0NwIQM=; b=fL28oFDy8ZZEvAhIR/ONdVOR2+mu2mPU0nmvnZ1yHyOYHkhrB7lyw7d/kKgkMXqjlK1Bkx bBlXFEVfVrJuWmo9O/Iy1dqfE2s9lzDcHNsviYt15z8ecCKv/+3SgMbrqJzVe/0wThDuSV lFB/7RETX4xZ86Ch8QqBcyGNL6ChgxLw+VWZwyqWo1YiKmu6rGmUcmcdY6qCvDeu3q4Wnv 3hEi1PWe4O2x1mBE8ZSkC/hPAt96l9ulxX33s5+ZBbekGWeb+QE2F3glazYyYFA/qIIocK 3KSwhgILjRkSipMvCuYTbmeWVKp2SHBQZC3bkuGrSsZ04RzMbS7ylIUkO40I4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711538784; a=rsa-sha256; cv=none; b=b61f73ecItKrzvAw3Pq6UWo72nASKZBiFbVPUXE9iH8e/vy1gvZ4+gwhMYNUOPQ/sQ4rJt bG5//Q87iAk4sKn9f5V4cKwhDRzrlO+Ig2YfoBKvIz9CtArvZn710CbZhdHbKwx1SF4KiZ S8RJ3dQFgl/C+jRR1ebgh1gbHUIT7zvqzlqxbESNgnUce8WX9t2RJhznP9k3LVhBwiufsK RL2Y2Eu13MtzgYHXIBZHLIO/bospCiNj2DBjiYPtp31AFREDzWQ48JQnBTPxLhnTlbn0bq IHwjZ/0K2J8Zx9J+qCQrH7f/Xz097FKpdUT9K3AUySmYYWuqBSJEA00nlGa3sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711538784; 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=RVmuH1zymsJYfJF4hFueBGq5IpRxMW4Ws0hSx0NwIQM=; b=nlq7Uwga+WZdcT6beeZPeY8d5PhbOj47+9JBctxa1hhwI06b+5smsfmy9s1GBE5nj8Hcki /sVFXQtWlaQ5+3JvLwcP9ssO+4wJ/1BB08zp70ewWuyL/ULuI20OrvwE9MRS5S/5qXzR/F 1IIW849OKVRULe8PX3fxANjweEPcbi0lEEA85xwcgfg112Zhc1AQtT8lnmiONfhPgU6b3x Gz0zC0fleQAMw74z8jHMaKjaYnZp8F0d6CX3D/pHFP08wPI63VjzWW1FYCxFgixCUDr+gL zbx3usenBBDZwdgRu+50HXaRt2y8Y9oFzsBVgNpvpzA8YazCAz7AxpEeRo3lTg== 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 4V4PWN4qr4zhZF; Wed, 27 Mar 2024 11:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42RBQOsu004044; Wed, 27 Mar 2024 11:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42RBQOaA004041; Wed, 27 Mar 2024 11:26:24 GMT (envelope-from git) Date: Wed, 27 Mar 2024 11:26:24 GMT Message-Id: <202403271126.42RBQOaA004041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2cab4be46b0e - main - install: Prefer strsnvis() to strsvis(). 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cab4be46b0eeb64b8ade010bc16245151af5ccd Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2cab4be46b0eeb64b8ade010bc16245151af5ccd commit 2cab4be46b0eeb64b8ade010bc16245151af5ccd Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-27 10:03:59 +0000 install: Prefer strsnvis() to strsvis(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44514 --- usr.bin/xinstall/xinstall.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 1e5adadd8f49..01e5bf0b5174 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1529,15 +1529,18 @@ metadata_log(const char *path, const char *type, struct timespec *ts, static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; const char *p; char *buf; - size_t destlen; + size_t buflen, destlen; struct flock metalog_lock; if (!metafp) return; - /* Buffer for strsvis(3). */ - buf = (char *)malloc(4 * strlen(path) + 1); - if (buf == NULL) { - warnx("%s", strerror(ENOMEM)); + /* Buffer for strsnvis(3), used for both path and slink. */ + buflen = strlen(path); + if (slink && strlen(slink) > buflen) + buflen = strlen(slink); + buflen = 4 * buflen + 1; + if ((buf = malloc(buflen)) == NULL) { + warn(NULL); return; } @@ -1562,7 +1565,7 @@ metadata_log(const char *path, const char *type, struct timespec *ts, } while (*p && *p == '/') p++; - strsvis(buf, p, VIS_OCTAL, extra); + strsnvis(buf, buflen, p, VIS_OCTAL, extra); p = buf; /* Print details. */ fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); @@ -1572,14 +1575,14 @@ metadata_log(const char *path, const char *type, struct timespec *ts, fprintf(metafp, " gname=%s", group); fprintf(metafp, " mode=%#o", mode); if (slink) { - strsvis(buf, slink, VIS_CSTYLE, extra); /* encode link */ + strsnvis(buf, buflen, slink, VIS_CSTYLE, extra); fprintf(metafp, " link=%s", buf); } if (*type == 'f') /* type=file */ fprintf(metafp, " size=%lld", (long long)size); if (ts != NULL && dopreserve) fprintf(metafp, " time=%lld.%09ld", - (long long)ts[1].tv_sec, ts[1].tv_nsec); + (long long)ts[1].tv_sec, ts[1].tv_nsec); if (digestresult && digest) fprintf(metafp, " %s=%s", digest, digestresult); if (fflags)