 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.993 2022/01/07 12:33:25 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.994 2022/01/07 12:37:27 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.
 @@ -130,27 +130,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.993 2022/01/07 12:33:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.994 2022/01/07 12:37:27 rillig Exp $");
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
  * value can be queried by expressions such as $V, ${VAR}, or with modifiers
  * such as ${VAR:S,from,to,g:Q}.
+ *
  * There are 3 kinds of variables: scope variables, environment variables,
  * undefined variables.
+ *
  * Scope variables are stored in a GNode.scope.  The only way to undefine
  * a scope variable is using the .undef directive.  In particular, it must
  * not be possible to undefine a variable during the evaluation of an
  * expression, or Var.name might point nowhere.
 @@ -2584,86 +2584,55 @@ TryParseTime(const char **pp, time_t *ou
 	if (!ch_isdigit(**pp))
 		return false;
 	errno = 0;
 	n = strtoul(*pp, &end, 10);
 	if (n == ULONG_MAX && errno == ERANGE)
 		return false;
 	*pp = end;
 	*out_time = (time_t)n;	/* ignore possible truncation for now */
 	return true;
+}
-/* :gmtime */
+/* :gmtime and :localtime */
 static ApplyModifierResult
-ApplyModifier_Gmtime(const char **pp, ModChain *ch)
+ApplyModifier_Time(const char **pp, ModChain *ch, bool gmt)
+{
 	Expr *expr;
 	time_t t;
 	const char *args;
 	const char *mod = *pp;
-	if (!ModMatchEq(mod, "gmtime", ch))
+	if (!ModMatchEq(mod, gmt ? "gmtime" : "localtime", ch))
 		return AMR_UNKNOWN;
 	args = mod + (gmt ? 6 : 9);
-	if (mod[6] == '=') {
+	if (args[0] == '=') {
-		const char *p = mod + 7;
+		const char *p = args + 1;
 		if (!TryParseTime(&p, &t)) {
 			Parse_Error(PARSE_FATAL,
 			    "Invalid time value at \"%s\"", p);
 			return AMR_CLEANUP;
+		}
 		*pp = p;
 	} else {
 		t = 0;
-		*pp = mod + 6;
+		*pp = args;
+	}
 	expr = ch->expr;
 	if (Expr_ShouldEval(expr))
-		Expr_SetValueOwn(expr,
+		Expr_SetValueOwn(expr, VarStrftime(Expr_Str(expr), t, gmt));
 		    VarStrftime(Expr_Str(expr), t, true));
 	return AMR_OK;
 /* :localtime */
 static ApplyModifierResult
 ApplyModifier_Localtime(const char **pp, ModChain *ch)
 	Expr *expr;
 	time_t t;
 	const char *mod = *pp;
 	if (!ModMatchEq(mod, "localtime", ch))
 		return AMR_UNKNOWN;
 	if (mod[9] == '=') {
 		const char *p = mod + 10;
 		if (!TryParseTime(&p, &t)) {
 			Parse_Error(PARSE_FATAL,
 			    "Invalid time value at \"%s\"", p);
 			return AMR_CLEANUP;
 		*pp = p;
 	} else {
 		t = 0;
 		*pp = mod + 9;
 	expr = ch->expr;
 	if (Expr_ShouldEval(expr))
 		Expr_SetValueOwn(expr,
 		    VarStrftime(Expr_Str(expr), t, false));
 	return AMR_OK;
+}
 /* :hash */
 static ApplyModifierResult
 ApplyModifier_Hash(const char **pp, ModChain *ch)
+{
 	if (!ModMatch(*pp, "hash", ch))
 		return AMR_UNKNOWN;
 	*pp += 4;
 	if (ModChain_ShouldEval(ch))
 @@ -3853,35 +3822,35 @@ ApplyModifier(const char **pp, ModChain
 		return ApplyModifier_Words(pp, ch);
 	case '_':
 		return ApplyModifier_Remember(pp, ch);
 #ifndef NO_REGEX
 	case 'C':
 		return ApplyModifier_Regex(pp, ch);
 #endif
 	case 'D':
 	case 'U':
 		return ApplyModifier_Defined(pp, ch);
 	case 'E':
 		return ApplyModifier_WordFunc(pp, ch, ModifyWord_Suffix);
 	case 'g':
-		return ApplyModifier_Gmtime(pp, ch);
+		return ApplyModifier_Time(pp, ch, true);
 	case 'H':
 		return ApplyModifier_WordFunc(pp, ch, ModifyWord_Head);
 	case 'h':
 		return ApplyModifier_Hash(pp, ch);
 	case 'L':
 		return ApplyModifier_Literal(pp, ch);
 	case 'l':
-		return ApplyModifier_Localtime(pp, ch);
+		return ApplyModifier_Time(pp, ch, false);
 	case 'M':
 	case 'N':
 		return ApplyModifier_Match(pp, ch);
 	case 'O':
 		return ApplyModifier_Order(pp, ch);
 	case 'P':
 		return ApplyModifier_Path(pp, ch);
 	case 'Q':
 	case 'q':
 		return ApplyModifier_Quote(pp, ch);
 	case 'R':
 		return ApplyModifier_WordFunc(pp, ch, ModifyWord_Root);
 	case 'r':