diff --git a/lib/roken/roken-common.h b/lib/roken/roken-common.h index a3a527024..4d2f3b5d5 100644 --- a/lib/roken/roken-common.h +++ b/lib/roken/roken-common.h @@ -267,114 +267,152 @@ SigAction signal(int iSig, SigAction pAction); /* BSD compatible */ #endif #endif +#define simple_execve rk_simple_execve int ROKEN_LIB_FUNCTION simple_execve(const char*, char*const[], char*const[]); +#define simple_execve_timed rk_simple_execve_timed int ROKEN_LIB_FUNCTION simple_execve_timed(const char *, char *const[], char *const [], time_t (*)(void *), void *, time_t); + +#define simple_execvp rk_simple_execvp int ROKEN_LIB_FUNCTION simple_execvp(const char*, char *const[]); +#define simple_execvp_timed rk_simple_execvp_timed int ROKEN_LIB_FUNCTION simple_execvp_timed(const char *, char *const[], time_t (*)(void *), void *, time_t); + +#define simple_execlp rk_simple_execlp int ROKEN_LIB_FUNCTION simple_execlp(const char*, ...); +#define simple_execle rk_simple_execle int ROKEN_LIB_FUNCTION simple_execle(const char*, ...); +#define wait_for_process rk_wait_for_process int ROKEN_LIB_FUNCTION wait_for_process(pid_t); +#define wait_for_process_timed rk_wait_for_process_timed int ROKEN_LIB_FUNCTION wait_for_process_timed(pid_t, time_t (*)(void *), void *, time_t); +#define pipe_execv rk_pipe_execv int ROKEN_LIB_FUNCTION pipe_execv(FILE**, FILE**, FILE**, const char*, ...); +#define print_version rk_print_version void ROKEN_LIB_FUNCTION print_version(const char *); +#define eread rk_eread ssize_t ROKEN_LIB_FUNCTION eread (int fd, void *buf, size_t nbytes); +#define ewrite rk_ewrite ssize_t ROKEN_LIB_FUNCTION ewrite (int fd, const void *buf, size_t nbytes); struct hostent; +#define hostent_find_fqdn rk_hostent_find_fqdn const char * ROKEN_LIB_FUNCTION hostent_find_fqdn (const struct hostent *); +#define esetenv rk_esetenv void ROKEN_LIB_FUNCTION esetenv(const char *, const char *, int); +#define socket_set_address_and_port rk_socket_set_address_and_port void ROKEN_LIB_FUNCTION socket_set_address_and_port (struct sockaddr *, const void *, int); +#define socket_addr_size rk_socket_addr_size size_t ROKEN_LIB_FUNCTION socket_addr_size (const struct sockaddr *); +#define socket_set_any rk_socket_set_any void ROKEN_LIB_FUNCTION socket_set_any (struct sockaddr *, int); +#define socket_sockaddr_size rk_socket_sockaddr_size size_t ROKEN_LIB_FUNCTION socket_sockaddr_size (const struct sockaddr *); +#define socket_get_address rk_socket_get_address void * ROKEN_LIB_FUNCTION socket_get_address (struct sockaddr *); +#define socket_get_port rk_socket_get_port int ROKEN_LIB_FUNCTION socket_get_port (const struct sockaddr *); +#define socket_set_port rk_socket_set_port void ROKEN_LIB_FUNCTION socket_set_port (struct sockaddr *, int); +#define socket_set_portrange rk_socket_set_portrange void ROKEN_LIB_FUNCTION socket_set_portrange (int, int, int); +#define socket_set_debug rk_socket_set_debug void ROKEN_LIB_FUNCTION socket_set_debug (int); +#define socket_set_tos rk_socket_set_tos void ROKEN_LIB_FUNCTION socket_set_tos (int, int); +#define socket_set_reuseaddr rk_socket_set_reuseaddr void ROKEN_LIB_FUNCTION socket_set_reuseaddr (int, int); +#define socket_set_ipv6only rk_socket_set_ipv6only void ROKEN_LIB_FUNCTION socket_set_ipv6only (int, int); +#define vstrcollect rk_vstrcollect char ** ROKEN_LIB_FUNCTION vstrcollect(va_list *ap); +#define strcollect rk_strcollect char ** ROKEN_LIB_FUNCTION strcollect(char *first, ...); +#define timevalfix rk_timevalfix void ROKEN_LIB_FUNCTION timevalfix(struct timeval *t1); +#define timevaladd rk_timevaladd void ROKEN_LIB_FUNCTION timevaladd(struct timeval *t1, const struct timeval *t2); +#define timevalsub rk_timevalsub void ROKEN_LIB_FUNCTION timevalsub(struct timeval *t1, const struct timeval *t2); +#define pid_file_write rk_pid_file_write char *ROKEN_LIB_FUNCTION pid_file_write (const char *progname); +#define pid_file_delete rk_pid_file_delete void ROKEN_LIB_FUNCTION pid_file_delete (char **); +#define read_environment rk_read_environment int ROKEN_LIB_FUNCTION read_environment(const char *file, char ***env); +#define free_environment rk_free_environment void ROKEN_LIB_FUNCTION free_environment(char **); +#define warnerr rk_warnerr void ROKEN_LIB_FUNCTION rk_warnerr(int doerrno, const char *fmt, va_list ap) __attribute__ ((format (printf, 2, 0))); diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index a6a75b5e4..e636c7d66 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -149,82 +149,124 @@ ROKEN_CPP_START #endif #ifndef HAVE_PUTENV +#define putenv rk_putenv int ROKEN_LIB_FUNCTION putenv(const char *); #endif #if !defined(HAVE_SETENV) || defined(NEED_SETENV_PROTO) +#ifndef HAVE_SETENV +#define setenv rk_setenv +#endif int ROKEN_LIB_FUNCTION setenv(const char *, const char *, int); #endif #if !defined(HAVE_UNSETENV) || defined(NEED_UNSETENV_PROTO) +#ifndef HAVE_UNSETENV +#define unsetenv rk_unsetenv +#endif void ROKEN_LIB_FUNCTION unsetenv(const char *); #endif #if !defined(HAVE_GETUSERSHELL) || defined(NEED_GETUSERSHELL_PROTO) +#ifndef HAVE_GETUSERSHELL +#define getusershell rk_getusershell +#define endusershell rk_endusershell +#endif char * ROKEN_LIB_FUNCTION getusershell(void); void ROKEN_LIB_FUNCTION endusershell(void); #endif #if !defined(HAVE_SNPRINTF) || defined(NEED_SNPRINTF_PROTO) +#ifndef HAVE_SNPRINTF +#define snprintf rk_snprintf +#endif int ROKEN_LIB_FUNCTION snprintf (char *, size_t, const char *, ...) __attribute__ ((format (printf, 3, 4))); #endif #if !defined(HAVE_VSNPRINTF) || defined(NEED_VSNPRINTF_PROTO) +#ifndef HAVE_VSNPRINTF +#define vsnprintf rk_vsnprintf +#endif int ROKEN_LIB_FUNCTION vsnprintf (char *, size_t, const char *, va_list) __attribute__((format (printf, 3, 0))); #endif #if !defined(HAVE_ASPRINTF) || defined(NEED_ASPRINTF_PROTO) +#ifndef HAVE_ASPRINTF +#define asprintf rk_asprintf +#endif int ROKEN_LIB_FUNCTION asprintf (char **, const char *, ...) __attribute__ ((format (printf, 2, 3))); #endif #if !defined(HAVE_VASPRINTF) || defined(NEED_VASPRINTF_PROTO) +#ifndef HAVE_VASPRINTF +#define vasprintf rk_vasprintf +#endif int ROKEN_LIB_FUNCTION vasprintf (char **, const char *, va_list) __attribute__((format (printf, 2, 0))); #endif #if !defined(HAVE_ASNPRINTF) || defined(NEED_ASNPRINTF_PROTO) +#ifndef HAVE_ASNPRINTF +#define asnprintf rk_asnprintf +#endif int ROKEN_LIB_FUNCTION asnprintf (char **, size_t, const char *, ...) __attribute__ ((format (printf, 3, 4))); #endif #if !defined(HAVE_VASNPRINTF) || defined(NEED_VASNPRINTF_PROTO) +#ifndef HAVE_VASNPRINTF +#define vasnprintf rk_vasnprintf +#endif int ROKEN_LIB_FUNCTION vasnprintf (char **, size_t, const char *, va_list) __attribute__((format (printf, 3, 0))); #endif #ifndef HAVE_STRDUP +#define strdup rk_strdup char * ROKEN_LIB_FUNCTION strdup(const char *); #endif #if !defined(HAVE_STRNDUP) || defined(NEED_STRNDUP_PROTO) +#ifndef HAVE_STRNDUP +#define strndup rk_strndup +#endif char * ROKEN_LIB_FUNCTION strndup(const char *, size_t); #endif #ifndef HAVE_STRLWR +#define strlwr rk_strlwr char * ROKEN_LIB_FUNCTION strlwr(char *); #endif #ifndef HAVE_STRNLEN +#define strnlen rk_strnlen size_t ROKEN_LIB_FUNCTION strnlen(const char*, size_t); #endif #if !defined(HAVE_STRSEP) || defined(NEED_STRSEP_PROTO) +#ifndef HAVE_STRSEP +#define strsep rk_strsep +#endif char * ROKEN_LIB_FUNCTION strsep(char**, const char*); #endif #if !defined(HAVE_STRSEP_COPY) || defined(NEED_STRSEP_COPY_PROTO) +#ifndef HAVE_STRSEP_COPY +#define strsep_copy rk_strsep_copy +#endif ssize_t ROKEN_LIB_FUNCTION strsep_copy(const char**, const char*, char*, size_t); #endif #ifndef HAVE_STRCASECMP +#define strcasecmp rk_strcasecmp int ROKEN_LIB_FUNCTION strcasecmp(const char *, const char *); #endif @@ -237,26 +279,34 @@ char * ROKEN_LIB_FUNCTION strtok_r(char *, const char *, char **); #endif #ifndef HAVE_STRUPR +#define strupr rk_strupr char * ROKEN_LIB_FUNCTION strupr(char *); #endif #ifndef HAVE_STRLCPY +#define strlcpy rk_strlcpy size_t ROKEN_LIB_FUNCTION strlcpy (char *, const char *, size_t); #endif #ifndef HAVE_STRLCAT +#define strlcat rk_strlcat size_t ROKEN_LIB_FUNCTION strlcat (char *, const char *, size_t); #endif #ifndef HAVE_GETDTABLESIZE +#define getdtablesize rk_getdtablesize int ROKEN_LIB_FUNCTION getdtablesize(void); #endif #if !defined(HAVE_STRERROR) && !defined(strerror) +#define strerror rk_strerror char * ROKEN_LIB_FUNCTION strerror(int); #endif #if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO) +#ifndef HAVE_HSTRERROR +#define hstrerror rk_hstrerror +#endif /* This causes a fatal error under Psoriasis */ #if !(defined(SunOS) && (SunOS >= 50)) const char * ROKEN_LIB_FUNCTION hstrerror(int); @@ -268,20 +318,26 @@ extern int h_errno; #endif #if !defined(HAVE_INET_ATON) || defined(NEED_INET_ATON_PROTO) +#ifndef HAVE_INET_ATON +#define inet_aton rk_inet_aton +#endif int ROKEN_LIB_FUNCTION inet_aton(const char *, struct in_addr *); #endif #ifndef HAVE_INET_NTOP +#define inet_ntop rk_inet_ntop const char * ROKEN_LIB_FUNCTION inet_ntop(int af, const void *src, char *dst, size_t size); #endif #ifndef HAVE_INET_PTON +#define inet_pton rk_inet_pton int ROKEN_LIB_FUNCTION inet_pton(int, const char *, void *); #endif #if !defined(HAVE_GETCWD) +#define getcwd rk_getcwd char* ROKEN_LIB_FUNCTION getcwd(char *, size_t); #endif @@ -294,91 +350,108 @@ struct passwd * ROKEN_LIB_FUNCTION k_getpwuid (uid_t); const char * ROKEN_LIB_FUNCTION get_default_username (void); #ifndef HAVE_SETEUID +#define seteuid rk_seteuid int ROKEN_LIB_FUNCTION seteuid(uid_t); #endif #ifndef HAVE_SETEGID +#define setegid rk_setegid int ROKEN_LIB_FUNCTION setegid(gid_t); #endif #ifndef HAVE_LSTAT +#define lstat rk_lstat int ROKEN_LIB_FUNCTION lstat(const char *, struct stat *); #endif #if !defined(HAVE_MKSTEMP) || defined(NEED_MKSTEMP_PROTO) +#ifndef HAVE_MKSTEMP +#define mkstemp rk_mkstemp +#endif int ROKEN_LIB_FUNCTION mkstemp(char *); #endif #ifndef HAVE_CGETENT +#define cgetent rk_cgetent +#define cgetstr rk_cgetstr int ROKEN_LIB_FUNCTION cgetent(char **, char **, const char *); int ROKEN_LIB_FUNCTION cgetstr(char *, const char *, char **); #endif #ifndef HAVE_INITGROUPS +#define initgroups rk_initgroups int ROKEN_LIB_FUNCTION initgroups(const char *, gid_t); #endif #ifndef HAVE_FCHOWN +#define fchown rk_fchown int ROKEN_LIB_FUNCTION fchown(int, uid_t, gid_t); #endif #if !defined(HAVE_DAEMON) || defined(NEED_DAEMON_PROTO) +#ifndef HAVE_DAEMON +#define daemon rk_daemon +#endif int ROKEN_LIB_FUNCTION daemon(int, int); #endif -#ifndef HAVE_INNETGR -int ROKEN_LIB_FUNCTION innetgr(const char *, const char *, - const char *, const char *); -#endif - #ifndef HAVE_CHOWN +#define chown rk_chown int ROKEN_LIB_FUNCTION chown(const char *, uid_t, gid_t); #endif #ifndef HAVE_RCMD +#define rcmd rk_rcmd int ROKEN_LIB_FUNCTION rcmd(char **, unsigned short, const char *, const char *, const char *, int *); #endif #if !defined(HAVE_INNETGR) || defined(NEED_INNETGR_PROTO) +#ifndef HAVE_INNETGR +#define innetgr rk_innetgr +#endif int ROKEN_LIB_FUNCTION innetgr(const char*, const char*, const char*, const char*); #endif #ifndef HAVE_IRUSEROK +#define iruserok rk_iruserok int ROKEN_LIB_FUNCTION iruserok(unsigned, int, const char *, const char *); #endif #if !defined(HAVE_GETHOSTNAME) || defined(NEED_GETHOSTNAME_PROTO) +#ifndef HAVE_GETHOSTNAME +#define gethostname rk_gethostname +#endif int ROKEN_LIB_FUNCTION gethostname(char *, int); #endif #ifndef HAVE_WRITEV +#define writev rk_writev ssize_t ROKEN_LIB_FUNCTION writev(int, const struct iovec *, int); #endif #ifndef HAVE_READV +#define readv rk_readv ssize_t ROKEN_LIB_FUNCTION readv(int, const struct iovec *, int); #endif -#ifndef HAVE_MKSTEMP -int ROKEN_LIB_FUNCTION -mkstemp(char *); -#endif - #ifndef HAVE_PIDFILE +#define pidfile rk_pidfile void ROKEN_LIB_FUNCTION pidfile (const char*); #endif #ifndef HAVE_BSWAP32 +#define bswap32 rk_bswap32 unsigned int ROKEN_LIB_FUNCTION bswap32(unsigned int); #endif #ifndef HAVE_BSWAP16 +#define bswap16 rk_bswap16 unsigned short ROKEN_LIB_FUNCTION bswap16(unsigned short); #endif @@ -396,6 +469,7 @@ unsigned short ROKEN_LIB_FUNCTION bswap16(unsigned short); #define LOCK_UN 8 /* Unlock */ #endif +#define flock rk_flock int flock(int fd, int operation); #endif /* HAVE_FLOCK */ @@ -428,6 +502,7 @@ struct winsize { int ROKEN_LIB_FUNCTION get_window_size(int fd, struct winsize *); #ifndef HAVE_VSYSLOG +#define vsyslog rk_vsyslog void ROKEN_LIB_FUNCTION vsyslog(int, const char *, va_list); #endif @@ -442,21 +517,25 @@ extern int opterr; #endif #ifndef HAVE_GETIPNODEBYNAME +#define getipnodebyname rk_getipnodebyname struct hostent * ROKEN_LIB_FUNCTION getipnodebyname (const char *, int, int, int *); #endif #ifndef HAVE_GETIPNODEBYADDR +#define getipnodebyaddr rk_getipnodebyaddr struct hostent * ROKEN_LIB_FUNCTION getipnodebyaddr (const void *, size_t, int, int *); #endif #ifndef HAVE_FREEHOSTENT +#define freehostent rk_freehostent void ROKEN_LIB_FUNCTION freehostent (struct hostent *); #endif #ifndef HAVE_COPYHOSTENT +#define copyhostent rk_copyhostent struct hostent * ROKEN_LIB_FUNCTION copyhostent (const struct hostent *); #endif @@ -524,6 +603,7 @@ struct addrinfo { #endif #ifndef HAVE_GETADDRINFO +#define getaddrinfo rk_getaddrinfo int ROKEN_LIB_FUNCTION getaddrinfo(const char *, const char *, @@ -532,6 +612,7 @@ getaddrinfo(const char *, #endif #ifndef HAVE_GETNAMEINFO +#define getnameinfo rk_getnameinfo int ROKEN_LIB_FUNCTION getnameinfo(const struct sockaddr *, socklen_t, char *, size_t, @@ -540,11 +621,13 @@ getnameinfo(const struct sockaddr *, socklen_t, #endif #ifndef HAVE_FREEADDRINFO +#define freeaddrinfo rk_freeaddrinfo void ROKEN_LIB_FUNCTION freeaddrinfo(struct addrinfo *); #endif #ifndef HAVE_GAI_STRERROR +#define gai_strerror rk_gai_strerror const char * ROKEN_LIB_FUNCTION gai_strerror(int); #endif @@ -561,25 +644,31 @@ int ROKEN_LIB_FUNCTION roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **); #ifndef HAVE_STRFTIME +#define strftime rk_strftime size_t ROKEN_LIB_FUNCTION strftime (char *, size_t, const char *, const struct tm *); #endif #ifndef HAVE_STRPTIME +#define strptime rk_strptime char * ROKEN_LIB_FUNCTION strptime (const char *, const char *, struct tm *); #endif #ifndef HAVE_EMALLOC +#define emalloc rk_emalloc void * ROKEN_LIB_FUNCTION emalloc (size_t); #endif #ifndef HAVE_ECALLOC +#define ecalloc rk_ecalloc void * ROKEN_LIB_FUNCTION ecalloc(size_t, size_t); #endif #ifndef HAVE_EREALLOC +#define erealloc rk_erealloc void * ROKEN_LIB_FUNCTION erealloc (void *, size_t); #endif #ifndef HAVE_ESTRDUP +#define estrdup rk_estrdup char * ROKEN_LIB_FUNCTION estrdup (const char *); #endif @@ -627,10 +716,12 @@ roken_gethostbyaddr(const void*, size_t, int); #endif #ifndef HAVE_SETPROGNAME +#define setprogname rk_setprogname void ROKEN_LIB_FUNCTION setprogname(const char *); #endif #ifndef HAVE_GETPROGNAME +#define getprogname rk_getprogname const char * ROKEN_LIB_FUNCTION getprogname(void); #endif @@ -642,46 +733,69 @@ void ROKEN_LIB_FUNCTION mini_inetd_addrinfo (struct addrinfo*); void ROKEN_LIB_FUNCTION mini_inetd (int); #ifndef HAVE_LOCALTIME_R +#define localtime_r rk_localtime_r struct tm * ROKEN_LIB_FUNCTION localtime_r(const time_t *, struct tm *); #endif #if !defined(HAVE_STRSVIS) || defined(NEED_STRSVIS_PROTO) +#ifndef HAVE_STRSVIS +#define strsvis rk_strsvis +#endif int ROKEN_LIB_FUNCTION strsvis(char *, const char *, int, const char *); #endif #if !defined(HAVE_STRUNVIS) || defined(NEED_STRUNVIS_PROTO) +#ifndef HAVE_STRUNVIS +#define strunvis rk_strunvis +#endif int ROKEN_LIB_FUNCTION strunvis(char *, const char *); #endif #if !defined(HAVE_STRVIS) || defined(NEED_STRVIS_PROTO) +#ifndef HAVE_STRVIS +#define strvis rk_strvis +#endif int ROKEN_LIB_FUNCTION strvis(char *, const char *, int); #endif #if !defined(HAVE_STRVISX) || defined(NEED_STRVISX_PROTO) +#ifndef HAVE_STRVISX +#define strvisx rk_strvisx +#endif int ROKEN_LIB_FUNCTION strvisx(char *, const char *, size_t, int); #endif #if !defined(HAVE_SVIS) || defined(NEED_SVIS_PROTO) +#ifndef HAVE_SVIS +#define svis rk_svis +#endif char * ROKEN_LIB_FUNCTION svis(char *, int, int, int, const char *); #endif #if !defined(HAVE_UNVIS) || defined(NEED_UNVIS_PROTO) +#ifndef HAVE_UNVIS +#define unvis rk_unvis +#endif int ROKEN_LIB_FUNCTION unvis(char *, int, int *, int); #endif #if !defined(HAVE_VIS) || defined(NEED_VIS_PROTO) +#ifndef HAVE_VIS +#define vis rk_vis +#endif char * ROKEN_LIB_FUNCTION vis(char *, int, int, int); #endif #if !defined(HAVE_CLOSEFROM) +#define closefrom rk_closefrom int ROKEN_LIB_FUNCTION closefrom(int); #endif diff --git a/lib/roken/version-script.map b/lib/roken/version-script.map index 4276b9f0d..e985f9c4c 100644 --- a/lib/roken/version-script.map +++ b/lib/roken/version-script.map @@ -2,109 +2,153 @@ HEIMDAL_ROKEN_1.0 { global: arg_printusage; arg_printusage_i18n; - asnprintf; - asprintf; base64_decode; base64_encode; - bswap16; - bswap32; cgetcap; cgetclose; - cgetent; cgetmatch; cgetnum; cgetset; - cgetstr; cgetustr; - closefrom; - copyhostent; dns_free_data; dns_lookup; dns_srv_order; dns_string_to_type; dns_type_to_string; - ecalloc; - emalloc; - eread; - erealloc; err; errx; - esetenv; - estrdup; - ewrite; - free_environment; free_getarg_strings; - freeaddrinfo; - freehostent; - gai_strerror; get_default_username; get_window_size; - getaddrinfo; getarg; - getipnodebyaddr; - getipnodebyname; - getnameinfo; getnameinfo_verified; - getprogname; glob; globfree; hex_decode; hex_encode; - hostent_find_fqdn; - inet_ntop; - inet_pton; issuid; k_getpwnam; k_getpwuid; - localtime_r; mini_inetd; mini_inetd_addrinfo; - mkstemp; net_read; net_write; parse_bytes; parse_flags; parse_time; parse_units; - pid_file_delete; - pid_file_write; - pidfile; - pipe_execv; print_flags_table; print_time_table; print_units_table; - read_environment; - readv; + rk_asnprintf; + rk_asprintf; + rk_bswap16; + rk_bswap32; + rk_cgetent; + rk_cgetstr; rk_cloexec; rk_cloexec_file; + rk_closefrom; + rk_copyhostent; rk_dns_free_data; rk_dns_lookup; rk_dns_srv_order; rk_dns_string_to_type; rk_dns_type_to_string; rk_dumpdata; + rk_ecalloc; + rk_emalloc; + rk_eread; + rk_erealloc; + rk_esetenv; + rk_estrdup; + rk_ewrite; rk_fnmatch; + rk_free_environment; + rk_freeaddrinfo; + rk_freehostent; rk_freeifaddrs; + rk_gai_strerror; + rk_getaddrinfo; rk_getifaddrs; + rk_getipnodebyaddr; + rk_getipnodebyname; + rk_getnameinfo; + rk_getprogname; rk_glob; rk_globfree; rk_hex_decode; rk_hex_encode; + rk_hostent_find_fqdn; + rk_inet_ntop; + rk_inet_pton; + rk_localtime_r; + rk_mkstemp; + rk_pid_file_delete; + rk_pid_file_write; + rk_pidfile; + rk_pipe_execv; + rk_read_environment; + rk_readv; rk_realloc; + rk_setprogname; + rk_simple_execle; + rk_simple_execlp; + rk_simple_execve; + rk_simple_execve_timed; + rk_simple_execvp; + rk_simple_execvp_timed; + rk_socket_addr_size; + rk_socket_get_address; + rk_socket_get_port; + rk_socket_set_address_and_port; + rk_socket_set_any; + rk_socket_set_debug; + rk_socket_set_ipv6only; + rk_socket_set_port; + rk_socket_set_portrange; + rk_socket_set_reuseaddr; + rk_socket_set_tos; + rk_socket_sockaddr_size; + rk_strcollect; + rk_strftime; + rk_strlcat; + rk_strlcpy; + rk_strlwr; + rk_strndup; + rk_strnlen; rk_strpoolcollect; rk_strpoolfree; rk_strpoolprintf; + rk_strptime; + rk_strsep_copy; + rk_strsvis; rk_strsvis; rk_strsvisx; rk_strunvis; + rk_strunvis; rk_strunvisx; + rk_strupr; + rk_strvis; rk_strvis; rk_strvisx; + rk_strvisx; + rk_svis; rk_svis; rk_timegm; + rk_timevaladd; + rk_timevalfix; + rk_timevalsub; rk_undumpdata; rk_unvis; + rk_vasnprintf; + rk_vasprintf; rk_vis; + rk_vis; + rk_vsnprintf; + rk_vstrcollect; + rk_wait_for_process; + rk_wait_for_process_timed; rk_warnerr; rk_xfree; roken_concat; @@ -132,45 +176,8 @@ HEIMDAL_ROKEN_1.0 { rtbl_set_flags; rtbl_set_prefix; rtbl_set_separator; - setprogname; signal; simple_execl; - simple_execle; - simple_execlp; - simple_execve; - simple_execve_timed; - simple_execvp; - simple_execvp_timed; - socket_addr_size; - socket_get_address; - socket_get_port; - socket_set_address_and_port; - socket_set_any; - socket_set_debug; - socket_set_ipv6only; - socket_set_port; - socket_set_portrange; - socket_set_reuseaddr; - socket_set_tos; - socket_sockaddr_size; - strcollect; - strftime; - strlcat; - strlcpy; - strlwr; - strndup; - strnlen; - strptime; - strsep_copy; - strsvis; - strunvis; - strupr; - strvis; - strvisx; - svis; - timevaladd; - timevalfix; - timevalsub; tm2time; unix_verify_user; unparse_bytes; @@ -180,18 +187,10 @@ HEIMDAL_ROKEN_1.0 { unparse_time_approx; unparse_units; unparse_units_approx; - unvis; - vasnprintf; - vasprintf; verr; verrx; - vis; - vsnprintf; - vstrcollect; vwarn; vwarnx; - wait_for_process; - wait_for_process_timed; warn; warnx; writev;