Changeset 3882 for trunk/tools/database/APIImport.cpp

Timestamp:

Jul 21, 2000, 11:09:45 PM (25 years ago)

Author:

bird

Message:

Corrections and handling of the updated field in function and file.

File:

• trunk/tools/database/APIImport.cpp (modified) (9 diffs)

trunk/tools/database/APIImport.cpp

@@ -1 @@
-/* $Id: APIImport.cpp,v 1.5 2000-02-15 13:31:05 bird Exp $ */
+/* $Id: APIImport.cpp,v 1.6 2000-07-21 21:09:42 bird Exp $ */
 /*
  *
@@ -66 +66 @@
     *           -u:<user>     Userid
     *           -h:<host>     Hostname/IP-address
+    *           -e[+|-]       Erase functions which wasn't found.
     **************************************************************************/
     if (argc == 1)
@@ -82 +83 @@
                     else
                         fprintf(stderr, "warning: option '-d:' requires database name.\n");
+                    break;
+
+                case 'e': /* erase */
+                case 'E':
+                    options.fErase = argv[argi][2] != '-';
                     break;
 
@@ -177 +183 @@
            "    -p:<password> Password.                     default: <empty>\n"
            "    -d:<database> Database to use.              default: Odin32\n"
+           "    -e[+|-]       Erase functions which wasn't found.\n"
+           "                                                default: -e-\n"
            "    dll/defnames  List of DLL/Defs to process.\n"
            "\n"
@@ -188 +196 @@
            "\t2) function name\n"
            "\t3) function ordinal (If not option 'o-' is specified.)\n"
-           "This utililty is not destructive but additive. That is, it would not remove any\n"
-           "rows in the database, only add or update them. On existing functions the\n"
-           "ordinal value will be updated when 'o+' is specified.\n"
            "\n"
-           "Copyright (c) 1999 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)",
+           "Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)",
            MAJOR_VER, MINOR_VER
            );
@@ -248 +253 @@
             char    achDataBuffer[0x200];
             char   *pszModuleName = &achDataBuffer[0];
-            signed short  sDll;
+            signed long  lDll;
 
             /* try create file objects */
@@ -271 +276 @@
 
                 /* find or insert module name */
-                if ((sDll = dbCheckInsertDll(pszModuleName)) >= 0)
+                if ((lDll = dbCheckInsertDll(pszModuleName, DLL_ODIN32_API)) >= 0)
                 {
-                    BOOL   fOk;
+                    BOOL    fClearUpdateOk = FALSE;
+                    BOOL    fOk;
                     EXPORTENTRY export;
+
+                    /* Clear the update flag for all functions in this DLL. */
+                    if (pOptions->fErase)
+                        fClearUpdateOk = dbClearUpdateFlagFunction(lDll, FALSE);
 
                     lRc = 0;
@@ -313 +323 @@
                             }
                             else
-                            {
-                                fOk = dbInsertUpdateFunction(sDll,
+                            {   /* Update Database */
+                                fOk = dbInsertUpdateFunction(lDll,
                                                              &szName[0],
                                                              &szIntName[0],
                                                              export.ulOrdinal,
-                                                             pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL);
+                                                             pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL,
+                                                             FUNCTION_ODIN32_API
+                                                             );
                                 if (fOk)
                                     cFunctions++;
+                                else
+                                {
+                                    fprintf(phLog, "%s: error - dbInsertUpdateFunction failed.\n\terror description: %s \n",
+                                            pszFilename, dbGetLastErrorDesc());
+                                    lRc++;
+                                }
                             }
-                        }
-
-                        if (!fOk)
-                        {
-                            fprintf(phLog, "%s: error - dbInsertUpdateFunction failed.\n\terror description: %s \n",
-                                    pszFilename, dbGetLastErrorDesc());
-                            lRc = 1;
                         }
 
@@ -335 +346 @@
                     }
 
+                    /* Clear the update flag for all functions in this DLL. */
+                    if (fClearUpdateOk && pOptions->fErase)
+                        if (!dbDeleteNotUpdatedFunctions(lDll, FALSE))
+                        {
+                            fprintf(phLog, "%s: error - dbDeleteNotUpdatedFunctions failed.\n\terror description: %s\n",
+                                    pszFilename, dbGetLastErrorDesc());
+                            lRc += 1;
+                        }
                 }
                 else