[src/trunk]: src/usr.bin/make Initialize curFile->depending in Parse_SetInput.

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef0c1d7d6d24
branches:  trunk
changeset: 343653:ef0c1d7d6d24
user:      sjg <sjg%NetBSD.org@localhost>
date:      Fri Feb 19 06:19:06 2016 +0000

description:
Initialize curFile->depending in Parse_SetInput.

diffstat:

 usr.bin/make/parse.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r dc8843bbef10 -r ef0c1d7d6d24 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Fri Feb 19 04:18:32 2016 +0000
+++ b/usr.bin/make/parse.c      Fri Feb 19 06:19:06 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.211 2016/02/18 18:29:14 christos Exp $     */
+/*     $NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.211 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.211 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2241,7 +2241,6 @@
     /* Start reading from this file next */
     Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf);
     curFile->lf = lf;
-    curFile->depending = doing_depend; /* restore this on EOF */
     if (depinc)
        doing_depend = depinc;          /* only turn it on */
 }
@@ -2459,6 +2458,7 @@
     curFile->nextbuf = nextbuf;
     curFile->nextbuf_arg = arg;
     curFile->lf = NULL;
+    curFile->depending = doing_depend; /* restore this on EOF */
 
     assert(nextbuf != NULL);