 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos 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.192 2013/10/18 20:47:06 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -351,26 +351,27 @@ static void ParseVErrorInternal(FILE *,
     MAKE_ATTR_PRINTFLIKE(5, 0);
 static int ParseFindKeyword(const char *);
 static int ParseLinkSrc(void *, void *);
 static int ParseDoOp(void *, void *);
 static void ParseDoSrc(int, const char *);
 static int ParseFindMain(void *, void *);
 static int ParseAddDir(void *, void *);
 static int ParseClearPath(void *, void *);
 static void ParseDoDependency(char *);
 static int ParseAddCmd(void *, void *);
 static void ParseHasCommands(void *);
 static void ParseDoInclude(char *);
 static void ParseSetParseFile(const char *);
 static void ParseSetIncludedFile(void);
 #ifdef SYSVINCLUDE
 static void ParseTraditionalInclude(char *);
 #endif
 #ifdef GMAKEEXPORT
 static void ParseGmakeExport(char *);
 #endif
 static int ParseEOF(void);
 static char *ParseReadLine(void);
 static void ParseFinishLine(void);
 static void ParseMark(GNode *);
 ////////////////////////////////////////////////////////////
 // file loader
 @@ -835,27 +836,28 @@ ParseMessage(char *line)
 static int
 ParseLinkSrc(void *pgnp, void *cgnp)
+{
     GNode          *pgn = (GNode *)pgnp;
     GNode          *cgn = (GNode *)cgnp;
     if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (pgn->cohorts))
 	pgn = (GNode *)Lst_Datum(Lst_Last(pgn->cohorts));
     (void)Lst_AtEnd(pgn->children, cgn);
     if (specType == Not)
 	    (void)Lst_AtEnd(cgn->parents, pgn);
     pgn->unmade += 1;
     if (DEBUG(PARSE)) {
-	fprintf(debug_file, "# ParseLinkSrc: added child %s - %s\n", pgn->name, cgn->name);
+	fprintf(debug_file, "# %s: added child %s - %s\n", __func__,
 	    pgn->name, cgn->name);
 	Targ_PrintNode(pgn, 0);
 	Targ_PrintNode(cgn, 0);
+    }
     return (0);
+}
 /*-
  *---------------------------------------------------------------------
  * ParseDoOp  --
  *	Apply the parsed operator to the given target node. Used in a
  *	Lst_ForEach call by ParseDoDependency once all targets have
  *	been found and their operator parsed. If the previous and new
  *	operators are incompatible, a major error is taken.
 @@ -1010,28 +1012,28 @@ ParseDoSrc(int tOp, const char *src)
     case Order:
 	/*
 	 * Create proper predecessor/successor links between the previous
 	 * source and the current one.
 	 */
 	gn = Targ_FindNode(src, TARG_CREATE);
 	if (doing_depend)
 	    ParseMark(gn);
 	if (predecessor != NULL) {
 	    (void)Lst_AtEnd(predecessor->order_succ, gn);
 	    (void)Lst_AtEnd(gn->order_pred, predecessor);
 	    if (DEBUG(PARSE)) {
-		fprintf(debug_file, "# ParseDoSrc: added Order dependency %s - %s\n",
+		fprintf(debug_file, "# %s: added Order dependency %s - %s\n",
-			predecessor->name, gn->name);
+		    __func__, predecessor->name, gn->name);
 		Targ_PrintNode(predecessor, 0);
 		Targ_PrintNode(gn, 0);
+	    }
+	}
 	/*
 	 * The current source now becomes the predecessor for the next one.
 	 */
 	predecessor = gn;
 	break;
     default:
 	/*
 	 * If the source is not an attribute, we need to find/create
 @@ -2154,26 +2156,27 @@ Parse_include_file(char *file, Boolean i
     /* Actually open the file... */
     fd = open(fullname, O_RDONLY);
     if (fd == -1) {
 	if (!silent)
 	    Parse_Error(PARSE_FATAL, "Cannot open %s", fullname);
 	free(fullname);
 	return;
+    }
     /* load it */
     lf = loadfile(fullname, fd);
     ParseSetIncludedFile();
     /* Start reading from this file next */
     Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf);
     curFile->lf = lf;
+}
 static void
 ParseDoInclude(char *line)
