The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c753f49f7006d28786c29dfbb5f838b494e2146f
commit c753f49f7006d28786c29dfbb5f838b494e2146f Author: Ed Maste <[email protected]> AuthorDate: 2023-03-31 12:52:22 +0000 Commit: Ed Maste <[email protected]> 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 */
