shithub: mc

Info  •  Files  •  Log  •  Branches

Fix escaping of closing '}' in fmt.

--- a/6/gengas.c

+++ b/6/gengas.c

@@ -171,8 +171,7 @@

 		/* %-formating */

 		p++;

 		idx = i;

-again

-:

+again:

 		switch (*p) {

 		case '\0':

 			goto done; /* skip the final p++ */

--- a/lib/std/fmt.myr

+++ b/lib/std/fmt.myr

@@ -195,9 +195,11 @@

 				nbuf = 0

 			;;

 		| (`Copy, '}'):

-			if i < fmt.len && (fmt[i] : char) == '}'

-				sbputb(sb, ('}' : byte))

+			if i == fmt.len || (fmt[i] : char) != '}'

+				die("unescaped '}'\n")

 			;;

+			sbputb(sb, ('}' : byte))

+			i++

 		| (`Copy, _):

 			sbputb(sb, b)