First pass of get/setprogname() cleanup. Much more to come later.

ok deraadt@, pval@

8 files changed, 14 insertions, 15 deletions

diff --git a/kerberosV/include/roken.h b/kerberosV/include/roken.h
index 1161697f2f0..0ba1524c2ed 100644
--- a/kerberosV/include/roken.h
+++ b/kerberosV/include/roken.h
@@ -39,7 +39,7 @@
  */
 
 /* $KTH: roken.h.in,v 1.159 2001/08/21 15:32:05 assar Exp $ */
-/* $Id: roken.h,v 1.7 2002/02/06 09:12:30 hin Exp $ */
+/* $Id: roken.h,v 1.8 2002/05/30 20:06:23 hin Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -169,8 +169,6 @@ int get_window_size(int fd, struct winsize *);
 
 
 
-extern const char *__progname;
-
 extern char **environ;
 
 struct hostent *
diff --git a/kerberosV/src/lib/asn1/main.c b/kerberosV/src/lib/asn1/main.c
index d3fd2f3339f..f5adc429ade 100644
--- a/kerberosV/src/lib/asn1/main.c
+++ b/kerberosV/src/lib/asn1/main.c
@@ -61,7 +61,6 @@ main(int argc, char **argv)
     char *name = NULL;
     int optind = 0;
 
-    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/kerberosV/src/lib/roken/getarg.c b/kerberosV/src/lib/roken/getarg.c
index 05a11933068..57adfa13d1b 100644
--- a/kerberosV/src/lib/roken/getarg.c
+++ b/kerberosV/src/lib/roken/getarg.c
@@ -44,6 +44,8 @@ RCSID("$KTH: getarg.c,v 1.42 2001/07/23 04:30:11 assar Exp $");
 
 #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
 
+extern char *__progname;
+
 static size_t
 print_arg (char *string, size_t len, int mdoc, int longp, struct getargs *arg)
 {
@@ -211,7 +213,7 @@ arg_printusage (struct getargs *args,
     struct winsize ws;
 
     if (progname == NULL)
-	progname = getprogname();
+	progname = __progname;
 
     if(getenv("GETARGMANDOC")){
 	mandoc_template(args, num_args, progname, extra_string);
diff --git a/kerberosV/src/lib/roken/getprogname.c b/kerberosV/src/lib/roken/getprogname.c
index b48dda13e26..5cf6b0e21d9 100644
--- a/kerberosV/src/lib/roken/getprogname.c
+++ b/kerberosV/src/lib/roken/getprogname.c
@@ -38,9 +38,7 @@ RCSID("$KTH: getprogname.c,v 1.1 2001/07/09 14:56:51 assar Exp $");
 
 #include "roken.h"
 
-#ifndef HAVE___PROGNAME
-const char *__progname;
-#endif
+extern char *__progname;
 
 #ifndef HAVE_GETPROGNAME
 const char *
diff --git a/kerberosV/src/lib/roken/print_version.c b/kerberosV/src/lib/roken/print_version.c
index fe3a97d5472..cfe69a295ce 100644
--- a/kerberosV/src/lib/roken/print_version.c
+++ b/kerberosV/src/lib/roken/print_version.c
@@ -39,6 +39,8 @@ RCSID("$KTH: print_version.c,v 1.8 2001/02/20 01:44:55 assar Exp $");
 
 #include "print_version.h"
 
+extern char *__progname;
+
 void
 print_version(const char *progname)
 {
@@ -49,7 +51,7 @@ print_version(const char *progname)
     int i;
     
     if(progname == NULL)
-	progname = getprogname();
+	progname = __progname;
     
     if(num_args == 0)
 	msg = "no version information";
diff --git a/kerberosV/src/lib/roken/warnerr.c b/kerberosV/src/lib/roken/warnerr.c
index 3a5d9628226..e37493b2530 100644
--- a/kerberosV/src/lib/roken/warnerr.c
+++ b/kerberosV/src/lib/roken/warnerr.c
@@ -43,10 +43,10 @@ void
 warnerr(int doerrno, const char *fmt, va_list ap)
 {
     int sverrno = errno;
-    const char *progname = getprogname();
+    extern char *__progname;
 
-    if(progname != NULL){
-	fprintf(stderr, "%s", progname);
+    if(__progname != NULL){
+	fprintf(stderr, "%s", __progname);
 	if(fmt != NULL || doerrno)
 	    fprintf(stderr, ": ");
     }
diff --git a/kerberosV/src/lib/roken/write_pid.c b/kerberosV/src/lib/roken/write_pid.c
index 0bb8c27fc3a..4667188add9 100644
--- a/kerberosV/src/lib/roken/write_pid.c
+++ b/kerberosV/src/lib/roken/write_pid.c
@@ -88,7 +88,7 @@ pidfile(const char *basename)
     if(pidfile_path != NULL)
 	return;
     if(basename == NULL)
-	basename = getprogname();
+	basename = __progname;
     pidfile_path = pid_file_write(basename);
     atexit(pidfile_cleanup);
 }
diff --git a/kerberosV/usr.bin/asn1_compile/Makefile b/kerberosV/usr.bin/asn1_compile/Makefile
index 62b9e2488e1..4e5e2259538 100644
--- a/kerberosV/usr.bin/asn1_compile/Makefile
+++ b/kerberosV/usr.bin/asn1_compile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/02/06 09:13:34 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2002/05/30 20:06:23 hin Exp $
 
 KRBDEPTH=	../..
 .include <${.CURDIR}/${KRBDEPTH}/Makefile.inc>
@@ -7,7 +7,7 @@ PROG=	asn1_compile
 NOMAN=
 SRCS=	parse.c lex.l main.c hash.c symbol.c gen.c \
         gen_encode.c gen_decode.c gen_free.c gen_length.c gen_copy.c \
-        gen_glue.c getprogname.c setprogname.c
+        gen_glue.c
 
 CLEANFILES=	parse.[ch] lex.[ch]