From cca35447086a7c48e5ff15a7948ea4711ef87914 Mon Sep 17 00:00:00 2001
From: William Ahern <william@25thandClement.com>
Date: Wed, 10 Aug 2022 16:51:17 -0700
Subject: [PATCH 1/2] restore combine.sh bash performance while still sticking
 to POSIX

---
 build/single_file_libs/combine.sh | 43 ++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/build/single_file_libs/combine.sh b/build/single_file_libs/combine.sh
index a4933bf2..515bf18c 100755
--- a/build/single_file_libs/combine.sh
+++ b/build/single_file_libs/combine.sh
@@ -2,11 +2,7 @@
 
 # Tool to bundle multiple C/C++ source files, inlining any includes.
 # 
-# Note: this POSIX-compliant script is many times slower than the original bash
-# implementation (due to the grep calls) but it runs and works everywhere.
-# 
 # TODO: ROOTS, FOUND, etc., as arrays (since they fail on paths with spaces)
-# TODO: revert to Bash-only regex (the grep ones being too slow)
 # 
 # Author: Carl Woffenden, Numfum GmbH (this script is released under a CC0 license/Public Domain)
 
@@ -52,13 +48,36 @@ test_deps() {
   fi
 }
 
-# Tests if list $1 has item $2 (returning zero on a match)
-list_has_item() {
-  if echo "$1" | grep -Eq "(^|\s*)$2(\$|\s*)"; then
+# Test if glob pattern $1 matches subject $2 (see fnmatch(3))
+fnmatch() {
+  case "$2" in
+  $1)
     return 0
-  else
-    return 1
-  fi
+    ;;
+  esac
+  return 1
+}
+
+# Test if line $1 is local include directive
+is_include_line() {
+  fnmatch "*#*include*" "$1" || return 1
+  printf "%s\n" "$1" | grep -Eq '^\s*#\s*include\s*".+"'
+}
+
+# Test if line $1 is pragma once directive
+is_pragma_once_line() {
+  fnmatch "*#*pragma*once*" "$1" || return 1
+  printf "%s\n" "$1" | grep -Eq '^\s*#\s*pragma\s*once\s*'
+}
+
+# Tests if list $1 has item $2 (returning zero on a match)
+# (originally used grep -Eq "(^|\s*)$2(\$|\s*))
+readonly list_FS="$IFS"
+list_has_item() {
+  for item_P in "*[$list_FS]$2[$list_FS]*" "*[$list_FS]$2" "$2[$list_FS]*" "$2"; do
+    fnmatch "${item_P}" "$1" && return 0
+  done
+  return 1
 }
 
 # Adds a new line with the supplied arguments to $DESTN (or stdout)
@@ -124,7 +143,7 @@ add_file() {
     # Read the file
     local line=
     while IFS= read -r line; do
-      if echo "$line" | grep -Eq '^\s*#\s*include\s*".+"'; then
+      if is_include_line "$line"; then
         # We have an include directive so strip the (first) file
         local inc=$(echo "$line" | grep -Eo '".*"' | sed -E 's/"([^"]+)"/\1/' | head -1)
         local res_inc="$(resolve_include "$srcdir" "$inc")"
@@ -155,7 +174,7 @@ add_file() {
         # Skip any 'pragma once' directives, otherwise write the source line
         local write=$PONCE
         if [ $write -eq 0 ]; then
-          if echo "$line" | grep -Eqv '^\s*#\s*pragma\s*once\s*'; then
+          if ! is_pragma_once_line "$line"; then
             write=1
           fi
         fi

From 60fcc36af6122610122bb4f34a606c1939603e5b Mon Sep 17 00:00:00 2001
From: William Ahern <william@25thandClement.com>
Date: Wed, 10 Aug 2022 20:58:55 -0700
Subject: [PATCH 2/2] escape glob pattern special characters in subject string
 before generating search patterns in combine.sh list_has_item

---
 build/single_file_libs/combine.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build/single_file_libs/combine.sh b/build/single_file_libs/combine.sh
index 515bf18c..222c2c32 100755
--- a/build/single_file_libs/combine.sh
+++ b/build/single_file_libs/combine.sh
@@ -74,6 +74,24 @@ is_pragma_once_line() {
 # (originally used grep -Eq "(^|\s*)$2(\$|\s*))
 readonly list_FS="$IFS"
 list_has_item() {
+  # Re: escaping glob pattern special characters in item string:
+  #
+  # bash (tested 3.2.57, 5.1.4), dash (tested 0.5.10.2), NetBSD /bin/sh
+  # (tested 8.2), and Solaris /bin/sh (tested 11.4) require escaping
+  # backslashes in a bracket expression despite POSIX specifying that
+  # backslash loses significance in a bracket expression.
+  #
+  # Conversely, neither FreeBSD /bin/sh (tested 12.2) nor OpenBSD /bin/sh
+  # (tested 7.1) obey backslash-escaping in case statement patterns even
+  # outside bracket expressions, so escape special characters using bracket
+  # expressions.
+  #
+  # Solaris /bin/sh (tested 11.4) requires vertical bar (|) to be escaped.
+  #
+  # All accommodations should behave as expected under strict POSIX semantics.
+  if fnmatch "*[\\*?[|]*" "$2"; then
+    set -- "$1" "$(printf '%s\n' "$2" | sed -e 's/[*?[|]/[&]/g; s/[\]/[\\&]/g')"
+  fi
   for item_P in "*[$list_FS]$2[$list_FS]*" "*[$list_FS]$2" "$2[$list_FS]*" "$2"; do
     fnmatch "${item_P}" "$1" && return 0
   done