From fc1956b05f7aec0823faf08d13c363414112175d Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 18 Aug 1998 21:17:01 +0000
Subject: [PATCH] new arg_printusage

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5130 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/ktutil.c        | 10 +++++-----
 admin/srvconvert.c    |  6 +++---
 appl/afsutil/afslog.c |  4 ++--
 appl/login/login.c    |  4 ++--
 appl/rsh/rsh.c        |  1 +
 appl/rsh/rshd.c       |  1 +
 appl/test/common.c    |  6 +++---
 kadmin/ank.c          |  4 ++--
 kadmin/cpw.c          |  2 +-
 kadmin/ext.c          |  2 +-
 kadmin/kadmin.c       |  2 +-
 kadmin/kadmind.c      |  2 +-
 kdc/config.c          |  2 +-
 kdc/hprop.c           |  2 +-
 kdc/hpropd.c          |  4 ++--
 kdc/string2key.c      |  2 +-
 kpasswd/kpasswd.c     |  3 ++-
 kuser/kdestroy.c      |  4 ++--
 kuser/kinit.c         |  1 +
 kuser/klist.c         |  1 +
 lib/krb5/prog_setup.c |  4 ++--
 21 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/admin/ktutil.c b/admin/ktutil.c
index ad59a15fe..28fc10804 100644
--- a/admin/ktutil.c
+++ b/admin/ktutil.c
@@ -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);
 }
 
diff --git a/admin/srvconvert.c b/admin/srvconvert.c
index 97044e1b0..7ecb23b72 100644
--- a/admin/srvconvert.c
+++ b/admin/srvconvert.c
@@ -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;
     }
 
diff --git a/appl/afsutil/afslog.c b/appl/afsutil/afslog.c
index 2e638c75f..36d58e320 100644
--- a/appl/afsutil/afslog.c
+++ b/appl/afsutil/afslog.c
@@ -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);
 }
 
diff --git a/appl/login/login.c b/appl/login/login.c
index 2e980788c..21e39cafd 100644
--- a/appl/login/login.c
+++ b/appl/login/login.c
@@ -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);
 }
 
diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index 09eef4943..0d55a4717 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -599,6 +599,7 @@ usage (int ret)
 {
     arg_printusage (args,
 		    sizeof(args) / sizeof(args[0]),
+		    NULL,
 		    "host command");
     exit (ret);
 }
diff --git a/appl/rsh/rshd.c b/appl/rsh/rshd.c
index 44d3b58f3..2b10ec7b1 100644
--- a/appl/rsh/rshd.c
+++ b/appl/rsh/rshd.c
@@ -617,6 +617,7 @@ usage (int ret)
 {
     arg_printusage (args,
 		    sizeof(args) / sizeof(args[0]),
+		    NULL,
 		    "host command");
     exit (ret);
 }
diff --git a/appl/test/common.c b/appl/test/common.c
index 0e8dba6fe..296084f74 100644
--- a/appl/test/common.c
+++ b/appl/test/common.c
@@ -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);
 }
 
diff --git a/kadmin/ank.c b/kadmin/ank.c
index 5e1a58a95..ec3d66898 100644
--- a/kadmin/ank.c
+++ b/kadmin/ank.c
@@ -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");
 }
 
 
diff --git a/kadmin/cpw.c b/kadmin/cpw.c
index b3e88bd61..181428b20 100644
--- a/kadmin/cpw.c
+++ b/kadmin/cpw.c
@@ -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
diff --git a/kadmin/ext.c b/kadmin/ext.c
index 79cf908b4..26800161b 100644
--- a/kadmin/ext.c
+++ b/kadmin/ext.c
@@ -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
diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index 86544f140..fd683b7a8 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -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);
 }
 
diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index 4e752a5c0..846d27acd 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -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);
 }
 
diff --git a/kdc/config.c b/kdc/config.c
index 83af65286..49923b57f 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -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);
 }
 
diff --git a/kdc/hprop.c b/kdc/hprop.c
index 7043ee919..0912b3a00 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -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);
 }
 
diff --git a/kdc/hpropd.c b/kdc/hpropd.c
index 464eaeb19..bf79956bf 100644
--- a/kdc/hpropd.c
+++ b/kdc/hpropd.c
@@ -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);
 }
 
diff --git a/kdc/string2key.c b/kdc/string2key.c
index a7261f6a7..2f92560ef 100644
--- a/kdc/string2key.c
+++ b/kdc/string2key.c
@@ -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);
 }
 
diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 4f2f9ca8a..ac0b9b72f 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -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);
 }
diff --git a/kuser/kdestroy.c b/kuser/kdestroy.c
index 582f64176..fd70cf24a 100644
--- a/kuser/kdestroy.c
+++ b/kuser/kdestroy.c
@@ -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);
 }
 
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 693aaf9b8..4635c6963 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -118,6 +118,7 @@ usage (int ret)
 {
     arg_printusage (args,
 		    sizeof(args)/sizeof(*args),
+		    NULL,
 		    "[principal]");
     exit (ret);
 }
diff --git a/kuser/klist.c b/kuser/klist.c
index 4690fb094..89514931c 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -202,6 +202,7 @@ usage (int ret)
 {
     arg_printusage (args,
 		    sizeof(args)/sizeof(*args),
+		    NULL,
 		    "");
     exit (ret);
 }
diff --git a/lib/krb5/prog_setup.c b/lib/krb5/prog_setup.c
index 4f556b79c..1bd419983 100644
--- a/lib/krb5/prog_setup.c
+++ b/lib/krb5/prog_setup.c
@@ -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);
 }