From b8ac772922e0936bddbd36cefef68d46b23798be Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 26 Jun 2018 10:32:04 +0200
Subject: [PATCH] src_to7bits.py: use HEX format

also fixes line endings, insert "" when necessary
fix detection of // comments
---
 tools/src_to7bits.py | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/tools/src_to7bits.py b/tools/src_to7bits.py
index e979227b..621ec021 100755
--- a/tools/src_to7bits.py
+++ b/tools/src_to7bits.py
@@ -12,11 +12,12 @@ import sys
 import os
 import re
 
-conv_format = '\\%03o'  # octal
-#conv_format = '\\x%02x' # hex
+#conv_format = '\\%03o'  # octal
+conv_format = '\\x%02x' # hex
 
 # for C++ style comments //
-commentre = re.compile('(.*)(\/\/.*)', re.MULTILINE | re.DOTALL)
+#commentre = re.compile('(.*)(\/\/.*)', re.MULTILINE | re.DOTALL)
+commentre = re.compile('^(.*?)(\/\/.*)$')
 
 def escape_8bit_chars(char):
   if ord(char) >= 0x7f:
@@ -28,9 +29,13 @@ def escape_8bit_chars(char):
 # and a filename+'.out' file was written
 def to_7bit(filename):
   with open(filename, "r") as f:
+    has_changed = False
     output = ''
     in_comment = False  # C style comments /*  */
+    lineindex = 0
     for line in f.readlines():
+      line = line.rstrip()
+      lineindex = lineindex + 1
       comment_start = 0
       comment_end = -1
       if not in_comment:
@@ -53,14 +58,22 @@ def to_7bit(filename):
           (line, comment) = m.group(1,2)
         else:
           comment = ''
-      conv = ''.join(map(escape_8bit_chars, list(line)))
-      output = output + conv + comment
-    if f.tell() < len(output):
+      convlist = map(escape_8bit_chars, list(line))
+      # check for problematic hex strings
+      for i in range(len(convlist)-1):
+        if convlist[i][0:2] == '\\x':
+          c = convlist[i+1]
+          if (c >= '0' and c <= '9') or (c >= 'a' and c <= 'f') or (c >= 'A' and c <= 'F'):
+            print "WARNING %15s:%-4d %s followed by %s : Inserting \"\"" % (filename, lineindex, convlist[i], c)
+            convlist[i] = convlist[i] + '""'
+      conv = ''.join(convlist)
+      if conv != line:
+        has_changed = True
+      output = output + conv + comment + '\n'
+    if has_changed:
       with open(filename + '.out', "w") as fout:
         fout.write(output)
-      return True
-    else:
-      return False
+    return has_changed
 
 # program entry point
 if len(sys.argv) <= 1: