new arg_printusage

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5130 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/admin/ktutil.c b/admin/ktutil.c
index ad59a15fe0a05c32d3e316a1db95b14761d94b78..28fc10804ad86487c48423fa845b9701946b034d 100644 (file)
--- 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 97044e1b05fe18c15db78a0f9451f0c0d1b3e017..7ecb23b727e053edcc17f0b20be9a9a69224c26a 100644 (file)
--- 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 2e638c75ffd32699ad9e4487da79997ec4b4242b..36d58e3201fc110ec73d792a6a8d01bf6968637c 100644 (file)
--- 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 2e980788c5e5e872630bcd93865ed5741f3373b2..21e39cafd265aca115d9e2039978e4eee124e81c 100644 (file)
--- 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 09eef4943c1a78008c81f59861c07157e26f4195..0d55a4717a55c5003776e3fe9b819abdb78a2f98 100644 (file)
--- 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 44d3b58f3bcc0a47cce4c3ee0da8c6840ee9ab07..2b10ec7b11eb434d5b6c1532d38e0a8833e4d40e 100644 (file)
--- 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 0e8dba6fe862d296523dce7dfb8065897fa2de3a..296084f74a80f1c4de7c2282522c61b114c860c1 100644 (file)
--- 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 5e1a58a95160271f96afcd357cada7baefbdcf95..ec3d668989de217de65864dd4f8ea803362ebbf5 100644 (file)
--- 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 b3e88bd610d811644e3fbc593e7631d5caa63586..181428b2017cd942f5a354850ca19cf980ec2ddb 100644 (file)
--- 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 79cf908b4272214d4b0c5e75c4414c66bd1efb8b..26800161b4c7a1bf10d7efd9addbcfc9ffb0ed34 100644 (file)
--- 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 86544f140176650bd19158dfa16d8b383ab3e472..fd683b7a8d0376b0a3e2c65f786a2a7be51acbc5 100644 (file)
--- 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 4e752a5c0c3c870c33b34ce7ce2b10963f10c2dc..846d27acd4702d458bcacd8f7766fd4d513533d2 100644 (file)
--- 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 83af65286e8c692b1d34a4604cb5d7752b85ae77..49923b57fff800b8216150f9d3c501e3975409b2 100644 (file)
--- 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 7043ee919cc697cfcec4aa333efdf642281948dc..0912b3a007fc66d5a9ac980cf65a95c40ea06c35 100644 (file)
--- 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 464eaeb197a93a57d9844cbb42d4a93fea20261e..bf79956bfe858114b5e23fd963a14d5e85836048 100644 (file)
--- 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 a7261f6a7c6e593cc9f6188a8e97c6cb1bc8eb82..2f92560efb074284e2c8b572a92d2ffbac16db5b 100644 (file)
--- 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 4f2f9ca8aa3adea60057aef40d0d9fa950002c4d..ac0b9b72f191faaaad73917ac51fe20e2f728793 100644 (file)
--- 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 582f6417643e429fafbd90f8fa78ac9272ffd9a7..fd70cf24a74e5f1933037bd04e4120447574ec47 100644 (file)
--- 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 693aaf9b88d07f94bfb0916f24092de1a1190a0d..4635c6963ee48b3f0f6c744fffc7e3cad8fa11d2 100644 (file)
--- 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 4690fb094d8c96139ab4199625551d6c0a11d0a7..89514931cf41116e34714c6717e789991cfc1303 100644 (file)
--- 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 4f556b79c12b3d0ab24ad58d596ba0e827df487b..1bd419983b9269c3d95095d187f03e33f021299a 100644 (file)
--- 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);
 }