From 5a5a7c37f51da1283cc014b68752c8b05004e7cb Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 30 Dec 2024 00:50:53 +0000
Subject: [PATCH] Fix globbing issue in cbmk

When doing e.g. $@ we should use double quotes to prevent globbing.

Thanks go to XRevan86 for pointing this out.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 build          | 8 ++++----
 include/git.sh | 2 +-
 include/lib.sh | 4 ++--
 script/trees   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build b/build
index db135bb..af6c0d9 100755
--- a/build
+++ b/build
@@ -30,14 +30,14 @@ main()
 
 	case "${spath#script/}" in
 	version) printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;;
-	release) shift 1; mkrelease $@ ;;
+	release) shift 1; mkrelease "$@" ;;
 	roms)
 		[ $# -gt 1 ] && [ "$2" = "serprog" ] && \
 		    mk -b stm32-vserprog pico-serprog && return 0
-		shift 1; x_ ./mk -b coreboot $@ ;;
+		shift 1; x_ ./mk -b coreboot "$@" ;;
 	*)
 		[ -f "$spath" ] || $err "bad command"
-		$shcmd; "$spath" $@ || $err "excmd: $spath $(echo "$@")" ;;
+		$shcmd; "$spath" "$@" || $err "excmd: $spath $(echo "$@")" ;;
 	esac
 }
 
@@ -123,5 +123,5 @@ tmp_cleanup()
 	rm -f lock || return 1
 }
 
-main $@
+main "$@"
 tmp_cleanup || err_ "can't rm TMPDIR upon non-zero exit: $TMPDIR"
diff --git a/include/git.sh b/include/git.sh
index 77a2276..aaeabcd 100644
--- a/include/git.sh
+++ b/include/git.sh
@@ -115,7 +115,7 @@ tmpclone()
 	git_am_patches "$3" "$5"
 	) || repofail="y"
 
-	[ "$repofail" = "y" ] && [ $# -lt 6 ] && tmpclone $@ retry
+	[ "$repofail" = "y" ] && [ $# -lt 6 ] && tmpclone "$@" retry
 	[ "$repofail" = "y" ] && $err "!clone $1 $2 $3 $4 $5"; :
 }
 
diff --git a/include/lib.sh b/include/lib.sh
index f204309..07b9a8d 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -80,7 +80,7 @@ install_packages()
 	printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; return 0
 }
 if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then
-	install_packages $@ || exit 1
+	install_packages "$@" || exit 1
 	exit 0
 fi
 
@@ -119,7 +119,7 @@ expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \
     1>/dev/null 2>/dev/null || export XBMK_THREADS=1 # user gave a non-integer
 
 x_() {
-	[ $# -lt 1 ] || $@ || \
+	[ $# -lt 1 ] || "$@" || \
 	    $err "Unhandled non-zero exit: $(echo "$@")"; return 0
 }
 
diff --git a/script/trees b/script/trees
index b9fd21e..57e19b6 100755
--- a/script/trees
+++ b/script/trees
@@ -294,6 +294,6 @@ copy_elf()
 	done < "$listfile"; x_ make clean -C "$srcdir" $cleanargs
 }
 
-main $@ || exit 0
+main "$@" || exit 0
 . "$mkhelpercfg"
 $cmd