 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.387 2020/10/18 19:11:35 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.388 2020/10/18 20:07:26 rillig 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.
 @@ -121,27 +121,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.387 2020/10/18 19:11:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.388 2020/10/18 20:07:26 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     unsigned int cond_depth;	/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -1743,26 +1743,71 @@ ParseDoDependency(char *line)
 	if (!ParseDoDependencySourcesMundane(line, cp, specType, tOp))
 	    goto out;
+    }
     FindMainTarget();
 out:
     if (paths != NULL)
 	Lst_Free(paths);
     if (curTargs != NULL)
 	Lst_Free(curTargs);
+}
 /* Determine the assignment operator and adjust the end of the variable
  * name accordingly. */
 static void
 ParseVarassignOp(VarAssign *var)
+{
     const char *op = var->eq;
     const char * const name = var->nameStart;
     VarAssignOp type;
     if (op > name && op[-1] == '+') {
 	type = VAR_APPEND;
 	op--;
     } else if (op > name && op[-1] == '?') {
 	op--;
 	type = VAR_DEFAULT;
     } else if (op > name && op[-1] == ':') {
 	op--;
 	type = VAR_SUBST;
     } else if (op > name && op[-1] == '!') {
 	op--;
 	type = VAR_SHELL;
     } else {
 	type = VAR_NORMAL;
 #ifdef SUNSHCMD
 	while (op > name && ch_isspace(op[-1]))
 	    op--;
 	if (op >= name + 3 && op[-3] == ':' && op[-2] == 's' && op[-1] == 'h') {
 	    type = VAR_SHELL;
 	    op -= 3;
+	}
 #endif
+    }
+    {
 	const char *nameEnd = var->nameEndDraft < op ? var->nameEndDraft : op;
 	var->varname = bmake_strsedup(var->nameStart, nameEnd);
 	var->op = type;
+    }
+}
 /* Parse a variable assignment, consisting of a single-word variable name,
  * optional whitespace, an assignment operator, optional whitespace and the
  * variable value.
+ *
  * Used for both lines in a file and command line arguments. */
 Boolean
 Parse_IsVar(const char *p, VarAssign *out_var)
+{
     const char *firstSpace = NULL;
     char ch;
     int level = 0;
     /* Skip to variable name */
 @@ -1824,71 +1869,26 @@ Parse_IsVar(const char *p, VarAssign *ou
 			  ch == '?' ? VAR_DEFAULT : VAR_SHELL;
 	    p++;
 	    cpp_skip_whitespace(&p);
 	    out_var->value = p;
 	    return TRUE;
+	}
 	if (firstSpace != NULL)
 	    return FALSE;
+    }
     return FALSE;
+}
 /* Determine the assignment operator and adjust the end of the variable
  * name accordingly. */
 static void
 ParseVarassignOp(VarAssign *var)
     const char *op = var->eq;
     const char * const name = var->nameStart;
     VarAssignOp type;
     if (op > name && op[-1] == '+') {
 	type = VAR_APPEND;
 	op--;
     } else if (op > name && op[-1] == '?') {
 	op--;
 	type = VAR_DEFAULT;
     } else if (op > name && op[-1] == ':') {
 	op--;
 	type = VAR_SUBST;
     } else if (op > name && op[-1] == '!') {
 	op--;
 	type = VAR_SHELL;
     } else {
 	type = VAR_NORMAL;
 #ifdef SUNSHCMD
 	while (op > name && ch_isspace(op[-1]))
 	    op--;
 	if (op >= name + 3 && op[-3] == ':' && op[-2] == 's' && op[-1] == 'h') {
 	    type = VAR_SHELL;
 	    op -= 3;
 #endif
 	const char *nameEnd = var->nameEndDraft < op ? var->nameEndDraft : op;
 	var->varname = bmake_strsedup(var->nameStart, nameEnd);
 	var->op = type;
 static void
 VarCheckSyntax(VarAssignOp type, const char *uvalue, GNode *ctxt)
+{
     if (DEBUG(LINT)) {
 	if (type != VAR_SUBST && strchr(uvalue, '$') != NULL) {
 	    /* Check for syntax errors such as unclosed expressions or
 	     * unknown modifiers. */
 	    char *expandedValue;
 	    (void)Var_Subst(uvalue, ctxt, VARE_NONE, &expandedValue);
 	    /* TODO: handle errors */
 	    free(expandedValue);
+	}