--- embedaddon/sudo/plugins/sudoers/boottime.c	2013/07/22 10:46:12	1.1.1.3
+++ embedaddon/sudo/plugins/sudoers/boottime.c	2014/06/15 16:12:54	1.1.1.4
@@ -28,6 +28,11 @@
 #  include <stdlib.h>
 # endif
 #endif /* STDC_HEADERS */
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# include "compat/stdbool.h"
+#endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
 # if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
 #  include <memory.h>
@@ -38,7 +43,7 @@
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
 #include <limits.h>
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
 # include <time.h>
 #endif
 #ifndef __linux__
@@ -60,13 +65,14 @@
  */
 
 #if defined(__linux__)
-int
+bool
 get_boottime(struct timeval *tv)
 {
     char *ep, *line = NULL;
     size_t linesize = 0;
+    bool found = false;
     ssize_t len;
-    FILE * fp;
+    FILE *fp;
     debug_decl(get_boottime, SUDO_DEBUG_UTIL)
 
     /* read btime from /proc/stat */
@@ -74,33 +80,25 @@ get_boottime(struct timeval *tv)
     if (fp != NULL) {
 	while ((len = getline(&line, &linesize, fp)) != -1) {
 	    if (strncmp(line, "btime ", 6) == 0) {
-#ifdef HAVE_STRTOLL
-		long long llval = strtoll(line + 6, &ep, 10);
-		if (line[6] != '\0' && *ep == '\0' && (time_t)llval == llval) {
+		long long llval = strtonum(line + 6, 1, LLONG_MAX, NULL);
+		if (llval > 0) {
 		    tv->tv_sec = (time_t)llval;
 		    tv->tv_usec = 0;
-		    debug_return_bool(1);
+		    found = true;
+		    break;
 		}
-#else
-		long lval = strtol(line + 6, &ep, 10);
-		if (line[6] != '\0' && *ep == '\0' && (time_t)lval == lval) {
-		    tv->tv_sec = (time_t)llval;
-		    tv->tv_usec = 0;
-		    debug_return_bool(1);
-		}
-#endif
 	    }
 	}
 	fclose(fp);
 	free(line);
     }
 
-    debug_return_bool(0);
+    debug_return_bool(found);
 }
 
 #elif defined(HAVE_SYSCTL) && defined(KERN_BOOTTIME)
 
-int
+bool
 get_boottime(struct timeval *tv)
 {
     size_t size;
@@ -111,9 +109,9 @@ get_boottime(struct timeval *tv)
     mib[1] = KERN_BOOTTIME;
     size = sizeof(*tv);
     if (sysctl(mib, 2, tv, &size, NULL, 0) != -1)
-	debug_return_bool(1);
+	debug_return_bool(true);
 
-    debug_return_bool(0);
+    debug_return_bool(false);
 }
 
 #elif defined(HAVE_GETUTXID)
@@ -160,6 +158,6 @@ int
 get_boottime(struct timeval *tv)
 {
     debug_decl(get_boottime, SUDO_DEBUG_UTIL)
-    debug_return_bool(0);
+    debug_return_bool(false);
 }
 #endif