Patch from Shaun Jackman:
Replace uptime with time(NULL). time is more portable than uptime and
eliminates the need to define uptime, reducing code size slightly.
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 7cc2be4..da01ddd 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -79,7 +79,7 @@
/* wait arp reply, and check it */
tm.tv_usec = 0;
- prevTime = uptime();
+ prevTime = time(NULL);
while (timeout > 0) {
FD_ZERO(&fdset);
FD_SET(s, &fdset);
@@ -97,8 +97,8 @@
break;
}
}
- timeout -= uptime() - prevTime;
- prevTime = uptime();
+ timeout -= time(NULL) - prevTime;
+ prevTime = time(NULL);
}
close(s);
DEBUG(LOG_INFO, "%salid arp replies for this address", rv ? "No v" : "V");
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index bf2ac44..6ca7371 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -37,14 +37,6 @@
static int daemonized;
-long uptime(void)
-{
- struct sysinfo info;
- sysinfo(&info);
- return info.uptime;
-}
-
-
/*
* This function makes sure our first socket calls
* aren't going to fd 1 (printf badness...) and are
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index ca19a24..cdc51cf 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -39,7 +39,6 @@
#include <syslog.h>
#endif
-long uptime(void);
void background(const char *pidfile);
void start_log_and_pid(const char *client_server, const char *pidfile);
void background(const char *pidfile);
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 8009bec..028338f 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -310,7 +310,7 @@
for (;;) {
- tv.tv_sec = timeout - uptime();
+ tv.tv_sec = timeout - time(NULL);
tv.tv_usec = 0;
if (listen_mode != LISTEN_NONE && fd < 0) {
@@ -330,7 +330,7 @@
retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
} else retval = 0; /* If we already timed out, fall through */
- now = uptime();
+ now = time(NULL);
if (retval == 0) {
/* timeout dropped to zero */
switch (state) {