aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-10-04 19:42:13 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-10-05 14:53:55 +0000
commitf359a8d6bcad8c7f12c6f707caa7480fd193c92a (patch)
treebb0c192ee5efad4ca4c0349306708873d54f4126
parentscripts: generate-builtin-terminfo: double-escape backslash in ST (diff)
scripts: generate-builtin-terminfo: escape fixes
* Remove ‘:’ escaping only in raw (non-parameterized) sequences * Double-escape *all* escape characters in parameterized sequences
-rwxr-xr-xscripts/generate-builtin-terminfo.py21
1 files changed, 14 insertions, 7 deletions
diff --git a/scripts/generate-builtin-terminfo.py b/scripts/generate-builtin-terminfo.py
index 035fa1cc..acbf5279 100755
--- a/scripts/generate-builtin-terminfo.py
+++ b/scripts/generate-builtin-terminfo.py
@@ -52,18 +52,25 @@ class StringCapability(Capability):
def __init__(self, name: str, value: str):
# Expand \E to literal ESC in non-parameterized capabilities
if '%' not in value:
+ # Ensure e.g. \E7 doesn’t get translated to “\0337”, which
+ # would be interpreted as octal 337 by the C compiler
value = re.sub(r'\\E([0-7])', r'\\033" "\1', value)
+
+ # Replace \E with an actual escape
value = re.sub(r'\\E', r'\\033', value)
+
+ # Don’t escape ‘:’
+ value = value.replace('\\:', ':')
+
else:
- # Need to double-escape backslashes. These only occur in
- # ‘\E\’ combos. Note that \E itself is updated below
- value = value.replace('\\E\\\\', '\\E\\\\\\\\')
+ value = value.replace("\\", "\\\\")
+ # # Need to double-escape backslashes. These only occur in
+ # # ‘\E\’ combos. Note that \E itself is updated below
+ # value = value.replace('\\E\\\\', '\\E\\\\\\\\')
- # Need to double-escape \E in C string literals
- value = value.replace('\\E', '\\\\E')
+ # # Need to double-escape \E in C string literals
+ # value = value.replace('\\E', '\\\\E')
- # Don’t escape ‘:’
- value = value.replace('\\:', ':')
super().__init__(name, value)