From 01459f6cb21ffe3a66b584b1ddbe449cb301a4ff Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 17 Jun 2023 00:28:28 -0500
Subject: [PATCH] Tweak error message.

---
 toys/pending/sh.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/toys/pending/sh.c b/toys/pending/sh.c
index 78773b0a..139c394d 100644
--- a/toys/pending/sh.c
+++ b/toys/pending/sh.c
@@ -2066,9 +2066,10 @@ barf:
             else lc = recalculate(&lb, &ss, 0);
           }
           if (!lc || *ss != '}') {
-            for (s = ss; *s != '}' && *s != ':'; s++);
-            error_msg("bad %.*s @ %ld", (int)(s-slice), slice,(long)(ss-slice));
-//TODO fix error message
+            // Find ${blah} context for error message
+            while (*slice!='$') slice--;
+            error_msg("bad %.*s @ %ld", (int)(strchr(ss, '}')+1-slice), slice,
+              (long)(ss-slice));
             goto fail;
           }
 
-- 
2.39.2