From 6065a492429dafaf59133e2ee09822d131deed5b Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Wed, 24 Nov 2004 07:20:51 +0000
Subject: [PATCH] o Fix proto type o Mention that the left-hand side of the
 comparison conditional   must always be a variable expansion.  Do not lie
 that   debugging .for loops is a no-op. o Update tutorial. o Update man page.
 o Fixed the abuses of .Ql visible on stderr in troff mode. o Fix typos,
 mostly s/ an / a / where appropriate and a few s/an/and/   Add FreeBSD Id tag
 where missing.

Submitted-by: Max Okumoto <okumoto@ucsd.edu>
Taken-from: FreeBSD
---
 usr.bin/make/PSD.doc/tutorial.ms |   3 +-
 usr.bin/make/make.1              | 132 +++++++++++++++----------------
 usr.bin/make/nonints.h           |   4 +-
 usr.bin/make/parse.c             |  41 ++--------
 usr.bin/make/suff.c              |   4 +-
 usr.bin/make/var.c               |  20 ++++-
 6 files changed, 93 insertions(+), 111 deletions(-)

diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index ab7a2fb77e..bf508fa964 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -36,9 +36,8 @@
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
 .\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.8.2.2 2000/11/24 10:08:45 ru Exp $
-.\" $DragonFly: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.4 2004/11/14 20:05:26 dillon Exp $
+.\" $DragonFly: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.5 2004/11/24 07:20:51 dillon Exp $
 .\"
-.so stubs
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
 .\" xH is a macro to provide numbered headers that are automatically stuffed
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index b5bc2274f6..458a1ee3cb 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -31,7 +31,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\" $FreeBSD: src/usr.bin/make/make.1,v 1.29.2.15 2002/12/17 19:01:18 seanc Exp $
-.\" $DragonFly: src/usr.bin/make/make.1,v 1.7 2004/11/24 07:15:46 dillon Exp $
+.\" $DragonFly: src/usr.bin/make/make.1,v 1.8 2004/11/24 07:20:50 dillon Exp $
 .\"
 .Dd July 2, 2004
 .Dt MAKE 1
@@ -63,16 +63,16 @@ Its input is a list of specifications
 describing dependency relationships between the generation of
 files and programs.
 The first of
-.Ql Pa BSDmakefile ,
-.Ql Pa makefile
+.Pa BSDmakefile ,
+.Pa makefile
 and
-.Ql Pa Makefile
+.Pa Makefile
 that can be found in either the current directory or a special object directory
 (see
-.Ql Va .OBJDIR )
+.Va .OBJDIR )
 will be read for this list of specifications.
 If the file
-.Ql Pa .depend
+.Pa .depend
 can be found, it is also read (see
 .Xr mkdep 1 ) .
 .Pp
@@ -117,8 +117,6 @@ Print debugging information about conditional evaluation.
 Print debugging information about directory searching and caching.
 .It Ar f
 Print debugging information about the execution of for loops.
-Currently a
-no-op.
 .It Ar "g1"
 Print the input graph before making anything.
 .It Ar "g2"
@@ -148,13 +146,13 @@ Specify that environment values override macro assignments within
 makefiles for all variables.
 .It Fl f Ar makefile
 Specify a makefile to read instead of the default
-.Ql Pa makefile
+.Pa makefile
 and
-.Ql Pa Makefile .
+.Pa Makefile .
 If
 .Ar makefile
 is
-.Ql \- ,
+.Sq Fl ,
 standard input is read.
 Multiple makefiles may be specified, and are read in the order specified.
 .It Fl I Ar directory
@@ -165,7 +163,7 @@ option) is automatically included as part of this list.
 .It Fl i
 Ignore non-zero exit of shell commands in the makefile.
 Equivalent to specifying
-.Ql \-
+.Sq Ic \-
 before each command line in the makefile.
 .It Fl j Ar max_jobs
 Specify the maximum number of jobs that
@@ -211,7 +209,7 @@ option during recursive builds.
 .It Fl s
 Do not echo any commands as they are executed.
 Equivalent to specifying
-.Ql Ic @
+.Sq Ic @
 before each command line in the makefile.
 .It Fl t
 Rather than re-building a target as specified in the makefile, create it
@@ -314,19 +312,19 @@ Each of the commands in this script
 be preceded by a tab.
 While any target may appear on a dependency line, only one of these
 dependencies may be followed by a creation script, unless the
-.Ql Ic ::
+.Sq Ic ::
 operator is used.
 .Pp
 If the first or first two characters of the command line are
-.Ql Ic @
+.Sq Ic @
 and/or
-.Ql Ic \- ,
+.Sq Ic \- ,
 the command is treated specially.
 A
-.Ql Ic @
+.Sq Ic @
 causes the command not to be echoed before it is executed.
 A
-.Ql Ic \-
+.Sq Ic \-
 causes any non-zero exit status of the command line to be ignored.
 .Sh VARIABLE ASSIGNMENTS
 Variables in
@@ -393,51 +391,51 @@ 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 \&> .
+.Sq Va \&> .
 .It Va .ARCHIVE
 The name of the archive file; also known as
-.Ql Va \&! .
+.Sq Va \&! .
 .It Va .IMPSRC
 The name/path of the source from which the target is to be transformed
 (the
 .Dq implied
 source); also known as
-.Ql Va \&< .
+.Sq Va \&< .
 .It Va .MEMBER
 The name of the archive member; also known as
-.Ql Va \&% .
+.Sq Va \&% .
 .It Va .OODATE
 The list of sources for this target that were deemed out-of-date; also
 known as
-.Ql Va \&? .
+.Sq Va \&? .
 .It Va .PREFIX
 The file prefix of the file, containing only the file portion, no suffix
 or preceding directory components; also known as
-.Ql Va * .
+.Sq Va * .
 .It Va .TARGET
 The name of the target; also known as
-.Ql Va @ .
+.Sq Va @ .
 .El
 .Pp
 The shorter forms
-.Ql Va @ ,
-.Ql Va \&! ,
-.Ql Va \&< ,
-.Ql Va \&% ,
-.Ql Va \&? ,
-.Ql Va \&> ,
+.Sq Va @ ,
+.Sq Va \&! ,
+.Sq Va \&< ,
+.Sq Va \&% ,
+.Sq Va \&? ,
+.Sq Va \&> ,
 and
-.Ql Va *
+.Sq Va *
 are permitted for backward
 compatibility and are not recommended.
 The six variables
-.Ql Va "@F" ,
-.Ql Va "@D" ,
-.Ql Va "<F" ,
-.Ql Va "<D" ,
-.Ql Va "*F" ,
+.Sq Va @F ,
+.Sq Va @D ,
+.Sq Va <F ,
+.Sq Va <D ,
+.Sq Va *F ,
 and
-.Ql Va "*D"
+.Sq Va *D
 are
 permitted for compatibility with
 .At V
@@ -446,11 +444,11 @@ makefiles and are not recommended.
 Four of the local variables may be used in sources on dependency lines
 because they expand to the proper value for each target on the line.
 These variables are
-.Ql Va .TARGET ,
-.Ql Va .PREFIX ,
-.Ql Va .ARCHIVE ,
+.Va .TARGET ,
+.Va .PREFIX ,
+.Va .ARCHIVE ,
 and
-.Ql Va .MEMBER .
+.Va .MEMBER .
 .El
 .Pp
 In addition,
@@ -651,7 +649,7 @@ The standard shell wildcard characters
 .Pf ( Ql * ,
 .Ql \&? ,
 and
-.Ql Op )
+.Ql [] )
 may
 be used.
 The wildcard characters may be escaped with a backslash
@@ -820,45 +818,45 @@ Reverse the sense of the last conditional.
 .Op Ar operator expression ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .if .
+.Ic .if .
 .It Xo
 .Ic .elifdef
 .Oo \&! Oc Ns Ar variable
 .Op Ar operator variable ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifdef .
+.Ic .ifdef .
 .It Xo
 .Ic .elifndef
 .Oo \&! Oc Ns Ar variable
 .Op Ar operator variable ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifndef .
+.Ic .ifndef .
 .It Xo
 .Ic .elifmake
 .Oo \&! Oc Ns Ar target
 .Op Ar operator target ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifmake .
+.Ic .ifmake .
 .It Xo
 .Ic .elifnmake
 .Oo \&! Oc Ns Ar target
 .Op Ar operator target ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifnmake .
+.Ic .ifnmake .
 .It Ic .endif
 End the body of the conditional.
 .El
@@ -870,11 +868,11 @@ may be any one of the following:
 .It Cm \&|\&|
 logical
 .Tn OR
-.It Cm \&&&
+.It Cm &&
 Logical
 .Tn AND ;
 of higher precedence than
