summaryrefslogtreecommitdiffstats
path: root/crypto/heimdal/lib/roken/warnerr.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/heimdal/lib/roken/warnerr.c')
-rw-r--r--crypto/heimdal/lib/roken/warnerr.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/crypto/heimdal/lib/roken/warnerr.c b/crypto/heimdal/lib/roken/warnerr.c
index f57c90e..0ebae25 100644
--- a/crypto/heimdal/lib/roken/warnerr.c
+++ b/crypto/heimdal/lib/roken/warnerr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -33,7 +33,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
-RCSID("$Id: warnerr.c,v 1.9 2000/07/25 09:54:05 joda Exp $");
+RCSID("$Id: warnerr.c,v 1.13 2001/05/16 23:54:19 assar Exp $");
#endif
#include "roken.h"
@@ -43,14 +43,17 @@ RCSID("$Id: warnerr.c,v 1.9 2000/07/25 09:54:05 joda Exp $");
const char *__progname;
#endif
+#ifndef HAVE_GETPROGNAME
const char *
-get_progname(void)
+getprogname(void)
{
return __progname;
}
+#endif
+#ifndef HAVE_SETPROGNAME
void
-set_progname(char *argv0)
+setprogname(const char *argv0)
{
#ifndef HAVE___PROGNAME
char *p;
@@ -64,13 +67,28 @@ set_progname(char *argv0)
__progname = p;
#endif
}
+#endif /* HAVE_SETPROGNAME */
+
+void
+set_progname(char *argv0)
+{
+ setprogname ((const char *)argv0);
+}
+
+const char *
+get_progname (void)
+{
+ return getprogname ();
+}
void
warnerr(int doerrno, const char *fmt, va_list ap)
{
int sverrno = errno;
- if(__progname != NULL){
- fprintf(stderr, "%s", __progname);
+ const char *progname = getprogname();
+
+ if(progname != NULL){
+ fprintf(stderr, "%s", progname);
if(fmt != NULL || doerrno)
fprintf(stderr, ": ");
}
OpenPOWER on IntegriCloud