From 938bc384f44031877543765a9ae18c764f5da9c8 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 8 Jan 2010 10:47:26 -0800 Subject: dhcpcd: Upgrade from 4.0.1 to 4.0.15 Signed-off-by: Dmitry Shmidt --- common.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'common.c') diff --git a/common.c b/common.c index d90c7d2..da22a5c 100644 --- a/common.c +++ b/common.c @@ -69,7 +69,8 @@ get_line(char **line, size_t *len, FILE *fp) } p = *line + last; memset(p, 0, BUFSIZ); - fgets(p, BUFSIZ, fp); + if (fgets(p, BUFSIZ, fp) == NULL) + break; last += strlen(p); if (last && (*line)[last - 1] == '\n') { (*line)[last - 1] = '\0'; @@ -201,9 +202,8 @@ get_monotonic(struct timeval *tp) if (posix_clock_set == 0) { if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) { posix_clock = CLOCK_MONOTONIC; - clock_monotonic = 1; + clock_monotonic = posix_clock_set = 1; } - posix_clock_set = 1; } if (clock_monotonic) { @@ -225,9 +225,8 @@ get_monotonic(struct timeval *tp) if (posix_clock_set == 0) { if (mach_timebase_info(&info) == KERN_SUCCESS) { factor = (double)info.numer / (double)info.denom; - clock_monotonic = 1; + clock_monotonic = posix_clock_set = 1; } - posix_clock_set = 1; } if (clock_monotonic) { nano = mach_absolute_time(); -- cgit v1.1