Get rid of trigraphs in string defaults when genereating config

CL: Get rid of trigraphs in string defaults when genereating config
cesanta · Jul 24, 2019 · 787ac38 · 787ac38
1 parent 4681825
commit 787ac38
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/tools/mgos_gen_config.py b/tools/mgos_gen_config.py
@@ -424,6 +424,17 @@ def GetHeaderLines(self):
 
         return lines
 
+    @staticmethod
+    def EscapeCString(s):
+        # JSON encoder will provide acceptable escaping.
+        s = json.dumps(s)
+        # Get rid of trigraph sequences.
+        for a, b in ((r"??(", r"?\?("), (r"??)", r"?\?)"), (r"??<", r"?\?<"), (r"??>", r"?\?>"),
+                     (r"??=", r"?\?="), (r"??/", r"?\?/"), (r"??'", r"?\?'"), (r"??!", r"?\?-")):
+            if a in s:
+                s = s.replace(a, b)
+        return s
+
     # Returns array of lines to be pasted to the C source file.
     def GetSourceLines(self):
         lines = []
@@ -437,8 +448,7 @@ def GetSourceLines(self):
                     pass
                 elif e.vtype == SchemaEntry.V_STRING:
                     if e.default:
-                        # JSON encoder will provide escaping.
-                        lines.append("  .%s = %s," % (e.path, json.dumps(e.default)))
+                        lines.append("  .%s = %s," % (e.path, self.EscapeCString(e.default)))
                     else:
                         lines.append("  .%s = NULL," % e.path)
                 elif e.vtype == SchemaEntry.V_BOOL: