From 67422a6b02a42cad06a469c7d17667c7a893769b Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 20 Feb 2001 01:44:56 +0000
Subject: [PATCH] s/[gs]et_progname/[gs]etprogname/

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9704 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/ktutil.c               | 2 +-
 appl/afsutil/afslog.c        | 2 +-
 appl/ftp/ftp/main.c          | 4 ++--
 appl/ftp/ftpd/ftpd.c         | 2 +-
 appl/kf/kf.c                 | 2 +-
 appl/kf/kfd.c                | 2 +-
 appl/kx/kx.c                 | 2 +-
 appl/kx/kxd.c                | 2 +-
 appl/login/login.c           | 2 +-
 appl/login/osfc2.c           | 2 +-
 appl/otp/otp.c               | 2 +-
 appl/otp/otpprint.c          | 2 +-
 appl/popper/pop_debug.c      | 2 +-
 appl/popper/pop_init.c       | 4 ++--
 appl/push/push.c             | 2 +-
 appl/rsh/rsh.c               | 2 +-
 appl/rsh/rshd.c              | 4 ++--
 appl/su/su.c                 | 2 +-
 appl/xnlock/xnlock.c         | 4 ++--
 kadmin/add-random-users.c    | 2 +-
 kadmin/kadmin.c              | 2 +-
 kadmin/kadmind.c             | 2 +-
 kadmin/load.c                | 2 +-
 kdc/hprop.c                  | 2 +-
 kdc/hpropd.c                 | 2 +-
 kdc/main.c                   | 2 +-
 kpasswd/kpasswd-generator.c  | 2 +-
 kuser/generate-requests.c    | 2 +-
 kuser/kdecode_ticket.c       | 2 +-
 kuser/kdestroy.c             | 2 +-
 kuser/kgetcred.c             | 2 +-
 kuser/kinit.c                | 2 +-
 kuser/klist.c                | 2 +-
 lib/asn1/asn1_print.c        | 2 +-
 lib/asn1/main.c              | 2 +-
 lib/auth/sia/sia.c           | 2 +-
 lib/com_err/compile_et.c     | 2 +-
 lib/hdb/convert_db.c         | 2 +-
 lib/krb5/appdefault.c        | 4 ++--
 lib/krb5/prog_setup.c        | 2 +-
 lib/krb5/verify_krb5_conf.c  | 2 +-
 lib/roken/getaddrinfo-test.c | 4 ++--
 lib/roken/getarg.c           | 2 +-
 lib/roken/print_version.c    | 2 +-
 lib/roken/write_pid.c        | 2 +-
 lib/sl/make_cmds.c           | 2 +-
 lib/sl/sl.c                  | 4 ++--
 lib/vers/print_version.c     | 2 +-
 48 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/admin/ktutil.c b/admin/ktutil.c
