Module Name: src Committed By: rillig Date: Tue Feb 23 14:27:27 UTC 2021
Modified Files: src/usr.bin/make: var.c Log Message: make: comment on possible inconsistency in handling modifier ':sh' To generate a diff of this commit: cvs rdiff -u -r1.847 -r1.848 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/var.c diff -u src/usr.bin/make/var.c:1.847 src/usr.bin/make/var.c:1.848 --- src/usr.bin/make/var.c:1.847 Tue Feb 23 14:21:45 2021 +++ src/usr.bin/make/var.c Tue Feb 23 14:27:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.847 2021/02/23 14:21:45 rillig Exp $ */ +/* $NetBSD: var.c,v 1.848 2021/02/23 14:27:27 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -140,7 +140,7 @@ #include "metachar.h" /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: var.c,v 1.847 2021/02/23 14:21:45 rillig Exp $"); +MAKE_RCSID("$NetBSD: var.c,v 1.848 2021/02/23 14:27:27 rillig Exp $"); typedef enum VarFlags { VFL_NONE = 0, @@ -3514,8 +3514,16 @@ ApplyModifier_SunShell(const char **pp, if (errfmt != NULL) Error(errfmt, expr->value.str); Expr_SetValueOwn(expr, output); - } else + } else { + /* + * TODO: Check whether returning ":sh" would be + * more consistent with the other modifiers. + * + * TODO: Add a unit test demonstrating that the + * actual value of this expression has any effect. + */ Expr_SetValueRefer(expr, ""); + } *pp = p + 2; return AMR_OK; } else