fix encoding and path issues on Windows in tools/decomp.py

requirements.txt

@@ -8,6 +8,7 @@ GitPython>=3.1.32
 graphviz>=0.20.1
 isort>=5.12.0
 humanfriendly>=10.0
+pycparser>=2.21
 pcpp>=1.30
 pyelftools>=0.29
 Pygments>=2.15.0

tools/decomp.py

@@ -46,9 +46,14 @@ def resolve_path(p: Path) -> str:
 
 
 def run_cmd(cmd: list[str]) -> str:
-    result = subprocess.run(cmd, capture_output=True)
+    if cmd[0] == "python":
+        executable = sys.executable
+    else:
+        executable = None
+    result = subprocess.run(cmd, capture_output=True, executable=executable)
     if result.returncode != 0:
-        print(" ".join(cmd))
+        print(" ".join(cmd), file=sys.stderr)
+        print(result.stdout.decode(), file=sys.stderr)
         print(result.stderr.decode(), file=sys.stderr)
         sys.exit(1)
     else:

tools/m2ctx/m2ctx.py

@@ -78,7 +78,7 @@
 
 def write_header(path: Path):
     files = sorted({f"#include <{file.relative_to(src)}>" for file in src.rglob("*.h")})
-    path.write_text("\n".join(files))
+    path.write_text("\n".join(files), encoding="utf-8")
 
 
 def try_import(c_command: List[str]):
@@ -180,7 +180,7 @@ def main():
     output = output.strip()
 
     if not args.no_file:
-        source_path.write_text(output)
+        source_path.write_text(output, encoding="utf-8")
 
     if args.clipboard:
         import pyperclip
@@ -190,7 +190,7 @@ def main():
     if args.render:
         template = template_path.read_text()
         html = template.format(ctx=output)
-        render_path.write_text(html)
+        render_path.write_text(html, encoding="utf-8")
 
     if not args.quiet:
         if args.colorize: