From 6edcdc9737d38189efeec4e9f1ea67c6ba6c9b47 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 21 Jun 1996 06:05:13 +0000 Subject: (parse_opt): Handle runtime invalid selection of 4.2 mode. Save select mode until we're done to correctly deal with external errors at runtime. (startup_parents, startup_argp, runtime_parents, runtime_argp): New variables. (main): Argp vars made global. (startup_parents): diskfs_device_startup_argp --> &diskfs_std_device_startup_argp. --- ufs/main.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/ufs/main.c b/ufs/main.c index 58c6f427..ac3a34bb 100644 --- a/ufs/main.c +++ b/ufs/main.c @@ -73,32 +73,69 @@ parse_opt (int key, char *arg, struct argp_state *state) { switch (key) { + enum compat_mode mode; + case 'C': if (strcasecmp (arg, "gnu") == 0) - compat_mode = COMPAT_GNU; + mode = COMPAT_GNU; else if (strcmp (arg, "4.4") == 0) - compat_mode = COMPAT_BSD44; + mode = COMPAT_BSD44; else if (strcmp (arg, "4.2") == 0) - compat_mode = COMPAT_BSD42; + { + if (sblock + && (sblock->fs_inodefmt == FS_44INODEFMT + || direct_symlink_extension)) + { + argp_failure (state, 0, 0, + "4.2 compat mode requested on 4.4 fs"); + return EINVAL; + } + mode = COMPAT_BSD42; + } else - argp_error (state, "%s: Unknown compatibility mode", arg); + { + argp_error (state, "%s: Unknown compatibility mode", arg); + return EINVAL; + } + + state->hook = (void *)mode; /* Save it for the end. */ break; + + case ARGP_KEY_INIT: + state->hook = (void *)compat_mode; break; + case ARGP_KEY_SUCCESS: + compat_mode = (enum compat_mode)state->hook; break; + default: return ARGP_ERR_UNKNOWN; } return 0; } +static const struct argp *startup_parents[] = { + &diskfs_std_device_startup_argp, 0 +}; +static const struct argp startup_argp = { + options, parse_opt, 0, 0, startup_parents +}; + +static const struct argp *runtime_parents[] = { + &diskfs_std_runtime_argp, 0 +}; +static const struct argp runtime_argp = { + options, parse_opt, 0, 0, runtime_parents +}; + +struct argp *diskfs_runtime_argp = (struct argp *)&runtime_argp; + int main (int argc, char **argv) { error_t err; off_t disk_size; mach_port_t bootstrap; - const struct argp *argp_parents[] = { diskfs_device_startup_argp, 0 }; - struct argp argp = {options, parse_opt, 0, 0, argp_parents}; - argp_parse (&argp, argc, argv, 0, 0, 0); + argp_parse (&startup_argp, argc, argv, 0, 0, 0); /* This must come after the args have been parsed, as this is where the host priv ports are set for booting. */ -- cgit v1.2.3