oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

separate out [gs]etprogname

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10299 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-07-09 14:56:51 +00:00
parent f055cc84f7
commit d44c027370
4 changed files with 127 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/roken/Makefile.am
View File

@@ -50,6 +50,7 @@ libroken_la_SOURCES = \
get_window_size.c \
getarg.c \
getnameinfo_verified.c \
getprogname.c \
issuid.c \
k_getpwnam.c \
k_getpwuid.c \
@@ -63,6 +64,7 @@ libroken_la_SOURCES = \
roken_gethostby.c \
rtbl.c \
rtbl.h \
setprogname.c \
signal.c \
simple_exec.c \
snprintf.c \

58
lib/roken/getprogname.c Normal file
View File

@@ -0,0 +1,58 @@
/*
* Copyright (c) 1995 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
RCSID("$Id$");
#endif
#include "roken.h"
#ifndef HAVE___PROGNAME
const char *__progname;
#endif
#ifndef HAVE_GETPROGNAME
const char *
getprogname(void)
{
return __progname;
}
#endif /* HAVE_GETPROGNAME */
const char *
get_progname (void)
{
return getprogname ();
}

67
lib/roken/setprogname.c Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (c) 1995 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
RCSID("$Id$");
#endif
#include "roken.h"
#ifndef HAVE___PROGNAME
extern const char *__progname;
#endif
#ifndef HAVE_SETPROGNAME
void
setprogname(const char *argv0)
{
#ifndef HAVE___PROGNAME
char *p;
if(argv0 == NULL)
return;
p = strrchr(argv0, '/');
if(p == NULL)
p = (char *)argv0;
else
p++;
__progname = p;
#endif
}
#endif /* HAVE_SETPROGNAME */
void
set_progname(char *argv0)
{
setprogname ((const char *)argv0);
}

42
lib/roken/warnerr.c
View File

@@ -39,48 +39,6 @@ RCSID("$Id$");
#include "roken.h"
#include "err.h"
#ifndef HAVE___PROGNAME
const char *__progname;
#endif
#ifndef HAVE_GETPROGNAME
const char *
getprogname(void)
{
return __progname;
}
#endif
#ifndef HAVE_SETPROGNAME
void
setprogname(const char *argv0)
{
#ifndef HAVE___PROGNAME
char *p;
if(argv0 == NULL)
return;
p = strrchr(argv0, '/');
if(p == NULL)
p = (char *)argv0;
else
p++;
__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)
{