Skip to content

Commit 9e2456d

Browse files
obnoxxxCopilot
andauthored
Potential fix for pull request finding
improve option value handling. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Michael Adam <obnox@samba.org>
1 parent 672d39c commit 9e2456d

1 file changed

Lines changed: 56 additions & 8 deletions

File tree

cli/builbo

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,69 @@ echo " processing command line arguments.."
111111
rewrite_args=()
112112
while [ $# -gt 0 ]; do
113113
case "$1" in
114-
--lang) rewrite_args+=("-l" "$2"); shift 2 ;;
114+
--lang)
115+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
116+
echo "error: option '$1' requires a value." >&2
117+
usage
118+
exit 1
119+
fi
120+
rewrite_args+=("-l" "$2"); shift 2 ;;
115121
--lang=*) rewrite_args+=("-l" "${1#*=}"); shift ;;
116-
--registry) rewrite_args+=("-r" "$2"); shift 2 ;;
122+
--registry)
123+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
124+
echo "error: option '$1' requires a value." >&2
125+
usage
126+
exit 1
127+
fi
128+
rewrite_args+=("-r" "$2"); shift 2 ;;
117129
--registry=*) rewrite_args+=("-r" "${1#*=}"); shift ;;
118-
--container-cmd) rewrite_args+=("-c" "$2"); shift 2 ;;
130+
--container-cmd)
131+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
132+
echo "error: option '$1' requires a value." >&2
133+
usage
134+
exit 1
135+
fi
136+
rewrite_args+=("-c" "$2"); shift 2 ;;
119137
--container-cmd=*) rewrite_args+=("-c" "${1#*=}"); shift ;;
120-
--os) rewrite_args+=("-o" "$2"); shift 2 ;;
138+
--os)
139+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
140+
echo "error: option '$1' requires a value." >&2
141+
usage
142+
exit 1
143+
fi
144+
rewrite_args+=("-o" "$2"); shift 2 ;;
121145
--os=*) rewrite_args+=("-o" "${1#*=}"); shift ;;
122-
--registry-namespace) rewrite_args+=("-n" "$2"); shift 2 ;;
146+
--registry-namespace)
147+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
148+
echo "error: option '$1' requires a value." >&2
149+
usage
150+
exit 1
151+
fi
152+
rewrite_args+=("-n" "$2"); shift 2 ;;
123153
--registry-namespace=*) rewrite_args+=("-n" "${1#*=}"); shift ;;
124-
--build-script) rewrite_args+=("-s" "$2"); shift 2 ;;
154+
--build-script)
155+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
156+
echo "error: option '$1' requires a value." >&2
157+
usage
158+
exit 1
159+
fi
160+
rewrite_args+=("-s" "$2"); shift 2 ;;
125161
--build-script=*) rewrite_args+=("-s" "${1#*=}"); shift ;;
126-
--deps) rewrite_args+=("-d" "$2"); shift 2 ;;
162+
--deps)
163+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
164+
echo "error: option '$1' requires a value." >&2
165+
usage
166+
exit 1
167+
fi
168+
rewrite_args+=("-d" "$2"); shift 2 ;;
127169
--deps=*) rewrite_args+=("-d" "${1#*=}"); shift ;;
128-
--shell) rewrite_args+=("-i" "$2"); shift 2 ;;
170+
--shell)
171+
if [ $# -lt 2 ] || [[ "$2" == -* ]]; then
172+
echo "error: option '$1' requires a value." >&2
173+
usage
174+
exit 1
175+
fi
176+
rewrite_args+=("-i" "$2"); shift 2 ;;
129177
--shell=*) rewrite_args+=("-i" "${1#*=}"); shift ;;
130178
--help) rewrite_args+=("-h"); shift ;;
131179
--test) rewrite_args+=("-t"); shift ;;

0 commit comments

Comments
 (0)