From 090539ffb6ae2ca5e9ecb0854354beb68ca36828 Mon Sep 17 00:00:00 2001
From: rillig <rillig@NetBSD.org>
Date: Sat, 31 Oct 2020 17:39:20 +0000
Subject: [PATCH] make(1): remove dead code for filename expansion using curly
 braces

Any string containing curly braces is already handled in the very first
if statement.
---
 usr.bin/make/dir.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c6508fcaec85..d1778d127b29 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.c,v 1.192 2020/10/30 15:39:17 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.193 2020/10/31 17:39:20 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,7 +134,7 @@
 #include "job.h"
 
 /*	"@(#)dir.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: dir.c,v 1.192 2020/10/30 15:39:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.193 2020/10/31 17:39:20 rillig Exp $");
 
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -790,17 +790,12 @@ Dir_Expand(const char *word, SearchPath *path, StringList *expansions)
 	     * in the string.
 	     */
 	    for (cp = word; *cp; cp++) {
-		if (*cp == '?' || *cp == '[' || *cp == '*' || *cp == '{') {
+		if (*cp == '?' || *cp == '[' || *cp == '*') {
 		    break;
 		}
 	    }
-	    if (*cp == '{') {
-		/*
-		 * This one will be fun.
-		 */
-		DirExpandCurly(word, cp, path, expansions);
-		return;
-	    } else if (*cp != '\0') {
+
+	    if (*cp != '\0') {
 		/*
 		 * Back up to the start of the component
 		 */