emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'awilfox/procps-utmpx-support'

Browse Source 
References:
 procps-ng/procps!67
This commit is contained in:
Craig Small 2020-12-22 14:59:47 +11:00
commit e0a02f7989
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -51,7 +51,7 @@ else
fi fi
# Checks for header files. # Checks for header files.
AC_HEADER_MAJOR AC_HEADER_MAJOR
AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h netinet/in.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 netinet/in.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. # Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_HEADER_STDBOOL AC_CHECK_HEADER_STDBOOL

35
w.c
View File

@ -23,6 +23,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config.h"
#include "c.h" #include "c.h"
#include "fileutils.h" #include "fileutils.h"
#include "nls.h" #include "nls.h"
@ -54,14 +55,28 @@
#include <termios.h> #include <termios.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_UTMPX_H
# include <utmpx.h>
#else
# include <utmp.h> # include <utmp.h>
#endif
#include <arpa/inet.h> #include <arpa/inet.h>
static int ignoreuser = 0; /* for '-u' */ static int ignoreuser = 0; /* for '-u' */
static int oldstyle = 0; /* for '-o' */ static int oldstyle = 0; /* for '-o' */
static proc_t **procs; /* our snapshot of the process table */ static proc_t **procs; /* our snapshot of the process table */
#ifdef HAVE_UTMPX_H
typedef struct utmpx utmp_t;
#else
typedef struct utmp utmp_t; 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 #ifdef W_SHOWFROM
# define FROM_STRING "on" # define FROM_STRING "on"
@ -412,7 +427,11 @@ static void showinfo(utmp_t * u, int formtype, int maxcmd, int from,
printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, u->ut_line); printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, u->ut_line);
if (from) if (from)
print_from(u, ip_addresses, fromlen); 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); print_logintime(u->ut_time, stdout);
#endif
if (*u->ut_line == ':') if (*u->ut_line == ':')
/* idle unknown for xdm logins */ /* idle unknown for xdm logins */
printf(" ?xdm? "); printf(" ?xdm? ");
@ -604,11 +623,19 @@ int main(int argc, char **argv)
printf(_(" IDLE WHAT\n")); printf(_(" IDLE WHAT\n"));
} }
#ifdef HAVE_UTMPX_H
setutxent();
#else
utmpname(UTMP_FILE); utmpname(UTMP_FILE);
setutent(); setutent();
#endif
if (user) { if (user) {
for (;;) { for (;;) {
#ifdef HAVE_UTMPX_H
u = getutxent();
#else
u = getutent(); u = getutent();
#endif
if (unlikely(!u)) if (unlikely(!u))
break; break;
if (u->ut_type != USER_PROCESS) if (u->ut_type != USER_PROCESS)
@ -619,7 +646,11 @@ int main(int argc, char **argv)
} }
} else { } else {
for (;;) { for (;;) {
#ifdef HAVE_UTMPX_H
u = getutxent();
#else
u = getutent(); u = getutent();
#endif
if (unlikely(!u)) if (unlikely(!u))
break; break;
if (u->ut_type != USER_PROCESS) if (u->ut_type != USER_PROCESS)
@ -629,7 +660,11 @@ int main(int argc, char **argv)
fromlen, ip_addresses); fromlen, ip_addresses);
} }
} }
#ifdef HAVE_UTMPX_H
endutxent();
#else
endutent(); endutent();
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }