From nobody Fri Apr 14 12:52:53 2023 X-Original-To: dev-commits-src-branches@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 4Pybvp0gL5z45Bcf; Fri, 14 Apr 2023 12:52:54 +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 4Pybvn4pFDz3rjw; Fri, 14 Apr 2023 12:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476773; 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=gmIVLFNFTBRF+R2XtvGC4+4Jxd7OQH1y6cdGTYp7a6A=; b=BoKLWjzAAKpKUAMi5CVw1ch5Brw2VesI51AyLFdnsX8HpEJ+I+PvBnS6aF/INS0TIzWTA4 +xCJisqfnRBeN9OszrvA+szlfOhURIBXJo/Dzi5RYIVO2hpf9VqYHDEz1w0r1ZMdUeGO8f 1rrDLn3+pVFrBihZZDNdirUWK0Ll5+cXKpncMPV/1Gml4VxuCHtO90BTkXIAsCj8YT3+oh M1NxEXgt6UegsPfs7j6bbgOorwGQRuMCbg2mTNsx36h3rPbkwQpFS3l9RIkdDA4lGcWW2b 9x/DpRNPe1/OEckdFD3pqC+08697V1QtHUgHFbXobUDe6q3Fjav6JKMvDsIz1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476773; 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=gmIVLFNFTBRF+R2XtvGC4+4Jxd7OQH1y6cdGTYp7a6A=; b=tLsptnb1tLCTH/row37wbK5wHJ5H969jddYuHS7N8/XccRFDxQ61puBhteH7rS14UmRJRh hJidRGAyRHJ1OhGczPBqlVz7PEz2GI7H319iJ8UR2HU9t+NnqeSr0iarpoaTpLXZOnmx8p Aujc+wKmZBenaaKSLPRN4KmrY56zsbFEBmUobOY7t45YMLzUOmtKsFsqIzEN57kJFoCPEt WLunZFIZ7mJCz1u/QjV1Wq6VtPj1NZQVjHCKC6TduwrddzE3UN5QD7AYxvbYhx3AO8a1S4 j7O5booCXOF5T/4lWwD/si2uhc6tBYSxn50B1A22T/ZSQ2Xdx25ZHVaDY21WUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476773; a=rsa-sha256; cv=none; b=CCOJrM8SFCe6E0bRzX4PXrrKeyWELhTsaQuwnGdm6kflnruvdoW/Spda1PioSPwHG/8Tjm nDqS+Bk+KXQ8WHHV8ig7yzIMbIFtMhpXBt6fKbG0JZ7i2fts9a5zKR02nK73VHwfvM2DF/ kIENSeCQAbwW0OeTTuJyUa2mWc3sJlSoVygkUO3exCUYDEHttyr260a+r8Il+Oid4Yx06I D/NdaMfBpa6/uHnxqNoS1oywn+tE45sGlZ15chDAi/I0osa6YWIivUBrGmJoVt90zBbWOb CNdZdd4pVwA6tPeC7mHi85x4CJaHn3HDckZmHJQb1zUW7KYZDGturqLr5mfeqw== 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 4Pybvn3jHpzPw2; Fri, 14 Apr 2023 12:52:53 +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 33ECqrVx074828; Fri, 14 Apr 2023 12:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqr3W074827; Fri, 14 Apr 2023 12:52:53 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:53 GMT Message-Id: <202304141252.33ECqr3W074827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 67870816419a - stable/13 - makefs: remove CD9660MAXPATH #define List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 67870816419a35256d989874a6370a412fe92b7e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67870816419a35256d989874a6370a412fe92b7e commit 67870816419a35256d989874a6370a412fe92b7e Author: Ed Maste AuthorDate: 2023-03-31 16:57:15 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:37 +0000 makefs: remove CD9660MAXPATH #define It was used only in constructing the host path that contains file content, which is not related to anything CD9660-specific. PATH_MAX is the appropriate limit. See OpenBSD commit 299d8950f319. Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation (cherry picked from commit 2f11df63374d279238e4836125a81fa2c5234730) --- usr.sbin/makefs/cd9660.c | 4 ++-- usr.sbin/makefs/cd9660.h | 2 -- usr.sbin/makefs/cd9660/cd9660_write.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 40b2488e99e5..4159e08c8210 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1582,10 +1582,10 @@ cd9660_compute_full_filename(cd9660node *node, char *buf) { int len; - len = CD9660MAXPATH + 1; + len = PATH_MAX; len = snprintf(buf, len, "%s/%s/%s", node->node->root, node->node->path, node->node->name); - if (len > CD9660MAXPATH) + if (len >= PATH_MAX) errx(EXIT_FAILURE, "Pathname too long."); } diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index d854429a24bf..80b49f86ecf8 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -65,8 +65,6 @@ #define INODE_WARNX(__x) #endif /* DEBUG */ -#define CD9660MAXPATH 4096 - #define ISO_STRING_FILTER_NONE = 0x00 #define ISO_STRING_FILTER_DCHARS = 0x01 #define ISO_STRING_FILTER_ACHARS = 0x02 diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index c77ba2b5f198..6716c2f98704 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -273,7 +273,7 @@ cd9660_write_file(iso9660_disk *diskStructure, FILE *fd, cd9660node *writenode) /* Todo : clean up variables */ - temp_file_name = ecalloc(CD9660MAXPATH + 1, 1); + temp_file_name = ecalloc(PATH_MAX, 1); buf = emalloc(diskStructure->sectorSize); if ((writenode->level != 0) && !(writenode->node->type & S_IFDIR)) {