-.Ql Ic || .
+.Sq Ic || .
 .El
 .Pp
 As in C,
@@ -883,11 +881,11 @@ will only evaluate a conditional as far as is necessary to determine
 its value.
 Parentheses may be used to change the order of evaluation.
 The boolean operator
-.Ql Ic !\&
+.Sq Ic !\&
 may be used to logically negate an entire
 conditional.
 It is of higher precedence than
-.Ql Ic \&&& .
+.Sq Ic && .
 .Pp
 The value of
 .Ar expression
@@ -918,7 +916,8 @@ has been defined.
 .Pp
 An
 .Ar expression
-may also be an arithmetic or string comparison.
+may also be an arithmetic or string comparison, with the left-hand side
+being a variable expansion.
 Variable expansion is
 performed on both sides of the comparison, after which the integral
 values are compared.
@@ -927,9 +926,9 @@ preceded by 0x, otherwise it is decimal; octal numbers are not supported.
 The standard C relational operators are all supported.
 If after
 variable expansion, either the left or right hand side of a
-.Ql Ic ==
+.Sq Ic ==
 or
-.Ql Ic "!="
+.Sq Ic !=
 operator is not an integral value, then
 string comparison is performed between the expanded
 variables.
@@ -945,16 +944,17 @@ or
 .Dq defined
 expression is applied to it, depending on the form of the conditional.
 If the form is
-.Ql Ic .ifdef
+.Ic .if ,
+.Ic .ifdef
 or
-.Ql Ic .ifndef ,
+.Ic .ifndef ,
 the
 .Dq defined
 expression is applied.
 Similarly, if the form is
-.Ql Ic .ifmake
+.Ic .ifmake
 or
-.Ql Ic .ifnmake ,
+.Ic .ifnmake ,
 the
 .Dq make
 expression is applied.
@@ -963,9 +963,9 @@ If the conditional evaluates to true the parsing of the makefile continues
 as before.
 If it evaluates to false, the following lines are skipped.
 In both cases this continues until a
-.Ql Ic .else
+.Ic .else
 or
-.Ql Ic .endif
+.Ic .endif
 is found.
 .Pp
 For loops are typically used to apply a set of rules to a list of files.
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 0141902d1a..5177d4a515 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -37,7 +37,7 @@
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/nonints.h,v 1.8 1999/08/28 01:03:35 peter Exp $
- * $DragonFly: src/usr.bin/make/Attic/nonints.h,v 1.13 2004/11/24 07:15:46 dillon Exp $
+ * $DragonFly: src/usr.bin/make/Attic/nonints.h,v 1.14 2004/11/24 07:20:50 dillon Exp $
  */
 
 /* arch.c */
@@ -96,7 +96,7 @@ void str_end(void);
 char *str_concat(const char *, const char *, int);
 char **brk_string(char *, int *, Boolean);
 int Str_Match(const char *, const char *);
-const char *Str_SYSVMatch(const char *, const char *, int *len);
+const char *Str_SYSVMatch(const char *, const char *, int *);
 void Str_SYSVSubst(Buffer, const char *, const char *, int);
 
 /* suff.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 6e5b78a595..95fab614d3 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -37,7 +37,7 @@
  *
  * @(#)parse.c	8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/parse.c,v 1.22.2.2 2004/07/10 08:14:42 eik Exp $
- * $DragonFly: src/usr.bin/make/parse.c,v 1.14 2004/11/24 07:19:14 dillon Exp $
+ * $DragonFly: src/usr.bin/make/parse.c,v 1.15 2004/11/24 07:20:50 dillon Exp $
  */
 
 /*-
@@ -1821,7 +1821,6 @@ ParseTraditionalInclude (char *file)
     char          *fullname;	/* full pathname of file */
     IFile         *oldFile;	/* state associated with current file */
     char          *cp;		/* current position in file spec */
-    char	  *prefEnd;
 
     /*
      * Skip over whitespace
@@ -1853,42 +1852,12 @@ ParseTraditionalInclude (char *file)
 
     /*
      * Now we know the file's name, we attempt to find the durn thing.
-     * A return of NULL indicates the file don't exist.
-     *
-     * Include files are first searched for relative to the including
-     * file's location. We don't want to cd there, of course, so we
-     * just tack on the old file's leading path components and call
-     * Dir_FindFile to see if we can locate the beast.
-     * XXX - this *does* search in the current directory, right?
+     * Search for it first on the -I search path, then on the .PATH
+     * search path, if not found in a -I directory.
      */
