From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id E4B663857C53; Wed, 19 Jan 2022 07:55:32 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4B663857C53
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: resolver: Process options forward (not
 backwards)
X-Act-Checkin: newlib-cygwin
X-Git-Author: Anton Lavrentiev via Cygwin-patches <cygwin-patches@cygwin.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 84ff8d9477fa9d2a9770c5c812df0ba7ab282711
X-Git-Newrev: fa279a583dd961497a378758ebbe4ca78f085282
Message-Id: <20220119075532.E4B663857C53@sourceware.org>
Date: Wed, 19 Jan 2022 07:55:32 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2022 07:55:33 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dfa279a583dd=
961497a378758ebbe4ca78f085282

commit fa279a583dd961497a378758ebbe4ca78f085282
Author: Anton Lavrentiev via Cygwin-patches <cygwin-patches@cygwin.com>
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 0cf9efd9b..fdc6087f5 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);