From 8f985736580926ac53dc367fc293524bf2810cbb Mon Sep 17 00:00:00 2001
From: Henry Kroll III <henry@comptune.com>
Date: Sun, 12 Dec 2010 23:55:49 -0800
Subject: [PATCH] tcc: -m32 prefix "win32-" when file extension is present

---
 tcc.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tcc.c b/tcc.c
index 94e6336..8fdf68c 100644
--- a/tcc.c
+++ b/tcc.c
@@ -228,10 +228,18 @@ static int expand_args(char ***pargv, const char *str)
 #define CHILD "x86_64"
 #endif
 
-static const char *ssuffix(const char *name, const char sep)
+static char *ssuffix(const char *oldname, const char sep)
 {
-    char *p = strchr(name, sep);
-    return p?p+1:name;
+    char *p, *name = tcc_strdup(oldname);
+    p = strchr(name, sep);
+    if (p)
+        return p + 1;
+    /* prefix "win32-" when file extension is present */
+    if (*tcc_fileextension(name)){
+        name = tcc_realloc(name, strlen(oldname + 7));
+        sprintf(name, "win32-%s", oldname);
+    }
+    return name;
 }
 
 static void exec_other_tcc(TCCState *s, int argc,
@@ -249,7 +257,9 @@ static void exec_other_tcc(TCCState *s, int argc,
         case ARG:
         {
             parent = tcc_basename(argv[0]);
-            sprintf(child_name, CHILD "-%s", ssuffix(parent,'-'));
+            child_tcc = ssuffix(parent,'-');
+            sprintf(child_name, CHILD "-%s", child_tcc);
+            tcc_free(child_tcc);
             if (strcmp(parent, child_name)) {
                 /* child_path = dirname */
                 pstrcpy(child_path, parent - argv[0] + 1, argv[0]);