From nobody Fri Apr 21 21:20:21 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 4Q36r55P2Qz46vPf; Fri, 21 Apr 2023 21:20:21 +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 4Q36r54W6dz3JVW; Fri, 21 Apr 2023 21:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112021; 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=3sN3Ih9lIjLbAtTrJixjOTuPvJKj/sEyYTROxOWJkK8=; b=obLHJYx8LLNssuDEXypWC35KMm9i+hO/c9g2X+m8ANHxBtANy8uzEGbD+s44cPboFIgBCl aPIyEv/KEX7k7EyYakLXdstfzIcQYVguuM8Hq3FUtih8pOwwCVI+umMjGWE2xVweDkzcNm pMFgCv7ifluPWBFHsKmAEGx4C3hjLIYK2AcsmC6b2cLK5ge0W8CX548hbebUXw6L2LYlwM srGLiLhaRaXNa3f4Xv4LOkCTd+w4hyAoB/DusGZpamKzpL00XU+v5EMc4d+XNSnkJibBOm 0PuZ1EKPRL+hh6J9AS5DSROOb9OSA1ShHYDzYFTEVQVXMciRXUvQQibpdWDvDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112021; 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=3sN3Ih9lIjLbAtTrJixjOTuPvJKj/sEyYTROxOWJkK8=; b=alv7I9/E8X0U1lWe81iUVyqlsixKmFkIVHqMG147K2oPSZYNAsm61mAXVJp99/B5CMyqXz 18l/Tg3bGLJm0Lv/3zWS7sZD1jM5xULmq+Lfzbmor00u9amYeuw3/13tkTdJ2EK1P+6/sQ yF8KsPzMlAhNUnbXi4mSh7A0dGmfEZLq0bHyMyRN1g4fieoDOr6ZcPyPLqc+8VcMeiAQ0v wIesaYSgxFCH94tD0fOBhrBq4ZO6GLyDEA12cWBnz7jnEpbu9tXRA8GVeCuNei48bQz2Z4 Yl5YciPX6Shk3z1Wbd8KFdSvfHJPRkHpNaw+mfs3eAXciuuZq5kZm3voO+kt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682112021; a=rsa-sha256; cv=none; b=ZYxWOvkvr20bWP24RwttDpOv+wnezhXCvzNuGTide/PCAITmmkZLWoIVeW7MBvRX7vv7co KuEQCj1z4IV/VXCQUEiSyuMNbgbfKkqUvXO6pPEw5fHJnAi2rhUFSTYQH3sDbsvYMa1LUM vcT3p8PE1xwfLwBALDVUxZYnUfib2CsJn+mvVEW1+aS9/cOurbbMIggMTFPH5fBP2RaC2N D820nIsRmv/PY7nWbnPvF3QB3GSkuKIuQSZyCQidhkeztEVFvc+gk5r7PNGuISnHcgUKUi NVksR4CNTb2o1gNk0VOONQYdPNJkD5wkWgZStQiLhrSLzNTsSGCyhXMsutyLUA== 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 4Q36r53Wt5zbkx; Fri, 21 Apr 2023 21:20:21 +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 33LLKLFu020907; Fri, 21 Apr 2023 21:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LLKLQp020906; Fri, 21 Apr 2023 21:20:21 GMT (envelope-from git) Date: Fri, 21 Apr 2023 21:20:21 GMT Message-Id: <202304212120.33LLKLQp020906@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: 5fbe15bc2187 - stable/13 - makefs: remove unused cd9660 options 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: 5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 commit 5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 Author: Ed Maste AuthorDate: 2023-03-31 12:52:22 +0000 Commit: Ed Maste CommitDate: 2023-04-21 21:18:24 +0000 makefs: remove unused cd9660 options Makefs defined "follow-symlinks" and "help" options, but they did nothing. Remove them. Obtained from: OpenBSD a8f1645688c2 Sponsored by: The FreeBSD Foundation (cherry picked from commit c753f49f7006d28786c29dfbb5f838b494e2146f) --- usr.sbin/makefs/cd9660.c | 13 ------------- usr.sbin/makefs/cd9660.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 661eefc832da..4d82a8dc93a1 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -196,7 +196,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure) /* Set up defaults in our own structure */ diskStructure->verbose_level = 0; diskStructure->keep_bad_images = 0; - diskStructure->follow_sym_links = 0; diskStructure->isoLevel = 2; diskStructure->rock_ridge_enabled = 0; @@ -266,10 +265,6 @@ cd9660_prep_opts(fsinfo_t *fsopts) OPT_NUM('v', "verbose", verbose_level, 0, 2, "Turns on verbose output"), - OPT_BOOL('h', "help", displayHelp, - "Show help message"), - OPT_BOOL('S', "follow-symlinks", follow_sym_links, - "Resolve symlinks in pathnames"), OPT_BOOL('R', "rockridge", rock_ridge_enabled, "Enable Rock-Ridge extensions"), OPT_BOOL('C', "chrp-boot", chrp_boot, @@ -491,14 +486,6 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, assert(dir != NULL); assert(root != NULL); - if (diskStructure->displayHelp) { - /* - * Display help here - probably want to put it in - * a separate function - */ - return; - } - if (diskStructure->verbose_level > 0) printf("%s: image %s directory %s root %p\n", __func__, image, dir, root); diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index fae2d2077c00..f271e0425517 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -238,9 +238,7 @@ typedef struct _iso9660_disk { int include_padding_areas; - int follow_sym_links; int verbose_level; - int displayHelp; int keep_bad_images; /* SUSP options and variables */