head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.12 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.6 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.4 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.1.1.0.12 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.10 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.8 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.6 pkgsrc-2008Q1:1.1.1.1.0.4 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.2 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2008.11.06.19.59.04; author snj; state dead; branches; next 1.1; 1.1 date 2007.11.28.11.45.34; author mjl; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.11.28.11.45.34; author mjl; state Exp; branches; next ; desc @@ 1.2 log @Update to 0.6.3. Zillions of bug fixes, see the included ChangeLog for details. @ text @$NetBSD: patch-aa,v 1.1 2007/11/28 11:45:34 mjl Exp $ --- src/os_unix.c.orig 2007-11-28 11:58:20.000000000 +0100 +++ src/os_unix.c 2007-11-28 12:13:49.000000000 +0100 @@@@ -17,6 +17,12 @@@@ #include #endif +#ifndef MAXINT +#include +#include +#define MAXINT INT_MAX +#endif + static int console_idle (time_t now, struct utmp *u) { struct stat sbuf; @@@@ -43,7 +49,7 @@@@ */ UDWORD os_DetermineIdleTime (time_t now, time_t last) { - struct utmp *u; + struct utmpx *u; struct passwd *pass; uid_t uid; int tmp, min = MAXINT; @@@@ -54,9 +60,8 @@@@ if (!pass) return -1; - utmpname (UTMP_FILE); - setutent(); - while ((u = getutent())) + setutxent(); + while ((u = getutxent())) { if (u->ut_type != USER_PROCESS) continue; @@@@ -67,7 +72,7 @@@@ tmp = console_idle (now, u); min = (tmp < min) ? tmp : min ; } - endutent(); + endutxent(); if (min == MAXINT || now - last < min) min = now - last; return min; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of climm-0.6.1. (formerly known as micq) @ text @@