From nobody Sun Apr 16 13:38:17 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 4PzrqG04vDz45MnW; Sun, 16 Apr 2023 13:38:18 +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 4PzrqF6b8dz3NCh; Sun, 16 Apr 2023 13:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681652297; 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=Sb1qfo8d+Mey/XlWejyoe6gAofUPAU914/5cZxOE3E0=; b=RWuIXjHEAChCBJjnHAK1QLKR43fthjhZUvzYKPguYQI4gwOd/iGNRTy535KxT8LbhJGRx4 a3mEnIu73TwA6WLjPgdS7MfV0d/z5HZGwMIu9VaTudTukWt6N/899HiIrKVBOr8XKO82Bk Qv0Gx43fIsdX98uP1JCUjVcdxdI5PLDN1+ao1NOdPWTMdBUXFNjciJxdDkUODj4QeARMWp EGbsB8vHM0y9lYtnXNwOEF02cxaXYXIPO7AvDS9FzYACFfVV8XkaJN1s8FUHXpznlEQLss CMxtyIqfCRsZ+0YGRt5o+zyBFD9DpeE895fI9vmc5EY/qZlXNepRe9+2BFm8Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681652297; 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=Sb1qfo8d+Mey/XlWejyoe6gAofUPAU914/5cZxOE3E0=; b=TuGvqr3XbzMoaNLM0IPAsw1FCPGQ9hX6rHH3hi/bapfLhAx4yhrjdADX9j8YA1WGZRanib nsxzZ74/sJ5vNdQORwiunZH35FKeX5XoS7F1mjgqt3y3lSMHacxUfFzvCWWpTOr4oHXT/V qpJb/L6iBHBKc7Lqk6EN2XobAVynsAAtFm1s0xLxvNfmUF16riJyPQghPocDrPHYTIHCMV QdR9L5zaf8lX5v1cscU+aithdWut/afP29j8GAMaUlodfjk8/QFM5bYfFGOqNLnJWIrgZn /M3YDw+Cdky5VYwAUbrMyEzY78aQ8k04XbtGybhmhfhGyMpzHBLbw8Rx5rgcyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681652297; a=rsa-sha256; cv=none; b=tMRUC7aKmdQIpEqySjSYqpTnSUWnZK+tB+qiL6KWDJ4fDOSLupmPeRIgD6Bvi44taW92i9 LwRsFNGjglTr6OXq0TPzZuDGpk6ZNBarLQf/MtIYP7sT8JtsR77T2jxoQy5HamabYZ5Ymv Dj3pDT9dAXq8O45q6tEwykcwb++UKYPhS4FZnYatwyhfgbcMjed4AH4l275O8vwQtC8a9u 30dtAL1GdtbZ5dGemnLLFdi0VmHK9N9RiCE1dKlCCq9fMcbqPGwlx49TmwwVYN1nkxjKGj PPz9Z923kKltU+cRRMGHsUZkurqSQDQmQVLwYIIGp81237R0KHZ9lQWgMdb82w== 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 4PzrqF5TY4zpw6; Sun, 16 Apr 2023 13:38:17 +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 33GDcH7B086312; Sun, 16 Apr 2023 13:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GDcHgP086311; Sun, 16 Apr 2023 13:38:17 GMT (envelope-from git) Date: Sun, 16 Apr 2023 13:38:17 GMT Message-Id: <202304161338.33GDcHgP086311@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: c753f49f7006 - main - makefs: remove unused cd9660 options 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c753f49f7006d28786c29dfbb5f838b494e2146f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c753f49f7006d28786c29dfbb5f838b494e2146f commit c753f49f7006d28786c29dfbb5f838b494e2146f Author: Ed Maste AuthorDate: 2023-03-31 12:52:22 +0000 Commit: Ed Maste CommitDate: 2023-04-16 13:38:02 +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 --- 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 */