From nobody Wed Apr 5 18:07:30 2023 X-Original-To: dev-commits-src-main@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 4PsCJz0XkDz43wcJ; Wed, 5 Apr 2023 18:07:31 +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 4PsCJz03wCz459X; Wed, 5 Apr 2023 18:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680718051; 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=ZjgEUsWTYJpj5EbPS9BSsOQZZ8y7gXEqedJCwBLQBQg=; b=VTVQMg5Htnra/UeDUKjP8O4IWsy2PF2OYQVvJ1hSRkcVUIFNqOGbDtk0YG3mQdgDu7QXzY zCmLPV/bz/rCwM6kcDMUthj2+oei1at2QZ8Jmol73jYzrtXLvZsuNDo8YxFqwdnZnT4E4k dY+33XVDY3fw1Dnk7X+Lpyb3VVXuRhnzbUenEWCEDfZl8S1Ht5jYRQvdwA7SAqjPQ6X/qw o87D6gtuyPjOSxtJOrbeLlVRhS+SbCIRkIJqvcaf8rxJdVzUpSsytzZZr+5Bwi/L+2SHnX BCdQN7pNUp+W8ASHGJ3Bpx+eDErtM/Vkuo1yEB5MUT3gj66TyFt3K8ZbwJI7Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680718051; 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=ZjgEUsWTYJpj5EbPS9BSsOQZZ8y7gXEqedJCwBLQBQg=; b=lKvowtkjkTB5jlKbP9sokpYecfqgsGEJfMKNLy+/pga6h1X+kEpkS4sZBdX7kANkhaCQOY 8k/UGcLpF1fOGOHXv9LAAk7/XkeA2rm2FkCpheWAJsc1X/rIAQBCVKmxWMHsMFyDQxzfWo ddiiGdupgtu1H35ltUlu0FbSIdemhhRHb1mPTT8USi7GDBfLC079NPyRLR6rUBu0lKCEC8 QLrVpZ1jK2OrZG95oAZg3seRt2D+b/d/4Ya0oFwz074e3ioejPMP11VsLtbYMzwTxndB2q jxw0d8xVpH7wOdhJcfVe1jIHddCDknS7aWTh4hSYqfhevxoPKnROgIaru76FlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680718051; a=rsa-sha256; cv=none; b=TvVAsP8GqqrKPqCJOaMkqMPhACE8wMqz1X3FPdeabZvWz84VEIluhLDaSgY4rPQgj7WS6e ry5eNzYhHFGFLi/IcxB+K5jVVGSrxXu6wHP1o/fyVtcQJo+LZTvc8LlTZX81oRthPeo5ip akGh04Jf9rqDOCthR8qpY3jwgtOVakRamKRnPTa/328Av56oVeVDV0rvPaU79VC+RvTF7D 3c6zk9qv3bArSE+OQEEkGGKYwqw8sYyKVdxqSpgcnxWIC6N+jTqns1ogjPejZtynFc5M9e xw7y8p9oSeLRd3YCi/BG1KRRvmN32phrbHrTxJ8xDYNij6ShtTceiCrGZSFKFw== 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 4PsCJy6DYmzY9V; Wed, 5 Apr 2023 18:07:30 +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 335I7U3P046709; Wed, 5 Apr 2023 18:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335I7UTE046708; Wed, 5 Apr 2023 18:07:30 GMT (envelope-from git) Date: Wed, 5 Apr 2023 18:07:30 GMT Message-Id: <202304051807.335I7UTE046708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2f11df63374d - main - makefs: remove CD9660MAXPATH #define List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2f11df63374d279238e4836125a81fa2c5234730 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2f11df63374d279238e4836125a81fa2c5234730 commit 2f11df63374d279238e4836125a81fa2c5234730 Author: Ed Maste AuthorDate: 2023-03-31 16:57:15 +0000 Commit: Ed Maste CommitDate: 2023-04-05 18:05:49 +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 --- 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)) {