--- utmpx.h.orig 2004-08-05 14:37:28.000000000 -0700 +++ utmpx.h 2004-08-05 15:42:48.000000000 -0700 @@ -38,28 +38,26 @@ #ifndef _UTMPX_H_ #define _UTMPX_H_ -#include <sys/cdefs.h> -#include <sys/featuretest.h> -#include <sys/socket.h> +#include <_types.h> #include <sys/time.h> +#ifndef _PID_T +#define _PID_T +typedef __darwin_pid_t pid_t; +#endif + #define _PATH_UTMPX "/var/run/utmpx" -#define _PATH_WTMPX "/var/log/wtmpx" -#define _PATH_LASTLOGX "/var/log/lastlogx" #define _PATH_UTMP_UPDATE "/usr/libexec/utmp_update" +#ifndef _POSIX_C_SOURCE +#define UTMPX_FILE _PATH_UTMPX +#endif /* _POSIX_C_SOURCE */ + #define _UTX_USERSIZE 32 #define _UTX_LINESIZE 32 #define _UTX_IDSIZE 4 #define _UTX_HOSTSIZE 256 -#if defined(_NETBSD_SOURCE) -#define UTX_USERSIZE _UTX_USERSIZE -#define UTX_LINESIZE _UTX_LINESIZE -#define UTX_IDSIZE _UTX_IDSIZE -#define UTX_HOSTSIZE _UTX_HOSTSIZE -#endif - #define EMPTY 0 #define RUN_LVL 1 #define BOOT_TIME 2 @@ -69,75 +67,35 @@ #define LOGIN_PROCESS 6 #define USER_PROCESS 7 #define DEAD_PROCESS 8 - -#if defined(_NETBSD_SOURCE) #define ACCOUNTING 9 #define SIGNATURE 10 -#endif /* * The following structure describes the fields of the utmpx entries - * stored in _PATH_UTMPX or _PATH_WTMPX. This is not the format the + * stored in _PATH_UTMPX. This is not the format the * entries are stored in the files, and application should only access * entries using routines described in getutxent(3). */ -#define ut_user ut_name -#define ut_xtime ut_tv.tv_sec - struct utmpx { - char ut_name[_UTX_USERSIZE]; /* login name */ - char ut_id[_UTX_IDSIZE]; /* inittab id */ + char ut_user[_UTX_USERSIZE]; /* login name */ + char ut_id[_UTX_IDSIZE]; /* id */ char ut_line[_UTX_LINESIZE]; /* tty name */ - char ut_host[_UTX_HOSTSIZE]; /* host name */ - uint16_t ut_session; /* session id used for windowing */ - uint16_t ut_type; /* type of this entry */ pid_t ut_pid; /* process id creating the entry */ - struct { - uint16_t e_termination; /* process termination signal */ - uint16_t e_exit; /* process exit status */ - } ut_exit; - struct sockaddr_storage ut_ss; /* address where entry was made from */ + short ut_type; /* type of this entry */ struct timeval ut_tv; /* time entry was created */ - uint32_t ut_pad[10]; /* reserved for future use */ -}; - -#if defined(_NETBSD_SOURCE) -struct lastlogx { - struct timeval ll_tv; /* time entry was created */ - char ll_line[_UTX_LINESIZE]; /* tty name */ - char ll_host[_UTX_HOSTSIZE]; /* host name */ - struct sockaddr_storage ll_ss; /* address where entry was made from */ + char ut_host[_UTX_HOSTSIZE]; /* host name */ + __uint32_t ut_pad[16]; /* reserved for future use */ }; -#endif /* !_XOPEN_SOURCE */ __BEGIN_DECLS -void setutxent __P((void)); -void endutxent __P((void)); -struct utmpx *getutxent __P((void)); -struct utmpx *getutxid __P((const struct utmpx *)); -struct utmpx *getutxline __P((const struct utmpx *)); -struct utmpx *pututxline __P((const struct utmpx *)); - -#if defined(_NETBSD_SOURCE) -int updwtmpx __P((const char *, const struct utmpx *)); -int lastlogxname __P((const char *)); -#ifdef __LIBC12_SOURCE__ -struct lastlogx *getlastlogx __P((uid_t, struct lastlogx *)); -struct lastlogx *__getlastlogx13 __P((const char *, uid_t, struct lastlogx *)); -#else -struct lastlogx *getlastlogx __P((const char *, uid_t, struct lastlogx *)) - __RENAME(__getlastlogx13); -#endif -int updlastlogx __P((const char *, uid_t, struct lastlogx *)); -struct utmp; -void getutmp __P((const struct utmpx *, struct utmp *)); -void getutmpx __P((const struct utmp *, struct utmpx *)); - -int utmpxname __P((const char *)); - -#endif /* _NETBSD_SOURCE */ +void setutxent(void); +void endutxent(void); +struct utmpx *getutxent(void); +struct utmpx *getutxid(const struct utmpx *); +struct utmpx *getutxline(const struct utmpx *); +struct utmpx *pututxline(const struct utmpx *); __END_DECLS