diff options
Diffstat (limited to 'sysutils/rmonitor/files/patch-utmpx')
-rw-r--r-- | sysutils/rmonitor/files/patch-utmpx | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/sysutils/rmonitor/files/patch-utmpx b/sysutils/rmonitor/files/patch-utmpx deleted file mode 100644 index 74701016bf05..000000000000 --- a/sysutils/rmonitor/files/patch-utmpx +++ /dev/null @@ -1,51 +0,0 @@ ---- src/rmonitor.c -+++ src/rmonitor.c -@@ -88,7 +88,7 @@ - #include <sys/vmmeter.h> - #include <time.h> - #include <unistd.h> --#include <utmp.h> -+#include <utmpx.h> - - - #define DEFTOL 2.5 /* default tolerance */ -@@ -300,7 +300,7 @@ - int memfre = 0; - int memtot = 0; - int memuse = 0; -- int nu = -1; -+ int nu = 0; - int np = -1; - int openf = -1; - int pgcnt = 0; -@@ -309,9 +309,8 @@ - int pgsize = 0; - int slvl = 0; - int vn[3]; -- int utfd; - time_t ct; -- struct utmp utmprec; -+ struct utmpx *utmprec; - - union { - char buf[STRLEN]; -@@ -402,14 +401,12 @@ - - if (getloadavg(lavg, samples) != samples) errmsg("getloadavg"); - -- if ((utfd = open(_PATH_UTMP, O_RDONLY)) >= 0) { -- nu = 0; -- while (read(utfd, &utmprec, sizeof utmprec) > 0) -- if (*(utmprec.ut_name)) nu++; -- if (close(utfd) < 0) errmsg("close"); -+ setutxent(); -+ while ((utmprec = getutxent()) != NULL) { -+ if (utmprec->ut_type == USER_PROCESS) -+ nu++; - } -- else -- errmsg("open"); -+ endutxent(); - - #if __FreeBSD_version >= 420000 - snprintf(stat, STRLEN, |