From 68f09414332cfa9fa592fc0547d4ccb9a6cb40a8 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 22 Dec 2020 14:59:47 +1100 Subject: [PATCH] Merge branch 'awilfox/procps-utmpx-support' References: procps-ng/procps!67 --- configure.ac | 2 +- w.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f9375d40..84f0f18f 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ AC_PROG_MAKE_SET # Checks for header files. AC_HEADER_MAJOR -AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) # Checks for typedefs, structures, and compiler characteristics. AC_CHECK_HEADER_STDBOOL diff --git a/w.c b/w.c index bf275631..9c43bbd6 100644 --- a/w.c +++ b/w.c @@ -43,7 +43,11 @@ #include #include #include -#include +#ifdef HAVE_UTMPX_H +# include +#else +# include +#endif #include #include "c.h" @@ -57,7 +61,17 @@ static int ignoreuser = 0; /* for '-u' */ static int oldstyle = 0; /* for '-o' */ +#ifdef HAVE_UTMPX_H +typedef struct utmpx utmp_t; +#else typedef struct utmp utmp_t; +#endif + +#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +# define UT_HOSTSIZE __UT_HOSTSIZE +# define UT_LINESIZE __UT_LINESIZE +# define UT_NAMESIZE __UT_NAMESIZE +#endif #ifdef W_SHOWFROM # define FROM_STRING "on" @@ -471,7 +485,11 @@ static void showinfo( printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, u->ut_line); if (from) print_from(u, ip_addresses, fromlen); +#ifdef HAVE_UTMPX_H + print_logintime(u->ut_tv.tv_sec, stdout); +#else print_logintime(u->ut_time, stdout); +#endif if (*u->ut_line == ':') /* idle unknown for xdm logins */ printf(" ?xdm? "); @@ -653,11 +671,19 @@ int main(int argc, char **argv) printf(_(" IDLE WHAT\n")); } +#ifdef HAVE_UTMPX_H + setutxent(); +#else utmpname(UTMP_FILE); setutent(); +#endif if (user) { for (;;) { +#ifdef HAVE_UTMPX_H + u = getutxent(); +#else u = getutent(); +#endif if (!u) break; if (u->ut_type != USER_PROCESS) @@ -668,7 +694,11 @@ int main(int argc, char **argv) } } else { for (;;) { +#ifdef HAVE_UTMPX_H + u = getutxent(); +#else u = getutent(); +#endif if (!u) break; if (u->ut_type != USER_PROCESS) @@ -678,7 +708,11 @@ int main(int argc, char **argv) fromlen, ip_addresses); } } +#ifdef HAVE_UTMPX_H + endutxent(); +#else endutent(); +#endif return EXIT_SUCCESS; }