Changeset 21766 for branches/gcc-kmk/tools/impdef/ImpDef.cpp

Timestamp:

Oct 31, 2011, 4:33:29 PM (14 years ago)

Author:

dmik

Message:

ImpDef: Quote generated export names and avoid duplicates.

Both conditions are the requirements of emximp (quoting is necessary
to screen symbols like @ which emx tools don't allow in the export name).

File:

• branches/gcc-kmk/tools/impdef/ImpDef.cpp (modified) (4 diffs)

branches/gcc-kmk/tools/impdef/ImpDef.cpp

@@ -14 +14 @@
 #include <string.h>
 #include <stdlib.h>
+
+#include <string>
+#include <set>
 
 #include "kTypes.h"
@@ -186 +189 @@
 static long processFile(const char *pszInput, const char *pszOutput, const POPTIONS pOptions)
 {
+    std::set<std::string> exports;
+
     long lRc = 0;
 
@@ -215 +220 @@
                     do
                     {
-                        char        szName[MAXEXPORTNAME];
+                        char        szName[MAXEXPORTNAME + 2 /*quotes*/];
                         const char *pszName;
 
@@ -237 +242 @@
 
                         /* real work */
-                        pszName = generateExportName(&exp, &szName[0], pOptions);
-
-                        pOutput->printf("    %-*s  @%ld\n", 40, pszName, exp.ulOrdinal);
+                        pszName = generateExportName(&exp, &szName[1], pOptions);
+                        if (exports.count(pszName) == 0) {
+                            exports.insert(pszName);
+                            szName[0] = '"';
+                            strcat(szName, "\"");
+                            pszName = szName;
+
+                            pOutput->printf("    %-*s  @%ld\n", 40, pszName, exp.ulOrdinal);
+                        }
                     } while (pDefFile->exportFindNext(&exp));
                 pOutput->setSize();