Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Bugfix for string escaping in printouts

Browse Source
This commit is contained in:
Bruce Hill 2024-09-16 00:15:54 -04:00
parent b1f882af91
commit 10a51ad996
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parse.c
View File

@ -1276,7 +1276,7 @@ PARSER(parse_text) {
++pos;
close_quote = closing[(int)open_quote] ? closing[(int)open_quote] : open_quote;
if (!lang && open_quote == '/')
if (!lang && (open_quote == '/' || open_quote == '|'))
lang = "Pattern";
else if (!lang && open_quote == '(')
lang = "Shell";

23
stdlib/text.c
View File

@ -1045,13 +1045,23 @@ static inline Text_t _quoted(Text_t text, bool colorize, char quote_char)
case '\t': add_escaped("t"); break;
case '\v': add_escaped("v"); break;
case '\\': {
if (just_escaped)
if (just_escaped) {
add_escaped("\\");
else
} else {
add_char('\\');
just_escaped = false;
}
break;
}
case '$': {
if (quote_char == '\'') {
add_char('$');
just_escaped = false;
} else {
add_escaped("$");
}
break;
}
case '$': if (quote_char == '\'') add_char('$'); else add_escaped("$"); break;
case '\x00' ... '\x06': case '\x0E' ... '\x1A':
case '\x1C' ... '\x1F': case '\x7F' ... '\x7F': {
if (colorize) add_str("\x1b[34;1m");
@ -1062,13 +1072,16 @@ static inline Text_t _quoted(Text_t text, bool colorize, char quote_char)
add_str(tmp);
if (colorize)
add_str("\x1b[0;35m");
just_escaped = true;
break;
}
default: {
if (g == quote_char)
if (g == quote_char) {
add_escaped(((char[2]){quote_char, 0}));
else
} else {
add_char(g);
just_escaped = false;
}
break;
}
}