+{
     char          endc;	    	/* the character which ends the file spec */
     char          *cp;		/* current position in file spec */
     int		  silent = (*line != 'i') ? 1 : 0;
     char	  *file = &line[7 + silent];
 @@ -2213,26 +2216,61 @@ ParseDoInclude(char *line)
     /*
      * Substitute for any variables in the file name before trying to
      * find the thing.
      */
     file = Var_Subst(NULL, file, VAR_CMD, FALSE);
     Parse_include_file(file, endc == '>', silent);
     free(file);
+}
 /*-
  *---------------------------------------------------------------------
  * ParseSetIncludedFile  --
  *	Set the .INCLUDEDFROMFILE variable to the contents of .PARSEFILE
  *	and the .INCLUDEDFROMDIR variable to the contents of .PARSEDIR
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The .INCLUDEDFROMFILE variable is overwritten by the contents
  *	of .PARSEFILE and the .INCLUDEDFROMDIR variable is overwriten
  *	but the contents of .PARSEDIR
  *---------------------------------------------------------------------
  */
 static void
 ParseSetIncludedFile(void)
+{
     char *pf, *fp = NULL;
     char *pd, *dp = NULL;
     pf = Var_Value(".PARSEFILE", VAR_GLOBAL, &fp);
     Var_Set(".INCLUDEDFROMFILE", pf, VAR_GLOBAL, 0);
     pd = Var_Value(".PARSEDIR", VAR_GLOBAL, &dp);
     Var_Set(".INCLUDEDFROMDIR", pd, VAR_GLOBAL, 0);
     if (DEBUG(PARSE))
 	fprintf(debug_file, "%s: ${.INCLUDEDFROMDIR} = `%s' "
 	    "${.INCLUDEDFROMFILE} = `%s'\n", __func__, pd, pf);
     if (fp)
 	free(fp);
     if (dp)
 	free(dp);
+}
 /*-
  *---------------------------------------------------------------------
  * ParseSetParseFile  --
  *	Set the .PARSEDIR and .PARSEFILE variables to the dirname and
  *	basename of the given filename
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The .PARSEDIR and .PARSEFILE variables are overwritten by the
  *	dirname and basename of the given filename.
  *---------------------------------------------------------------------
  */
 static void
 @@ -2246,28 +2284,28 @@ ParseSetParseFile(const char *filename)
     if (slash == NULL) {
 	Var_Set(".PARSEDIR", pd = curdir, VAR_GLOBAL, 0);
 	Var_Set(".PARSEFILE", pf = filename, VAR_GLOBAL, 0);
 	dirname= NULL;
     } else {
 	len = slash - filename;
 	dirname = bmake_malloc(len + 1);
 	memcpy(dirname, filename, len);
 	dirname[len] = '\0';
 	Var_Set(".PARSEDIR", pd = dirname, VAR_GLOBAL, 0);
 	Var_Set(".PARSEFILE", pf = slash + 1, VAR_GLOBAL, 0);
+    }
     if (DEBUG(PARSE))
-	fprintf(debug_file, "ParseSetParseFile: ${.PARSEDIR} = `%s' "
+	fprintf(debug_file, "%s: ${.PARSEDIR} = `%s' ${.PARSEFILE} = `%s'\n",
-	    "${.PARSEFILE} = `%s'\n", pd, pf);
+	    __func__, pd, pf);
     free(dirname);
+}
 /*
  * Track the makefiles we read - so makefiles can
  * set dependencies on them.
  * Avoid adding anything more than once.
  */
 static void
 ParseTrackInput(const char *name)
