Changeset 21916 for trunk/tools/impdef/ImpDef.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• tools/impdef/ImpDef.cpp (modified) (4 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/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;
 
@@ -197 +202 @@
             {
                 kFile * pOutput = new kFile(pszOutput, FALSE);
-                kExportEntry export;
+                kExportEntry exp;
 
                 /* generate LIBRARY line */
@@ -210 +215 @@
 
                 /* Exports */
-                if (pDefFile->exportFindFirst(&export))
+                if (pDefFile->exportFindFirst(&exp))
                 {
                     pOutput->printf("EXPORTS\n");
                     do
                     {
-                        char        szName[MAXEXPORTNAME];
+                        char        szName[MAXEXPORTNAME + 2 /*quotes*/];
                         const char *pszName;
 
                         /* validate export struct */
-                        if (export.achName[0] == '\0')
+                        if (exp.achName[0] == '\0')
                         {
                             kFile::StdErr.printf(
                                 "Warning export name is missing.\n"
                                 "info:\texport.achIntName=%s\n\texport.achName=%s\n\texport.ulOrdinal=%ld\n",
-                                export.achIntName, export.achName, export.ulOrdinal);
+                                exp.achIntName, exp.achName, exp.ulOrdinal);
                             continue;
                         }
-                        if (export.ulOrdinal == ~0UL)
+                        if (exp.ulOrdinal == ~0UL)
                         {
                             kFile::StdErr.printf(
                                 "warning: export is missing ordinal value. Export is ignored\n"
                                 "info:\texport.achIntName=%s\n\texport.achName=%s\n\texport.ulOrdinal=%ld\n",
-                                    export.achIntName, export.achName, export.ulOrdinal);
+                                    exp.achIntName, exp.achName, exp.ulOrdinal);
                             continue;
                         }
 
                         /* real work */
-                        pszName = generateExportName(&export, &szName[0], pOptions);
-
-                        pOutput->printf("    %-*s  @%ld\n", 40, pszName, export.ulOrdinal);
-                    } while (pDefFile->exportFindNext(&export));
+                        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();
                 delete pOutput;

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk