From 91167b0342d8be0520568cdfb7e9c14f289c94bc Mon Sep 17 00:00:00 2001 From: Ray Gardner Date: Sat, 3 Feb 2024 16:10:43 -0700 Subject: [PATCH] Fix previous fix for comma flag in printf Fixed (again) the regex for printf format. "-" needs to go first or else be escaped (to not be a range indicator). Moved "'" to end of "flags" bracket expression. --- toys/pending/awk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toys/pending/awk.c b/toys/pending/awk.c index 2e51f85d..4120282a 100644 --- a/toys/pending/awk.c +++ b/toys/pending/awk.c @@ -4458,7 +4458,7 @@ static void free_literal_regex(void) static void run(int optind, int argc, char **argv, char *sepstring, struct arg_list *assign_args, char **envp) { - char *printf_fmt_rx = "%['-+ #0]*([*]|[0-9]*)([.]([*]|[0-9]*))?[aAdiouxXfFeEgGcs%]"; + char *printf_fmt_rx = "%[-+ #0']*([*]|[0-9]*)([.]([*]|[0-9]*))?[aAdiouxXfFeEgGcs%]"; init_globals(optind, argc, argv, sepstring, assign_args, envp); TT.cfile = xzalloc(sizeof(struct zfile)); rx_compile_or_die(&TT.rx_default, "[ \t\n]+"); -- 2.39.2