+{
     char *old;
 @@ -2309,28 +2347,28 @@ ParseTrackInput(const char *name)
 void
 Parse_SetInput(const char *name, int line, int fd,
 	char *(*nextbuf)(void *, size_t *), void *arg)
+{
     char *buf;
     size_t len;
     if (name == NULL)
 	name = curFile->fname;
     else
 	ParseTrackInput(name);
     if (DEBUG(PARSE))
-	fprintf(debug_file, "Parse_SetInput: file %s, line %d, fd %d, nextbuf %p, arg %p\n",
+	fprintf(debug_file, "%s: file %s, line %d, fd %d, nextbuf %p, arg %p\n",
-		name, line, fd, nextbuf, arg);
+	    __func__, name, line, fd, nextbuf, arg);
     if (fd == -1 && nextbuf == NULL)
 	/* sanity */
 	return;
     if (curFile != NULL)
 	/* Save exiting file info */
 	Lst_AtFront(includes, curFile);
     /* Allocate and fill in new structure */
     curFile = bmake_malloc(sizeof *curFile);
     /*
 @@ -2382,27 +2420,27 @@ Parse_SetInput(const char *name, int lin
  *	fname and curFILE are altered for the new file
  *---------------------------------------------------------------------
  */
 static void
 ParseTraditionalInclude(char *line)
+{
     char          *cp;		/* current position in file spec */
     int		   done = 0;
     int		   silent = (line[0] != 'i') ? 1 : 0;
     char	  *file = &line[silent + 7];
     char	  *all_files;
     if (DEBUG(PARSE)) {
-	    fprintf(debug_file, "ParseTraditionalInclude: %s\n", file);
+	    fprintf(debug_file, "%s: %s\n", __func__, file);
+    }
     /*
      * Skip over whitespace
      */
     while (isspace((unsigned char)*file))
 	file++;
     /*
      * Substitute for any variables in the file name before trying to
      * find the thing.
      */
     all_files = Var_Subst(NULL, file, VAR_CMD, FALSE);
 @@ -2441,27 +2479,27 @@ ParseTraditionalInclude(char *line)
  *	None
+ *
  * Side Effects:
  *	None
  *---------------------------------------------------------------------
  */
 static void
 ParseGmakeExport(char *line)
+{
     char	  *variable = &line[6];
     char	  *value;
     if (DEBUG(PARSE)) {
-	    fprintf(debug_file, "ParseGmakeExport: %s\n", variable);
+	    fprintf(debug_file, "%s: %s\n", __func__, variable);
+    }
     /*
      * Skip over whitespace
      */
     while (isspace((unsigned char)*variable))
 	variable++;
     for (value = variable; *value && *value != '='; value++)
 	continue;
     if (*value != '=') {
 	Parse_Error(PARSE_FATAL,
 @@ -2521,26 +2559,27 @@ ParseEOF(void)
+    }
     /* Dispose of curFile info */
     /* Leak curFile->fname because all the gnodes have pointers to it */
     free(curFile->P_str);
     free(curFile);
     curFile = Lst_DeQueue(includes);
     if (curFile == NULL) {
 	/* We've run out of input */
 	Var_Delete(".PARSEDIR", VAR_GLOBAL);
 	Var_Delete(".PARSEFILE", VAR_GLOBAL);
 	Var_Delete(".INCLUDED_FROM", VAR_GLOBAL);
 	return DONE;
+    }
     if (DEBUG(PARSE))
 	fprintf(debug_file, "ParseEOF: returning to file %s, line %d\n",
 	    curFile->fname, curFile->lineno);
     /* Restore the PARSEDIR/PARSEFILE variables */
     ParseSetParseFile(curFile->fname);
     return (CONTINUE);
+}
 #define PARSE_RAW 1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
+.\"	$NetBSD: make.1,v 1.227 2014/01/10 16:12:52 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -628,26 +628,30 @@ The seven local variables are as follows
 .Bl -tag -width ".ARCHIVE"
 .It Va .ALLSRC
 The list of all sources for this target; also known as
 .Ql Va \&\*[Gt] .
 .It Va .ARCHIVE
 The name of the archive file.
 .It Va .IMPSRC
 In suffix-transformation rules, the name/path of the source from which the
 target is to be transformed (the
 .Dq implied
 source); also known as
 .Ql Va \&\*[Lt] .
 It is not defined in explicit rules.
 .It Va .INCLUDEDFROMDIR
 The directory of the file this Makefile was included from.
 .It Va .INCLUDEDFROMFILE
 The filename of the file this Makefile was included from.
 .It Va .MEMBER
 The name of the archive member.
 .It Va .OODATE
 The list of sources for this target that were deemed out-of-date; also
 known as
 .Ql Va \&? .
 .It Va .PREFIX
 The file prefix of the target, containing only the file portion, no suffix
 or preceding directory components; also known as
 .Ql Va * .
 .It Va .TARGET
 The name of the target; also known as
 .Ql Va @ .