diff options
| author |   natano <natano@openbsd.org> | 2016-10-17 08:22:38 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-10-17 08:22:38 +0000 |
| commit | a8f1645688c2f8081e7f606ca5656bdccb13aa7b (patch) | |
| tree | 470622404c0539c690f8ef19b24647115ef8de18 /usr.sbin/makefs | |
| parent | Remove cd9660's archimedes option, we won't need RISC OS metadata on our (diff) | |
| download | wireguard-openbsd-a8f1645688c2f8081e7f606ca5656bdccb13aa7b.tar.xz wireguard-openbsd-a8f1645688c2f8081e7f606ca5656bdccb13aa7b.zip | |
Remove some more unused cd9660 options.
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/cd9660.c | 15 | ||||
| -rw-r--r-- | usr.sbin/makefs/cd9660.h | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index a85e801fceb..28d3e4d053f 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660.c,v 1.6 2016/10/17 08:13:24 natano Exp $ */ +/* $OpenBSD: cd9660.c,v 1.7 2016/10/17 08:22:38 natano Exp $ */ /* $NetBSD: cd9660.c,v 1.52 2015/12/24 15:52:37 christos Exp $ */ /* @@ -195,7 +195,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, @@ -488,14 +483,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 1eb58a90c48..6315432a1f7 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660.h,v 1.3 2016/10/17 08:13:24 natano Exp $ */ +/* $OpenBSD: cd9660.h,v 1.4 2016/10/17 08:22:38 natano Exp $ */ /* $NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $ */ /* @@ -259,9 +259,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 */ |