-
-    prefEnd = strrchr (fname, '/');
-    if (prefEnd != (char *)NULL) {
-	char  	*newName;
-
-	*prefEnd = '\0';
-	newName = str_concat (fname, file, STR_ADDSLASH);
-	fullname = Dir_FindFile (newName, parseIncPath);
-	if (fullname == (char *)NULL) {
-	    fullname = Dir_FindFile(newName, dirSearchPath);
-	}
-	free (newName);
-	*prefEnd = '/';
-    } else {
-	fullname = (char *)NULL;
-    }
-
+    fullname = Dir_FindFile (file, parseIncPath);
     if (fullname == (char *)NULL) {
-	/*
-	 * System makefile or makefile wasn't found in same directory as
-	 * included makefile. Search for it first on the -I search path,
-	 * then on the .PATH search path, if not found in a -I directory.
-	 * XXX: Suffix specific?
-	 */
-	fullname = Dir_FindFile (file, parseIncPath);
-	if (fullname == (char *)NULL) {
-	    fullname = Dir_FindFile(file, dirSearchPath);
-	}
+        fullname = Dir_FindFile(file, dirSearchPath);
     }
 
     if (fullname == (char *)NULL) {
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 3fd4f441b8..f045321220 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -37,7 +37,7 @@
  *
  * @(#)suff.c	8.4 (Berkeley) 3/21/94
  * $FreeBSD: src/usr.bin/make/suff.c,v 1.12.2.2 2004/06/10 13:07:53 ru Exp $
- * $DragonFly: src/usr.bin/make/suff.c,v 1.12 2004/11/24 07:19:14 dillon Exp $
+ * $DragonFly: src/usr.bin/make/suff.c,v 1.13 2004/11/24 07:20:50 dillon Exp $
  */
 
 /*-
@@ -1035,7 +1035,7 @@ SuffAddLevel (Lst l, Src *targ)
  *	Free all src structures in list that don't have a reference count
  *
  * Results:
- *	Ture if an src was removed
+ *	True if a src was removed
  *
  * Side Effects:
  *	The memory is free'd.
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index ab8dfb6457..37199a0bb4 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -37,7 +37,7 @@
  *
  * @(#)var.c	8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $
- * $DragonFly: src/usr.bin/make/var.c,v 1.12 2004/11/24 07:19:14 dillon Exp $
+ * $DragonFly: src/usr.bin/make/var.c,v 1.13 2004/11/24 07:20:50 dillon Exp $
  */
 
 /*-
@@ -1066,7 +1066,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 		 * so kludge up a Var structure for the modifications
 		 */
 		v = (Var *) emalloc(sizeof(Var));
-		v->name = &str[1];
+		v->name = estrdup(str);
 		v->val = Buf_Init(1);
 		v->flags = VAR_JUNK;
 	    }
@@ -1376,6 +1376,18 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 			cp++;
 		    }
 
+		    /*
+		     * Global substitution of the empty string causes an
+		     * infinite number of matches, unless anchored by '^'
+		     * (start of string) or '$' (end of string). Catch the
+		     * infinite substitution here.
+		     * Note that flags can only contain the 3 bits we're
+		     * interested in so we don't have to mask unrelated
+		     * bits. We can test for equality.
+		     */
+		    if (!pattern.leftLen && pattern.flags == VAR_SUB_GLOBAL)
+			Fatal("Global substitution of the empty string");
+
 		    termc = *cp;
 		    newStr = VarModify(str, VarSubstitute,
 				       (void *)&pattern);
@@ -1636,6 +1648,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 	     */
 	    *freePtr = TRUE;
 	}
+	free(v->name);
 	Buf_Destroy(v->val, destroy);
 	free(v);
     } else if (v->flags & VAR_JUNK) {
@@ -1647,6 +1660,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 	    free(str);
 	}
 	*freePtr = FALSE;
+	free(v->name);
 	Buf_Destroy(v->val, TRUE);
 	free(v);
 	if (dynamic) {
@@ -1714,7 +1728,7 @@ Var_Subst (char *var, char *str, GNode *ctxt, Boolean undefErr)
 		int expand;
 		for (;;) {
 		    if (str[1] != '(' && str[1] != '{') {
-			if (str[1] != *var) {
+			if (str[1] != *var || var[1] != '\0') {
 			    Buf_AddBytes(buf, 2, (Byte *) str);
 			    str += 2;
 			    expand = FALSE;
-- 
2.41.0