index a0a4fd523..6448c6030 100644
--- a/admin/ktutil.c
+++ b/admin/ktutil.c
@@ -129,7 +129,7 @@ main(int argc, char **argv)
 {
     int optind = 0;
     krb5_error_code ret;
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     ret = krb5_init_context(&context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/appl/afsutil/afslog.c b/appl/afsutil/afslog.c
index b3adfb723..e86012c55 100644
--- a/appl/afsutil/afslog.c
+++ b/appl/afsutil/afslog.c
@@ -179,7 +179,7 @@ main(int argc, char **argv)
     int num;
     int ret = 0;
     
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
diff --git a/appl/ftp/ftp/main.c b/appl/ftp/ftp/main.c
index 8d4aeb730..d967511ca 100644
--- a/appl/ftp/ftp/main.c
+++ b/appl/ftp/ftp/main.c
@@ -46,7 +46,7 @@ main(int argc, char **argv)
 	char homedir[MaxPathLen];
 	struct servent *sp;
 
-	set_progname(argv[0]);
+	setprogname(argv[0]);
 
 	sp = getservbyname("ftp", "tcp");
 	if (sp == 0)
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 		exit(0);
 	    signal(SIGINT, intr);
 	    signal(SIGPIPE, lostpeer);
-	    xargv[0] = (char*)__progname;
+	    xargv[0] = (char*)getprogname();
 	    xargv[1] = argv[0];
 	    xargv[2] = argv[1];
 	    xargv[3] = argv[2];
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 9b50a2241..4dbcfd67d 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -262,7 +262,7 @@ main(int argc, char **argv)
 
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     /* detach from any tickets and tokens */
     {
diff --git a/appl/kf/kf.c b/appl/kf/kf.c
index ad1ae990e..5a46f3c9a 100644
--- a/appl/kf/kf.c
+++ b/appl/kf/kf.c
@@ -71,7 +71,7 @@ client_setup(krb5_context *context, int *argc, char **argv)
     int port = 0;
     int status;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
  
     status = krb5_init_context (context);
     if (status)
diff --git a/appl/kf/kfd.c b/appl/kf/kfd.c
index a44ff4157..ab0191c44 100644
--- a/appl/kf/kfd.c
+++ b/appl/kf/kfd.c
@@ -315,7 +315,7 @@ main(int argc, char **argv)
     int port;
     int ret;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     roken_openlog (argv[0], LOG_ODELAY | LOG_PID,LOG_AUTH);
     port = server_setup(&context, argc, argv);
     ret = doit (port, service);
diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index 81e80e2d9..c11652809 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -690,7 +690,7 @@ main(int argc, char **argv)
     int ret	= 1;
     char *host	= NULL;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
diff --git a/appl/kx/kxd.c b/appl/kx/kxd.c
index b95dd8bee..1d9c332d6 100644
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -708,7 +708,7 @@ main (int argc, char **argv)
     int port;
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     roken_openlog ("kxd", LOG_ODELAY | LOG_PID, LOG_DAEMON);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
diff --git a/appl/login/login.c b/appl/login/login.c
index a48ce37a0..139959dc2 100644
--- a/appl/login/login.c
+++ b/appl/login/login.c
@@ -650,7 +650,7 @@ main(int argc, char **argv)
     int ask = 1;
     struct sigaction sa;
     
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
 #ifdef KRB5
     {
diff --git a/appl/login/osfc2.c b/appl/login/osfc2.c
index 15b13432b..ec211bca0 100644
--- a/appl/login/osfc2.c
+++ b/appl/login/osfc2.c
@@ -42,7 +42,7 @@ do_osfc2_magic(uid_t uid)
     char *argv[2];
     
     /* fake */
-    argv[0] = (char*)__progname;
+    argv[0] = (char*)getprogname();
     argv[1] = NULL;
     set_auth_parameters(1, argv);
     
diff --git a/appl/otp/otp.c b/appl/otp/otp.c
index bc4448123..ae57c9c2e 100644
--- a/appl/otp/otp.c
+++ b/appl/otp/otp.c
@@ -293,7 +293,7 @@ main (int argc, char **argv)
     OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT);
     int optind = 0;
   
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/appl/otp/otpprint.c b/appl/otp/otpprint.c
index c4ba1e9d9..b8446b44c 100644
--- a/appl/otp/otpprint.c
+++ b/appl/otp/otpprint.c
@@ -101,7 +101,7 @@ main (int argc, char **argv)
     void (*fn)(OtpKey, char *, size_t);
     OtpAlgorithm *alg = otp_find_alg (OTP_ALG_DEFAULT);
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/appl/popper/pop_debug.c b/appl/popper/pop_debug.c
index 686a31db3..49cb42dbe 100644
--- a/appl/popper/pop_debug.c
+++ b/appl/popper/pop_debug.c
@@ -215,7 +215,7 @@ main(int argc, char **argv)
     int ret = 1;
     int optind = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
diff --git a/appl/popper/pop_init.c b/appl/popper/pop_init.c
index 305c45511..d22dd98f6 100644
--- a/appl/popper/pop_init.c
+++ b/appl/popper/pop_init.c
@@ -254,10 +254,10 @@ pop_init(POP *p,int argcount,char **argmessage)
     /*  Initialize the POP parameter block */
     memset (p, 0, sizeof(POP));
 
-    set_progname(argmessage[0]);
+    setprogname(argmessage[0]);
 
     /*  Save my name in a global variable */
-    p->myname = (char*)__progname;
+    p->myname = (char*)getprogname();
 
     /*  Get the name of our host */
     gethostname(p->myhost,MaxHostNameLen);
diff --git a/appl/push/push.c b/appl/push/push.c
index e87807ed4..c72cf7612 100644
--- a/appl/push/push.c
+++ b/appl/push/push.c
@@ -714,7 +714,7 @@ main(int argc, char **argv)
     const char *host, *user, *filename = NULL;
     char *pobox = NULL;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
 #ifdef KRB5
     {
diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index 7b3b674f4..4c0994a1a 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -836,7 +836,7 @@ main(int argc, char **argv)
     if (setuid (uid) || (uid != 0 && setuid(0) == 0))
 	err (1, "setuid");
     
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if (argc >= 2 && argv[1][0] != '-') {
 	host = argv[host_index = 1];
diff --git a/appl/rsh/rshd.c b/appl/rsh/rshd.c
index b8b11b25d..9a18a2c82 100644
--- a/appl/rsh/rshd.c
+++ b/appl/rsh/rshd.c
@@ -870,7 +870,7 @@ usage (int ret)
 			NULL,
 			"");
     else
-	syslog (LOG_ERR, "Usage: %s [-ikxlvPL] [-p port]", __progname);
+	syslog (LOG_ERR, "Usage: %s [-ikxlvPL] [-p port]", getprogname());
     exit (ret);
 }
 
@@ -881,7 +881,7 @@ main(int argc, char **argv)
     int optind = 0;
     int port = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     roken_openlog ("rshd", LOG_ODELAY | LOG_PID, LOG_AUTH);
 
     if (getarg(args, sizeof(args) / sizeof(args[0]), argc, argv,
diff --git a/appl/su/su.c b/appl/su/su.c
index 05c4f1308..b96238c94 100644
--- a/appl/su/su.c
+++ b/appl/su/su.c
@@ -278,7 +278,7 @@ main(int argc, char **argv)
     int ok = 0;
     int kerberos_error=1;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c
index 8f3c84945..075d19efa 100644
--- a/appl/xnlock/xnlock.c
+++ b/appl/xnlock/xnlock.c
@@ -199,7 +199,7 @@ get_words(void)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [options] [message]\n", __progname);
+    fprintf(stderr, "usage: %s [options] [message]\n", getprogname());
     fprintf(stderr, "-fg color     foreground color\n");
     fprintf(stderr, "-bg color     background color\n");
     fprintf(stderr, "-rv           reverse foreground/background colors\n");
@@ -946,7 +946,7 @@ main (int argc, char **argv)
     Widget override;
     XGCValues gcvalues;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     /*
      * Must be setuid root to read /etc/shadow, copy encrypted
diff --git a/kadmin/add-random-users.c b/kadmin/add-random-users.c
index 87bd07454..9c4bcadfa 100644
--- a/kadmin/add-random-users.c
+++ b/kadmin/add-random-users.c
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     if (help_flag)
diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index 48e181d22..af6eeaf93 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -225,7 +225,7 @@ main(int argc, char **argv)
     int optind = 0;
     int e;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     ret = krb5_init_context(&context);
     if (ret)
diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index 8bde0b0b4..6e0f19080 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -98,7 +98,7 @@ main(int argc, char **argv)
     krb5_log_facility *logf;
     krb5_keytab keytab;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     ret = krb5_init_context(&context);
     if (ret)
diff --git a/kadmin/load.c b/kadmin/load.c
index 8febcd1a8..f2a5a60ee 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/kdc/hprop.c b/kdc/hprop.c
index 8d7c1c8e8..3cc6b097e 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -787,7 +787,7 @@ main(int argc, char **argv)
 
     int type = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
diff --git a/kdc/hpropd.c b/kdc/hpropd.c
index c11ec105a..1718a19ec 100644
--- a/kdc/hpropd.c
+++ b/kdc/hpropd.c
@@ -213,7 +213,7 @@ main(int argc, char **argv)
     int fd_out = -1;
 #endif
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     ret = krb5_init_context(&context);
     if(ret)
diff --git a/kdc/main.c b/kdc/main.c
index 1c12e3525..13771f719 100644
--- a/kdc/main.c
+++ b/kdc/main.c
@@ -48,7 +48,7 @@ int
 main(int argc, char **argv)
 {
     krb5_error_code ret;
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     
     ret = krb5_init_context(&context);
     if (ret)
diff --git a/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c
index 250d1f75e..cb31008d0 100644
--- a/kpasswd/kpasswd-generator.c
+++ b/kpasswd/kpasswd-generator.c
@@ -176,7 +176,7 @@ main(int argc, char **argv)
     int nreq;
     char *end;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     argc -= optind;
diff --git a/kuser/generate-requests.c b/kuser/generate-requests.c
index 5eb300f2e..1abed77c0 100644
--- a/kuser/generate-requests.c
+++ b/kuser/generate-requests.c
@@ -134,7 +134,7 @@ main(int argc, char **argv)
     int nreq;
     char *end;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
     argc -= optind;
diff --git a/kuser/kdecode_ticket.c b/kuser/kdecode_ticket.c
index f56d539da..f220ad541 100644
--- a/kuser/kdecode_ticket.c
+++ b/kuser/kdecode_ticket.c
@@ -103,7 +103,7 @@ main(int argc, char **argv)
     krb5_creds in, *out;
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     ret = krb5_init_context (&context);
     if (ret)
diff --git a/kuser/kdestroy.c b/kuser/kdestroy.c
index 5da45af58..938d53c78 100644
--- a/kuser/kdestroy.c
+++ b/kuser/kdestroy.c
@@ -68,7 +68,7 @@ main (int argc, char **argv)
     int optind = 0;
     int exit_val = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
diff --git a/kuser/kgetcred.c b/kuser/kgetcred.c
index 41e959448..01e71521b 100644
--- a/kuser/kgetcred.c
+++ b/kuser/kgetcred.c
@@ -65,7 +65,7 @@ main(int argc, char **argv)
     krb5_creds in, *out;
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     ret = krb5_init_context (&context);
     if (ret)
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 5c33279af..a81e34b73 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -339,7 +339,7 @@ main (int argc, char **argv)
     krb5_addresses no_addrs;
     char passwd[256];
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     memset(&cred, 0, sizeof(cred));
     
     ret = krb5_init_context (&context);
diff --git a/kuser/klist.c b/kuser/klist.c
index eb2372f48..67703ed12 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -629,7 +629,7 @@ main (int argc, char **argv)
     int optind = 0;
     int exit_status = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
diff --git a/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c
index 2a32ea57d..c71752a3d 100644
--- a/lib/asn1/asn1_print.c
+++ b/lib/asn1/asn1_print.c
@@ -224,7 +224,7 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
     initialize_asn1_error_table_r (&et_list);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
diff --git a/lib/asn1/main.c b/lib/asn1/main.c
index db3db3b98..fcf45946e 100644
--- a/lib/asn1/main.c
+++ b/lib/asn1/main.c
@@ -61,7 +61,7 @@ main(int argc, char **argv)
     char *name = NULL;
     int optind = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/lib/auth/sia/sia.c b/lib/auth/sia/sia.c
index bd785baf8..3bcd5fb6c 100644
--- a/lib/auth/sia/sia.c
+++ b/lib/auth/sia/sia.c
@@ -493,7 +493,7 @@ siad_chg_password (sia_collect_func_t *collect,
     char new_pw2[MAX_KPW_LEN+1];
     static struct et_list *et_list;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     SIA_DEBUG(("DEBUG", "siad_chg_password"));
     if(collect == NULL)
diff --git a/lib/com_err/compile_et.c b/lib/com_err/compile_et.c
index c67e0d5f0..9565dcfbe 100644
--- a/lib/com_err/compile_et.c
+++ b/lib/com_err/compile_et.c
@@ -196,7 +196,7 @@ main(int argc, char **argv)
     char *p;
     int optind = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/lib/hdb/convert_db.c b/lib/hdb/convert_db.c
index def5e0bc9..c5ca0ab20 100644
--- a/lib/hdb/convert_db.c
+++ b/lib/hdb/convert_db.c
@@ -136,7 +136,7 @@ main(int argc, char **argv)
     int optind = 0;
     int master_key_set = 0;
     
-    set_progname(argv[0]);
+    setprogname(argv[0]);
 
     if(getarg(args, num_args, argc, argv, &optind))
 	krb5_std_usage(1, args, num_args);
diff --git a/lib/krb5/appdefault.c b/lib/krb5/appdefault.c
index 7da462f25..857511dfe 100644
--- a/lib/krb5/appdefault.c
+++ b/lib/krb5/appdefault.c
@@ -42,7 +42,7 @@ krb5_appdefault_boolean(krb5_context context, const char *appname,
 {
     
     if(appname == NULL)
-	appname = __progname;
+	appname = getprogname();
     def_val = krb5_config_get_bool_default(context, NULL, def_val, 
 					   "appdefaults", 
 					   option, 
@@ -76,7 +76,7 @@ krb5_appdefault_string(krb5_context context, const char *appname,
 		       const char *def_val, char **ret_val)
 {
     if(appname == NULL)
-	appname = __progname;
+	appname = getprogname();
     def_val = krb5_config_get_string_default(context, NULL, def_val, 
 					     "appdefaults", 
 					     option, 
diff --git a/lib/krb5/prog_setup.c b/lib/krb5/prog_setup.c
index 32e1343c4..31c7d3924 100644
--- a/lib/krb5/prog_setup.c
+++ b/lib/krb5/prog_setup.c
@@ -55,7 +55,7 @@ krb5_program_setup(krb5_context *context, int argc, char **argv,
     if(usage == NULL)
 	usage = krb5_std_usage;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     ret = krb5_init_context(context);
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
diff --git a/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c
index 4d8447f76..bb7a7c393 100644
--- a/lib/krb5/verify_krb5_conf.c
+++ b/lib/krb5/verify_krb5_conf.c
@@ -67,7 +67,7 @@ main(int argc, char **argv)
     char *error_message;
     int optind = 0;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
diff --git a/lib/roken/getaddrinfo-test.c b/lib/roken/getaddrinfo-test.c
index c5a30efcf..41bda5c92 100644
--- a/lib/roken/getaddrinfo-test.c
+++ b/lib/roken/getaddrinfo-test.c
@@ -112,7 +112,7 @@ main(int argc, char **argv)
     int optind = 0;
     int i;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))
@@ -122,7 +122,7 @@ main(int argc, char **argv)
 	usage (0);
 
     if (version_flag) {
-	fprintf (stderr, "%s from %s-%s)\n", __progname, PACKAGE, VERSION);
+	fprintf (stderr, "%s from %s-%s)\n", getprogname(), PACKAGE, VERSION);
 	return 0;
     }
 
diff --git a/lib/roken/getarg.c b/lib/roken/getarg.c
index 238582a5c..4b642d75d 100644
--- a/lib/roken/getarg.c
+++ b/lib/roken/getarg.c
@@ -211,7 +211,7 @@ arg_printusage (struct getargs *args,
     struct winsize ws;
 
     if (progname == NULL)
-	progname = __progname;
+	progname = getprogname();
 
     if(getenv("GETARGMANDOC")){
 	mandoc_template(args, num_args, progname, extra_string);
diff --git a/lib/roken/print_version.c b/lib/roken/print_version.c
index 751c00945..baab99e82 100644
--- a/lib/roken/print_version.c
+++ b/lib/roken/print_version.c
@@ -49,7 +49,7 @@ print_version(const char *progname)
     int i;
     
     if(progname == NULL)
-	progname = __progname;
+	progname = getprogname();
     
     if(num_args == 0)
 	msg = "no version information";
diff --git a/lib/roken/write_pid.c b/lib/roken/write_pid.c
index 9ce791f39..e5a93e1e9 100644
--- a/lib/roken/write_pid.c
+++ b/lib/roken/write_pid.c
@@ -88,7 +88,7 @@ pidfile(const char *basename)
     if(pidfile_path != NULL)
 	return;
     if(basename == NULL)
-	basename = __progname;
+	basename = getprogname();
     pidfile_path = pid_file_write(basename);
     atexit(pidfile_cleanup);
 }
diff --git a/lib/sl/make_cmds.c b/lib/sl/make_cmds.c
index 2015fa21f..daee7b705 100644
--- a/lib/sl/make_cmds.c
+++ b/lib/sl/make_cmds.c
@@ -213,7 +213,7 @@ main(int argc, char **argv)
 {
     int optind = 0;
 
-    set_progname(argv[0]);
+    setprogname(argv[0]);
     if(getarg(args, num_args, argc, argv, &optind))
 	usage(1);
     if(help_flag)
diff --git a/lib/sl/sl.c b/lib/sl/sl.c
index f6ac06582..d3fa88a80 100644
--- a/lib/sl/sl.c
+++ b/lib/sl/sl.c
@@ -76,8 +76,8 @@ mandoc_template(SL_cmd *cmds,
     t = time(NULL);
     strftime(timestr, sizeof(timestr), "%b %d, %Y", localtime(&t));
     printf(".Dd %s\n", timestr);
-    p = strrchr(__progname, '/');
-    if(p) p++; else p = __progname;
+    p = strrchr(getprogname(), '/');
+    if(p) p++; else p = getprogname();
     strncpy(cmd, p, sizeof(cmd));
     cmd[sizeof(cmd)-1] = '\0';
     strupr(cmd);
diff --git a/lib/vers/print_version.c b/lib/vers/print_version.c
index d732bbb6d..b3002ab20 100644
--- a/lib/vers/print_version.c
+++ b/lib/vers/print_version.c
@@ -49,7 +49,7 @@ print_version(const char *progname)
     int i;
     
     if(progname == NULL)
-	progname = __progname;
+	progname = getprogname();
     
     if(num_args == 0)
 	msg = "no version information";