 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.737 2020/12/19 22:10:17 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.738 2020/12/20 00:47:21 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 @@
 #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.737 2020/12/19 22:10:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.738 2020/12/20 00:47:21 rillig Exp $");
 /* A string that may need to be freed after use. */
 typedef struct FStr {
 	const char *str;
 	void *freeIt;
 } FStr;
 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.
 @@ -2803,26 +2803,54 @@ ApplyModifier_ToSep(const char **pp, App
 			(*pp)++;	/* just for backwards compatibility */
 			return AMR_BAD;
+		}
 		*pp = p;
+	}
 ok:
 	st->newVal = ModifyWords(st->val, ModifyWord_Copy, NULL,
 	    st->oneBigWord, st->sep);
 	return AMR_OK;
+}
 static char *
 str_toupper(const char *str)
+{
 	char *res;
 	size_t i, len;
 	len = strlen(str);
 	res = bmake_malloc(len + 1);
 	for (i = 0; i < len + 1; i++)
 		res[i] = ch_toupper(str[i]);
 	return res;
+}
 static char *
 str_tolower(const char *str)
+{
 	char *res;
 	size_t i, len;
 	len = strlen(str);
 	res = bmake_malloc(len + 1);
 	for (i = 0; i < len + 1; i++)
 		res[i] = ch_tolower(str[i]);
 	return res;
+}
 /* :tA, :tu, :tl, :ts<separator>, etc. */
 static ApplyModifierResult
 ApplyModifier_To(const char **pp, 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')
 @@ -2832,41 +2860,33 @@ ApplyModifier_To(const char **pp, ApplyM
 		*pp = mod + 1;
 		return AMR_BAD;	/* Found ":t<unrecognised><unrecognised>". */
+	}
 	/* Check for two-character options: ":tu", ":tl" */
 	if (mod[1] == 'A') {	/* absolute path */
 		st->newVal = ModifyWords(st->val, ModifyWord_Realpath, NULL,
 		    st->oneBigWord, st->sep);
 		*pp = mod + 2;
 		return AMR_OK;
+	}
 	if (mod[1] == 'u') {	/* :tu */
-		size_t i;
+		st->newVal = str_toupper(st->val);
 		size_t len = strlen(st->val);
 		st->newVal = bmake_malloc(len + 1);
 		for (i = 0; i < len + 1; i++)
 			st->newVal[i] = ch_toupper(st->val[i]);
 		*pp = mod + 2;
 		return AMR_OK;
+	}
 	if (mod[1] == 'l') {	/* :tl */
-		size_t i;
+		st->newVal = str_tolower(st->val);
 		size_t len = strlen(st->val);
 		st->newVal = bmake_malloc(len + 1);
 		for (i = 0; i < len + 1; i++)
 			st->newVal[i] = ch_tolower(st->val[i]);
 		*pp = mod + 2;
 		return AMR_OK;
+	}
 	if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */
 		st->oneBigWord = mod[1] == 'W';
 		st->newVal = st->val;
 		*pp = mod + 2;
 		return AMR_OK;
+	}
 	/* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */
 	*pp = mod + 1;