From 433dca9ff499d3f87b3f86036d0b8e1de170dde6 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 1 Apr 1999 15:03:57 +0000 Subject: [PATCH] use getarg git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5823 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kpasswd/kpasswdd.c | 20 ++++++++++++++++++-- lib/kadm5/dump_log.c | 23 +++++++++++++++++++---- lib/kadm5/ipropd_master.c | 21 ++++++++++++++++++--- lib/kadm5/ipropd_slave.c | 21 ++++++++++++++++++--- lib/kadm5/replay_log.c | 23 +++++++++++++++++++---- lib/sl/make_cmds.c | 36 ++++++++++++++++++++++++++++++------ 6 files changed, 122 insertions(+), 22 deletions(-) diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c index eab83d33e..89527e21d 100644 --- a/kpasswd/kpasswdd.c +++ b/kpasswd/kpasswdd.c @@ -535,15 +535,31 @@ sigterm(int sig) exit_flag = 1; } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + int main (int argc, char **argv) { krb5_error_code ret; kadm5_config_params conf; - krb5_init_context (&context); + int optind; + + optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); + + if(help_flag) + krb5_std_usage(0, args, num_args); + if(version_flag) { + print_version(NULL); + exit(0); + } - set_progname (argv[0]); krb5_openlog (context, "kpasswdd", &log_facility); krb5_set_warn_dest(context, log_facility); diff --git a/lib/kadm5/dump_log.c b/lib/kadm5/dump_log.c index 534f80adb..693b07055 100644 --- a/lib/kadm5/dump_log.c +++ b/lib/kadm5/dump_log.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. */ -#include "kadm5_locl.h" +#include "iprop.h" RCSID("$Id$"); @@ -67,6 +67,14 @@ print_entry(u_int32_t ver, sp->seek (sp, len, SEEK_CUR); } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + int main(int argc, char **argv) { @@ -76,9 +84,16 @@ main(int argc, char **argv) kadm5_server_context *server_context; kadm5_config_params conf; - set_progname(argv[0]); - - krb5_init_context(&context); + int optind; + + optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); + + if(help_flag) + krb5_std_usage(0, args, num_args); + if(version_flag) { + print_version(NULL); + exit(0); + } memset(&conf, 0, sizeof(conf)); ret = kadm5_init_with_password_ctx (context, diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index ee69aba24..560d1c9e1 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -296,6 +296,14 @@ process_msg (krb5_context context, slave *s, int log_fd, return ret; } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + int main(int argc, char **argv) { @@ -309,9 +317,16 @@ main(int argc, char **argv) slave *slaves = NULL; u_int32_t current_version, old_version = 0; - set_progname(argv[0]); - - krb5_init_context(&context); + int optind; + + optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); + + if(help_flag) + krb5_std_usage(0, args, num_args); + if(version_flag) { + print_version(NULL); + exit(0); + } memset(&conf, 0, sizeof(conf)); ret = kadm5_init_with_password_ctx (context, diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c index ace2aa5bc..196e6bf4b 100644 --- a/lib/kadm5/ipropd_slave.c +++ b/lib/kadm5/ipropd_slave.c @@ -208,6 +208,14 @@ receive (krb5_context context, krb5_err (context, 1, ret, "db->close"); } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + int main(int argc, char **argv) { @@ -221,9 +229,16 @@ main(int argc, char **argv) krb5_ccache ccache; krb5_principal server; - set_progname(argv[0]); - - krb5_init_context(&context); + int optind; + + optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); + + if(help_flag) + krb5_std_usage(0, args, num_args); + if(version_flag) { + print_version(NULL); + exit(0); + } memset(&conf, 0, sizeof(conf)); ret = kadm5_init_with_password_ctx (context, diff --git a/lib/kadm5/replay_log.c b/lib/kadm5/replay_log.c index 0f8899a6d..d56f98ca0 100644 --- a/lib/kadm5/replay_log.c +++ b/lib/kadm5/replay_log.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. */ -#include "kadm5_locl.h" +#include "iprop.h" RCSID("$Id$"); @@ -64,6 +64,14 @@ apply_entry(u_int32_t ver, printf ("done\n"); } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + int main(int argc, char **argv) { @@ -71,9 +79,16 @@ main(int argc, char **argv) void *kadm_handle; kadm5_config_params conf; - set_progname(argv[0]); - - krb5_init_context(&context); + int optind; + + optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); + + if(help_flag) + krb5_std_usage(0, args, num_args); + if(version_flag) { + print_version(NULL); + exit(0); + } memset(&conf, 0, sizeof(conf)); ret = kadm5_init_with_password_ctx (context, diff --git a/lib/sl/make_cmds.c b/lib/sl/make_cmds.c index 3c5aab8bd..178d2f557 100644 --- a/lib/sl/make_cmds.c +++ b/lib/sl/make_cmds.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1998-1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -37,6 +37,7 @@ */ #include "make_cmds.h" +#include RCSID("$Id$"); @@ -197,16 +198,39 @@ generate_commands(void) free(cfn); } +int version_flag; +int help_flag; +struct getargs args[] = { + { "version", 0, arg_flag, &version_flag }, + { "help", 0, arg_flag, &help_flag } +}; +int num_args = sizeof(args) / sizeof(args[0]); + +static void +usage(int code) +{ + arg_printusage(args, num_args, NULL, "command-table"); + exit(code); +} + int main(int argc, char **argv) { - set_progname(argv[0]); + int optind = 0; - if(argc != 2) { - fprintf(stderr, "Usage: %s command_table\n", __progname); - exit(1); + set_progname(argv[0]); + if(getarg(args, num_args, argc, argv, &optind)) + usage(1); + if(help_flag) + usage(0); + if(version_flag) { + print_version(NULL); + exit(0); } - filename = argv[1]; + + if(argc == optind) + usage(1); + filename = argv[optind]; yyin = fopen(filename, "r"); if(yyin == NULL) err(1, "%s", filename);