 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.809 2021/02/14 12:16:13 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.810 2021/02/14 12:24:53 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.
 @@ -129,27 +129,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.809 2021/02/14 12:16:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.810 2021/02/14 12:24:53 rillig Exp $");
 typedef enum VarFlags {
 	VAR_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VAR_IN_USE = 0x01,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2988,112 +2988,108 @@ static ApplyModifierResult
 ApplyModifier_To(const char **pp, const char *val, ApplyModifiersState *st)
+{
 	const char *mod = *pp;
 	assert(mod[0] == 't');
 	if (mod[1] == st->endc || mod[1] == ':' || mod[1] == '\0') {
 		*pp = mod + 1;
 		return AMR_BAD;	/* Found ":t<endc>" or ":t:". */
+	}
 	if (mod[1] == 's')
 		return ApplyModifier_ToSep(pp, val, st);
-	if (mod[2] != st->endc && mod[2] != ':') {
+	if (mod[2] != st->endc && mod[2] != ':') {	/* :t<unrecognized> */
 		*pp = mod + 1;
-		return AMR_BAD;	/* Found ":t<unrecognised><unrecognised>". */
+		return AMR_BAD;
+	}
-	/* Check for two-character options: ":tu", ":tl" */
+	if (mod[1] == 'A') {				/* :tA */
 	if (mod[1] == 'A') {	/* absolute path */
 		st->newVal = FStr_InitOwn(
 		    ModifyWords(val, ModifyWord_Realpath, NULL,
 		        st->oneBigWord, st->sep));
 		*pp = mod + 2;
 		return AMR_OK;
+	}
-	if (mod[1] == 'u') {	/* :tu */
+	if (mod[1] == 'u') {				/* :tu */
 		st->newVal = FStr_InitOwn(str_toupper(val));
 		*pp = mod + 2;
 		return AMR_OK;
+	}
-	if (mod[1] == 'l') {	/* :tl */
+	if (mod[1] == 'l') {				/* :tl */
 		st->newVal = FStr_InitOwn(str_tolower(val));
 		*pp = mod + 2;
 		return AMR_OK;
+	}
-	if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */
+	if (mod[1] == 'W' || mod[1] == 'w') {		/* :tW, :tw */
 		st->oneBigWord = mod[1] == 'W';
 		st->newVal = FStr_InitRefer(val);
 		*pp = mod + 2;
 		return AMR_OK;
+	}
 	/* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */
 	*pp = mod + 1;
 	return AMR_BAD;
+}
 /* :[#], :[1], :[-1..1], etc. */
 static ApplyModifierResult
 ApplyModifier_Words(const char **pp, const char *val, ApplyModifiersState *st)
+{
 	char *estr;
 	int first, last;
 	VarParseResult res;
 	const char *p;
 	(*pp)++;		/* skip the '[' */
 	res = ParseModifierPart(pp, ']', st->eflags, st, &estr);
 	if (res != VPR_OK)
 		return AMR_CLEANUP;
 	/* now *pp points just after the closing ']' */
 	if (**pp != ':' && **pp != st->endc)
-		goto bad_modifier;	/* Found junk after ']' */
+		goto bad_modifier;		/* Found junk after ']' */
 	if (estr[0] == '\0')
-		goto bad_modifier;	/* empty square brackets in ":[]". */
+		goto bad_modifier;			/* Found ":[]". */
-	if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */
+	if (estr[0] == '#' && estr[1] == '\0') {	/* Found ":[#]" */
 		if (st->oneBigWord) {
 			st->newVal = FStr_InitRefer("1");
 		} else {
 			Buffer buf;
 			Words words = Str_Words(val, FALSE);
 			size_t ac = words.len;
 			Words_Free(words);
 			/* 3 digits + '\0' is usually enough */
 			Buf_InitSize(&buf, 4);
 			Buf_AddInt(&buf, (int)ac);
 			st->newVal = FStr_InitOwn(Buf_DoneData(&buf));
+		}
 		goto ok;
+	}
-	if (estr[0] == '*' && estr[1] == '\0') {
+	if (estr[0] == '*' && estr[1] == '\0') {	/* Found ":[*]" */
 		/* Found ":[*]" */
 		st->oneBigWord = TRUE;
 		st->newVal = FStr_InitRefer(val);
 		goto ok;
+	}
-	if (estr[0] == '@' && estr[1] == '\0') {
+	if (estr[0] == '@' && estr[1] == '\0') {	/* Found ":[@]" */
 		/* Found ":[@]" */
 		st->oneBigWord = FALSE;
 		st->newVal = FStr_InitRefer(val);
 		goto ok;
+	}
 	/*
 	 * We expect estr to contain a single integer for :[N], or two
 	 * integers separated by ".." for :[start..end].
 	 */
 	p = estr;
 	if (!TryParseIntBase0(&p, &first))
 		goto bad_modifier;	/* Found junk instead of a number */