d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefs: remove unused cd9660 options

Browse Source 
Makefs defined "follow-symlinks" and "help" options, but they did
nothing.  Remove them.

Obtained from:	OpenBSD a8f1645688c2
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2023-03-31 08:52:22 -04:00
parent 77f0e198d9
commit c753f49f70
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/makefs/cd9660.c
View File

@ -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);

2
usr.sbin/makefs/cd9660.h
View File

@ -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 */