[BACK]Return to boottime.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / plugins / sudoers

Diff for /embedaddon/sudo/plugins/sudoers/boottime.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:26:49 version 1.1.1.3, 2013/07/22 10:46:12
Line 1 Line 1
 /*  /*
 * Copyright (c) 2009-2011 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2009-2013 Todd C. Miller <Todd.Miller@courtesan.com>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 16 Line 16
   
 #include <config.h>  #include <config.h>
   
 #include <sys/param.h>  
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/time.h>  #include <sys/time.h>
   
Line 64 Line 63
 int  int
 get_boottime(struct timeval *tv)  get_boottime(struct timeval *tv)
 {  {
    char *line = NULL;    char *ep, *line = NULL;
     size_t linesize = 0;      size_t linesize = 0;
     ssize_t len;      ssize_t len;
     FILE * fp;      FILE * fp;
Line 75  get_boottime(struct timeval *tv) Line 74  get_boottime(struct timeval *tv)
     if (fp != NULL) {      if (fp != NULL) {
         while ((len = getline(&line, &linesize, fp)) != -1) {          while ((len = getline(&line, &linesize, fp)) != -1) {
             if (strncmp(line, "btime ", 6) == 0) {              if (strncmp(line, "btime ", 6) == 0) {
                tv->tv_sec = atoi(line + 6);#ifdef HAVE_STRTOLL
                tv->tv_usec = 0;                long long llval = strtoll(line + 6, &ep, 10);
                debug_return_bool(1);                if (line[6] != '\0' && *ep == '\0' && (time_t)llval == llval) {
                     tv->tv_sec = (time_t)llval;
                     tv->tv_usec = 0;
                     debug_return_bool(1);
                 }
 #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);          fclose(fp);
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>