From 123f948a6ec3f391b1711dd9f52587cff90f0c56 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 4 Dec 2015 09:25:13 +0000 Subject: [PATCH] MFC r291359,r291362: r291359: Skip over lines that start with # (comments) r291362: r291359 was incorrect. Skip over tokens that start with `#' as fgetln can return more than one '\n' delimited line in a buffer Handle empty lines too, just in case git-svn-id: svn://svn.freebsd.org/base/stable/10@291761 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/regression/lib/libc/resolv/resolv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/regression/lib/libc/resolv/resolv.c b/tools/regression/lib/libc/resolv/resolv.c index d481ecf2d..2ec3eebd8 100644 --- a/tools/regression/lib/libc/resolv/resolv.c +++ b/tools/regression/lib/libc/resolv/resolv.c @@ -90,8 +90,11 @@ load(const char *fname) char c = line[len]; char *ptr; line[len] = '\0'; - for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) { + if (ptr == '\0' || ptr[0] == '#') + continue; sl_add(hosts, strdup(ptr)); + } line[len] = c; } -- 2.45.0