From 8293e58c4cdae24e7bb9042a85a29ce86fb4d492 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 24 Sep 2005 22:31:00 +0000
Subject: [PATCH] More or less fixed calls to sysctl()

---
 src/probe.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/probe.c b/src/probe.c
index 5976d7b..2407ca5 100644
--- a/src/probe.c
+++ b/src/probe.c
@@ -27,6 +27,7 @@ struct sysinfo
 
 static int sysinfo(struct sysinfo * info)
 {
+	struct timeval now;
 	struct timeval tv;
 	struct loadavg la;
 	int mib[2];
@@ -36,18 +37,19 @@ static int sysinfo(struct sysinfo * info)
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_BOOTTIME;
 	len = sizeof(tv);
-	if(sysctl(mib, 2, &tv, &len, NULL, 0) != len)
+	if(gettimeofday(&now, NULL) != 0
+			|| sysctl(mib, 2, &tv, &len, NULL, 0) == -1)
 	{
 		info->uptime = 0;
 		ret++;
 	}
 	else
-		info->uptime = tv.tv_sec;
+		info->uptime = now.tv_sec - tv.tv_sec;
 	/* FIXME getloadavg() looks portable */
 	mib[0] = CTL_VM;
 	mib[1] = VM_LOADAVG;
 	len = sizeof(la);
-	if(sysctl(mib, 2, &la, &len, NULL, 0) != len)
+	if(sysctl(mib, 2, &la, &len, NULL, 0) == -1)
 	{
 		memset(info->loads, 0, sizeof(info->loads));
 		ret++;