new arg_printusage

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5130 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-08-18 21:17:01 +00:00
parent 2d1323df4b
commit fc1956b05f
21 changed files with 36 additions and 31 deletions

View File

@@ -101,11 +101,11 @@ kt_remove(int argc, char **argv)
args[i++].value = &keytype_string;
args[i++].value = &help_flag;
if(getarg(args, num_args, argc, argv, &optind)) {
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil remove", "");
return 0;
}
if(help_flag) {
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil remove", "");
return 0;
}
if(principal_string) {
@@ -172,11 +172,11 @@ kt_add(int argc, char **argv)
args[i++].value = &help_flag;
if(getarg(args, num_args, argc, argv, &optind)) {
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil add", "");
return 0;
}
if(help_flag) {
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil add", "");
return 0;
}
if(principal_string == NULL) {
@@ -292,7 +292,7 @@ help(int argc, char **argv)
static void
usage(int status)
{
arg_printusage(args, num_args, "command");
arg_printusage(args, num_args, NULL, "command");
exit(status);
}

View File

@@ -67,11 +67,11 @@ srvconv(int argc, char **argv)
krb5_storage *sp;
if(getarg(args, num_args, argc, argv, &optind)){
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil srvconvert", "");
return 1;
}
if(help_flag){
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil srvconvert", "");
return 0;
}
@@ -79,7 +79,7 @@ srvconv(int argc, char **argv)
argv += optind;
if (argc != 0) {
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, "ktutil srvconvert", "");
return 1;
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -137,7 +137,7 @@ createuser (char *cell)
static void
usage(int ecode)
{
arg_printusage(args, num_args, "[cell]... [path]...");
arg_printusage(args, num_args, NULL, "[cell]... [path]...");
exit(ecode);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -272,7 +272,7 @@ check_password(struct passwd *pwd, const char *password)
void
usage(int status)
{
arg_printusage(args, nargs, "[username]");
arg_printusage(args, nargs, NULL, "[username]");
exit(status);
}

View File

@@ -599,6 +599,7 @@ usage (int ret)
{
arg_printusage (args,
sizeof(args) / sizeof(args[0]),
NULL,
"host command");
exit (ret);
}

View File

@@ -617,6 +617,7 @@ usage (int ret)
{
arg_printusage (args,
sizeof(args) / sizeof(args[0]),
NULL,
"host command");
exit (ret);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -57,14 +57,14 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
server_usage(int code, struct getargs *args, int num_args)
{
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, NULL, "");
exit(code);
}
static void
client_usage(int code, struct getargs *args, int num_args)
{
arg_printusage(args, num_args, "host");
arg_printusage(args, num_args, NULL, "host");
exit(code);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -50,7 +50,7 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(void)
{
arg_printusage (args, num_args, "principal");
arg_printusage (args, num_args, "ank", "principal");
}

View File

@@ -55,7 +55,7 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(void)
{
arg_printusage(args, num_args, "principal...");
arg_printusage(args, num_args, "cpw", "principal...");
}
static int

View File

@@ -53,7 +53,7 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(void)
{
arg_printusage(args, num_args, "principal...");
arg_printusage(args, num_args, "ext", "principal...");
}
static int

View File

@@ -166,7 +166,7 @@ exit_kadmin (int argc, char **argv)
static void
usage(int ret)
{
arg_printusage (args, num_args, "");
arg_printusage (args, num_args, NULL, "");
exit (ret);
}

View File

@@ -81,7 +81,7 @@ krb5_context context;
static void
usage(int ret)
{
arg_printusage (args, num_args, "");
arg_printusage (args, num_args, NULL, "");
exit (ret);
}

View File

@@ -113,7 +113,7 @@ struct units byte_units[] = {
static void
usage(int ret)
{
arg_printusage (args, num_args, "");
arg_printusage (args, num_args, NULL, "");
exit (ret);
}

View File

@@ -368,7 +368,7 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(int ret)
{
arg_printusage (args, num_args, "host ...");
arg_printusage (args, num_args, NULL, "host ...");
exit (ret);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -100,7 +100,7 @@ static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(int ret)
{
arg_printusage (args, num_args, "");
arg_printusage (args, num_args, NULL, "");
exit (ret);
}

View File

@@ -68,7 +68,7 @@ int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(int status)
{
arg_printusage (args, num_args, "password");
arg_printusage (args, num_args, NULL, "password");
exit(status);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -54,6 +54,7 @@ usage (int ret)
{
arg_printusage (args,
sizeof(args)/sizeof(*args),
NULL,
"[principal]");
exit (ret);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -54,7 +54,7 @@ int num_args = sizeof(args) / sizeof(args[0]);
static void
usage (int status)
{
arg_printusage (args, num_args, "");
arg_printusage (args, num_args, NULL, "");
exit (status);
}

View File

@@ -118,6 +118,7 @@ usage (int ret)
{
arg_printusage (args,
sizeof(args)/sizeof(*args),
NULL,
"[principal]");
exit (ret);
}

View File

@@ -202,6 +202,7 @@ usage (int ret)
{
arg_printusage (args,
sizeof(args)/sizeof(*args),
NULL,
"");
exit (ret);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -44,7 +44,7 @@ RCSID("$Id$");
void
krb5_std_usage(int code, struct getargs *args, int num_args)
{
arg_printusage(args, num_args, "");
arg_printusage(args, num_args, NULL, "");
exit(code);
}