From 33a6a3027f0b1ec931824a4b2206bf6659df53a4 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 30 Nov 2022 13:57:12 -0500 Subject: parse: Pass the right argument when warning about -O9 --- src/parse.c | 2 +- tests/bfs/warn_O9.out | 19 +++++++++++++++++++ tests/bfs/warn_O9.sh | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/bfs/warn_O9.out create mode 100644 tests/bfs/warn_O9.sh diff --git a/src/parse.c b/src/parse.c index 16132f3..5ef71f8 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1016,7 +1016,7 @@ static struct bfs_expr *parse_optlevel(struct parser_state *state, int arg1, int } if (*optlevel > 4) { - parse_expr_warning(state, expr, "${cyn}-O${bld}%s${rs} is the same as ${cyn}-O${bld}4${rs}.\n\n", state->argv[0] + 2); + parse_expr_warning(state, expr, "${cyn}-O${bld}%s${rs} is the same as ${cyn}-O${bld}4${rs}.\n\n", expr->argv[0] + 2); } return expr; diff --git a/tests/bfs/warn_O9.out b/tests/bfs/warn_O9.out new file mode 100644 index 0000000..336a6e8 --- /dev/null +++ b/tests/bfs/warn_O9.out @@ -0,0 +1,19 @@ +. +./a +./b +./c +./c/d +./e +./e/f +./g +./g/h +./i +./j +./j/foo +./k +./k/foo +./k/foo/bar +./l +./l/foo +./l/foo/bar +./l/foo/bar/baz diff --git a/tests/bfs/warn_O9.sh b/tests/bfs/warn_O9.sh new file mode 100644 index 0000000..821789f --- /dev/null +++ b/tests/bfs/warn_O9.sh @@ -0,0 +1,3 @@ +# Regression test: don't crash when warning if -O9 is the last argument +cd basic +bfs_diff -warn -O9 -- cgit v1.2.3