 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.209 2013/02/26 00:45:27 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg 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,39 +59,39 @@
  * 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: main.c,v 1.209 2013/02/26 00:45:27 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.209 2013/02/26 00:45:27 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.210 2013/03/23 05:31:29 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -729,27 +729,27 @@ MakeMode(const char *mode)
+{
     char *mp = NULL;
     if (!mode)
 	mode = mp = Var_Subst(NULL, "${" MAKE_MODE ":tl}", VAR_GLOBAL, 0);
     if (mode && *mode) {
 	if (strstr(mode, "compat")) {
 	    compatMake = TRUE;
 	    forceJobs = FALSE;
+	}
 #if USE_META
 	if (strstr(mode, "meta"))
-	    meta_init(mode);
+	    meta_mode_init(mode);
 #endif
+    }
     if (mp)
 	free(mp);
+}
 /*-
  * main --
  *	The main function, for obvious reasons. Initializes variables
  *	and a few modules, then parses the arguments give it in the
  *	environment and on the command line. Reads the system makefile
  *	followed by either Makefile, makefile or the file given by the
  *	-f argument. Sets the .MAKEFLAGS PMake variable based on all the
 @@ -941,26 +941,29 @@ main(int argc, char **argv)
 	    const char *ep;
 	    if (!(ep = getenv(MAKE_LEVEL))) {
 		ep = "0";
+	    }
 	    Var_Set(MAKE_LEVEL, ep, VAR_GLOBAL, 0);
 	    snprintf(tmp, sizeof(tmp), "%u", myPid);
 	    Var_Set(".MAKE.PID", tmp, VAR_GLOBAL, 0);
 	    snprintf(tmp, sizeof(tmp), "%u", getppid());
 	    Var_Set(".MAKE.PPID", tmp, VAR_GLOBAL, 0);
+	}
 	Job_SetPrefix();
 #ifdef USE_META
 	meta_init();
 #endif
 	/*
 	 * First snag any flags out of the MAKE environment variable.
 	 * (Note this is *not* MAKEFLAGS since /bin/make uses that and it's
 	 * in a different format).
 	 */
 #ifdef POSIX
 	Main_ParseArgLine(getenv("MAKEFLAGS"));
 #else
 	Main_ParseArgLine(getenv("MAKE"));
 #endif
 	/*
 	 * Find where we are (now).

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.211 2013/03/05 22:01:44 christos Exp $
+.\"	$NetBSD: make.1,v 1.212 2013/03/23 05:31:29 sjg 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
 @@ -19,27 +19,27 @@
 .\" 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.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd March 5, 2013
+.Dd March 22, 2013
 .Dt MAKE 1
 .Os
 .Sh NAME
 .Nm make
 .Nd maintain program dependencies
 .Sh SYNOPSIS
 .Nm
 .Op Fl BeikNnqrstWX
 .Op Fl C Ar directory
 .Op Fl D Ar variable
 .Op Fl d Ar flags
 .Op Fl f Ar makefile
 .Op Fl I Ar directory
 @@ -864,26 +864,33 @@ The default value is:
 This variable is used to record the names of variables assigned to
 on the command line, so that they may be exported as part of
 .Ql Ev MAKEFLAGS .
 This behaviour can be disabled by assigning an empty value to
 .Ql Va .MAKEOVERRIDES
 within a makefile.
 Extra variables can be exported from a makefile
 by appending their names to
 .Ql Va .MAKEOVERRIDES .
 .Ql Ev MAKEFLAGS
 is re-exported whenever
 .Ql Va .MAKEOVERRIDES
 is modified.
 .It Va .MAKE.PATH_FILEMON
 If
 .Nm
 was built with
 .Xr filemon 4
 support, this is set to the path of the device node.
 This allows makefiles to test for this support.
 .It Va .MAKE.PID
 The process-id of
 .Nm .
 .It Va .MAKE.PPID
 The parent process-id of
 .Nm .
 .It Va MAKE_PRINT_VAR_ON_ERROR
 When
 .Nm
 stops due to an error, it prints its name and the value of
 .Ql Va .CURDIR
 as well as the value of any variables named in
 .Ql Va MAKE_PRINT_VAR_ON_ERROR .

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.26 2013/01/19 04:23:37 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.27 2013/03/23 05:31:29 sjg Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2010, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -529,28 +529,44 @@ static Boolean
 boolValue(char *s)
+{
     switch(*s) {
     case '0':
     case 'N':
     case 'n':
     case 'F':
     case 'f':
 	return FALSE;
+    }
     return TRUE;
+}
 /*
  * Initialization we need before reading makefiles.
  */
 void
 meta_init()
+{
 #ifdef USE_FILEMON
 	/* this allows makefiles to test if we have filemon support */
 	Var_Set(".MAKE.PATH_FILEMON", _PATH_FILEMON, VAR_GLOBAL, 0);
 #endif
+}
 /*
  * Initialization we need after reading makefiles.
  */
 void
-meta_init(const char *make_mode)
+meta_mode_init(const char *make_mode)
+{
     static int once = 0;
     char *cp;
     useMeta = TRUE;
     useFilemon = TRUE;
     writeMeta = TRUE;
     if (make_mode) {
 	if (strstr(make_mode, "env"))
 	    metaEnv = TRUE;
 	if (strstr(make_mode, "verb"))
 	    metaVerbose = TRUE;

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.h,v 1.2 2011/03/30 22:03:49 sjg Exp $ */
+/*      $NetBSD: meta.h,v 1.3 2013/03/23 05:31:29 sjg Exp $ */
 /*
  * Things needed for 'meta' mode.
  */
 /*
  * Copyright (c) 2009-2010, Juniper Networks, Inc.
+ *
  * 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
 @@ -31,24 +31,25 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 typedef struct BuildMon {
     char	meta_fname[MAXPATHLEN];
     int		filemon_fd;
     int		mon_fd;
     FILE	*mfp;
 } BuildMon;
 extern Boolean useMeta;
 struct Job;				/* not defined yet */
-void meta_init(const char *);
+void meta_init(void);
 void meta_mode_init(const char *);
 void meta_job_start(struct Job *, GNode *);
 void meta_job_child(struct Job *);
 void meta_job_error(struct Job *, GNode *, int, int);
 void meta_job_output(struct Job *, char *, const char *);
 void meta_cmd_finish(void *);
 void meta_job_finish(struct Job *);
 Boolean meta_oodate(GNode *, Boolean);
 void meta_compat_start(void);
 void meta_compat_child(void);
 void meta_compat_parent(void);