(main): use krb5_program_setup and print_version
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5924 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -100,18 +100,14 @@ main(int argc, char **argv)
|
||||
krb5_enctype etype;
|
||||
krb5_error_code ret;
|
||||
|
||||
set_progname(argv[0]);
|
||||
krb5_init_context(&context);
|
||||
optind = 0;
|
||||
if(getarg(args, num_args, argc, argv, &optind))
|
||||
usage(1);
|
||||
|
||||
optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL);
|
||||
|
||||
if(help)
|
||||
usage(0);
|
||||
|
||||
if(version){
|
||||
fprintf(stderr, "string2key (%s-%s)\n", PACKAGE, VERSION);
|
||||
exit(0);
|
||||
print_version (NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
argc -= optind;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -72,16 +72,14 @@ main (int argc, char **argv)
|
||||
krb5_data result_code_string, result_string;
|
||||
char pwbuf[BUFSIZ];
|
||||
|
||||
set_progname (argv[0]);
|
||||
optind = krb5_program_setup(&context, argc, argv,
|
||||
args, sizeof(args) / sizeof(args[0]), NULL);
|
||||
|
||||
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
|
||||
usage(1);
|
||||
|
||||
if (help_flag)
|
||||
usage (0);
|
||||
|
||||
if(version_flag){
|
||||
printf("%s (%s-%s)\n", __progname, PACKAGE, VERSION);
|
||||
print_version (NULL);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user