From owner-svn-src-user@freebsd.org Thu Nov 26 07:55:21 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA828A38DC4 for ; Thu, 26 Nov 2015 07:55:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 961AF1164; Thu, 26 Nov 2015 07:55:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ7tK5D017463; Thu, 26 Nov 2015 07:55:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ7tK9q017462; Thu, 26 Nov 2015 07:55:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260755.tAQ7tK9q017462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 07:55:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291361 - user/ngie/more-tests2/tools/regression/lib/libc/resolv X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2015 07:55:21 -0000 Author: ngie Date: Thu Nov 26 07:55:20 2015 New Revision: 291361 URL: https://svnweb.freebsd.org/changeset/base/291361 Log: 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 MFC after: 3 days X-MFC with: r291359 Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c ============================================================================== --- user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 07:06:20 2015 (r291360) +++ user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 07:55:20 2015 (r291361) @@ -87,13 +87,14 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); while ((line = fgetln(fp, &len)) != NULL) { - if (line[0] == '#') - continue; 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; }