diff options
| author | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
| commit | 76fe441a7bf75d73962641b785f158b5cc9dc7f8 (patch) | |
| tree | 4e267e060bfb6d96f46ab0d79c49b277402c0dd0 /lib/libc/include | |
| parent | 6085f75ded37ec415ded7d6373ecd09bcb088ac4 (diff) | |
| download | FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.zip FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.tar.gz | |
Do not use __progname directly (except in [gs]etprogname(3)).
Also, make an internal _getprogname() that is used only inside
libc. For libc, getprogname(3) is a weak symbol in case a
function of the same name is defined in userland.
Diffstat (limited to 'lib/libc/include')
| -rw-r--r-- | lib/libc/include/libc_private.h | 6 | ||||
| -rw-r--r-- | lib/libc/include/namespace.h | 1 | ||||
| -rw-r--r-- | lib/libc/include/un-namespace.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index f356e18..e47e756 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -63,4 +63,10 @@ extern int __isthreaded; #define FLOCKFILE(fp) if (__isthreaded) _FLOCKFILE(fp) #define FUNLOCKFILE(fp) if (__isthreaded) _funlockfile(fp) +/* + * This is a pointer in the C run-time startup code. It is used + * by getprogname() and setprogname(). + */ +extern const char *__progname; + #endif /* _LIBC_PRIVATE_H_ */ diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h index 7753f98..bbd33c0 100644 --- a/lib/libc/include/namespace.h +++ b/lib/libc/include/namespace.h @@ -67,6 +67,7 @@ #define getdirentries _getdirentries #define getlogin _getlogin #define getpeername _getpeername +#define getprogname _getprogname #define getsockname _getsockname #define getsockopt _getsockopt #define ioctl _ioctl diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h index 855c101..3b21900 100644 --- a/lib/libc/include/un-namespace.h +++ b/lib/libc/include/un-namespace.h @@ -52,6 +52,7 @@ #undef getdirentries #undef getlogin #undef getpeername +#undef getprogname #undef getsockname #undef getsockopt #undef ioctl |
