From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id B915B3858032; Wed, 19 Jan 2022 07:55:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B915B3858032 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: resolver: Process options forward (not backwards) X-Act-Checkin: newlib-cygwin X-Git-Author: Anton Lavrentiev via Cygwin-patches X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: f5d654c24e85f984ff34461934395b36fea2be0f X-Git-Newrev: 3eba4cb6762a6bbe71c5324437f39f7d6a9e4cf8 Message-Id: <20220119075502.B915B3858032@sourceware.org> Date: Wed, 19 Jan 2022 07:55:02 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2022 07:55:02 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3eba4cb6762= a6bbe71c5324437f39f7d6a9e4cf8 commit 3eba4cb6762a6bbe71c5324437f39f7d6a9e4cf8 Author: Anton Lavrentiev via Cygwin-patches Date: Tue Jan 18 11:09:33 2022 -0500 Cygwin: resolver: Process options forward (not backwards) =20 Also, make sure the debug setting propagates to the parser of the remainder of /etc/resolv.conf Diff: --- winsup/cygwin/libc/minires.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/libc/minires.c b/winsup/cygwin/libc/minires.c index 0979daae3..1f9da9461 100644 --- a/winsup/cygwin/libc/minires.c +++ b/winsup/cygwin/libc/minires.c @@ -86,12 +86,12 @@ Read options =20 =20 ***********************************************************************/ -static void get_options(res_state statp, int i, char **words) +static void get_options(res_state statp, int n, char **words) { char *ptr; - int value; + int i, value; =20 - while (i-- > 0) { + for (i =3D 0; i < n; ++i) { if (!strcasecmp("debug", words[i])) { statp->options |=3D RES_DEBUG; DPRINTF(statp->options & RES_DEBUG, "%s: 1\n", words[i]); @@ -208,8 +208,10 @@ static void get_resolv(res_state statp) } } /* Options line */ - else if (!strncasecmp("options", words[0], sizes[0])) + else if (!strncasecmp("options", words[0], sizes[0])) { get_options(statp, i - 1, &words[1]); + debug =3D statp->options & RES_DEBUG; + } } } fclose(fd);