 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.568 2021/12/03 23:37:30 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.569 2021/12/04 23:47:09 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.
 @@ -99,27 +99,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.h>
 #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.568 2021/12/03 23:37:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.569 2021/12/04 23:47:09 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	char *fname;		/* name of file (relative? absolute?) */
 	bool 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 */
 	bool depending;	/* state of doing_depend on EOF */
 @@ -2987,85 +2987,79 @@ ParseLine_ShellCommand(const char *p)
 		char *cmd = bmake_strdup(p);
 		GNodeListNode *ln;
 		for (ln = targets->first; ln != NULL; ln = ln->next) {
 			GNode *gn = ln->datum;
 			ParseAddCmd(gn, cmd);
+		}
 #ifdef CLEANUP
 		Lst_Append(&targCmds, cmd);
 #endif
+	}
+}
 MAKE_INLINE bool
 IsDirective(const char *dir, size_t dirlen, const char *name)
 	return dirlen == strlen(name) && memcmp(dir, name, dirlen) == 0;
 /*
  * See if the line starts with one of the known directives, and if so, handle
  * the directive.
  */
 static bool
 ParseDirective(char *line)
+{
 	char *cp = line + 1;
-	const char *dir, *arg;
+	const char *arg;
-	size_t dirlen;
+	Substring dir;
 	pp_skip_whitespace(&cp);
 	if (IsInclude(cp, false)) {
 		ParseInclude(cp);
 		return true;
+	}
-	dir = cp;
+	dir.start = cp;
 	while (ch_isalpha(*cp) || *cp == '-')
 		cp++;
-	dirlen = (size_t)(cp - dir);
+	dir.end = cp;
 	if (*cp != '\0' && !ch_isspace(*cp))
 		return false;
 	pp_skip_whitespace(&cp);
 	arg = cp;
-	if (IsDirective(dir, dirlen, "undef")) {
+	if (Substring_Equals(dir, "undef")) {
-		Var_Undef(cp);
+		Var_Undef(arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "export")) {
+	} else if (Substring_Equals(dir, "export")) {
 		Var_Export(VEM_PLAIN, arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "export-env")) {
+	} else if (Substring_Equals(dir, "export-env")) {
 		Var_Export(VEM_ENV, arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "export-literal")) {
+	} else if (Substring_Equals(dir, "export-literal")) {
 		Var_Export(VEM_LITERAL, arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "unexport")) {
+	} else if (Substring_Equals(dir, "unexport")) {
 		Var_UnExport(false, arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "unexport-env")) {
+	} else if (Substring_Equals(dir, "unexport-env")) {
 		Var_UnExport(true, arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "info")) {
+	} else if (Substring_Equals(dir, "info")) {
 		ParseMessage(PARSE_INFO, "info", arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "warning")) {
+	} else if (Substring_Equals(dir, "warning")) {
 		ParseMessage(PARSE_WARNING, "warning", arg);
 		return true;
-	} else if (IsDirective(dir, dirlen, "error")) {
+	} else if (Substring_Equals(dir, "error")) {
 		ParseMessage(PARSE_FATAL, "error", arg);
 		return true;
+	}
 	return false;
+}
 static bool
 ParseVarassign(const char *line)
+{
 	VarAssign var;
 	if (!Parse_IsVar(line, &var))
 		return false;