Changeset 2004 for trunk/tools/database

Timestamp:

Dec 7, 1999, 12:52:44 AM (26 years ago)

Author:

bird

Message:

Bugfixes.

Location:

trunk/tools/database

Files:

• Makefile (modified) (3 diffs)
• StateUpd.cpp (modified) (7 diffs)
• db.cpp (modified) (5 diffs)
• gd/Makefile (modified) (1 diff)
• makefile.icc (modified) (2 diffs)

trunk/tools/database/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.2 1999-12-06 18:11:50 bird Exp $
+# $Id: Makefile,v 1.3 1999-12-06 23:52:43 bird Exp $
 
 #
@@ -147 +147 @@
 Odin32: CreateTables.sql States.sql Authors.sql
    -mysqladmin refresh
-   mysqladmin DROP Odin32
+   -mysqladmin DROP Odin32
    mysql < CreateTables.sql
    mysql < States.sql
@@ -179 +179 @@
 
 force:
-    @$(ECHO) -
+    @$(ECHO) ...

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.4 1999-12-06 18:11:49 bird Exp $ */
-/*
+/* $Id: StateUpd.cpp,v 1.5 1999-12-06 23:52:42 bird Exp $
+ *
  * StateUpd - Scans source files for API functions and imports data on them.
  *
@@ -36 +36 @@
 static void openLogs(void);
 static void closeLogs(void);
-static unsigned long processDir(char *pszDir, BOOL fFile, POPTIONS pOptions);
+static unsigned long processDir(const char *pszDirOrFile, POPTIONS pOptions);
 static unsigned long processFile(const char *pszFilename, POPTIONS pOptions);
 static unsigned long processAPI(char **papszLines, int i, int &iRet, const char *pszFilename, POPTIONS pOptions);
@@ -215 +215 @@
             /* processing */
             if (argv[argi] == NULL || *argv[argi] == '\0')
-                ulRc = processDir(".", FALSE, &options);
+                ulRc = processDir(".", &options);
             else
                 while (argv[argi] != NULL)
                 {
-                    ulRc += processDir(argv[argi],
-                                       argv[argi][strlen(argv[argi])-1] != '\\' && argv[argi][strlen(argv[argi])-1] != '/',
-                                       &options);
+                    ulRc += processDir(argv[argi], &options);
                     argi++;
                 }
@@ -344 +342 @@
 
 /**
- * Processes a subdirectory and files.
+ * Processes a file or a subdirectory with files.
  * @returns   high word = number of signals
  *            low  word = number of APIs processed. (1 or 0).
- * @param     pszDir    Directory or file, see fFile.
- * @param     fFile     File indicator, TRUE: pszDir is a file, FALSE: pszDir is a dir.
- * @param     pOptions  Pointer to options.
- * @sketch    0. Interpret parameters.
+ * @param     pszDirOrFile  Directory or file, see fFile.
+ * @param     pOptions      Pointer to options.
+ * @sketch    -0. Determin dir or file.
+ *            0. Interpret parameters.
  *            1. Scan current directory for *.cpp and *.c files and process them.
  *            2. If recusion option is enabled:
  *                   Scan current directory for sub-directories, scan them using recursion.
  */
-static unsigned long processDir(char *pszDir, BOOL fFile, POPTIONS pOptions)
+static unsigned long processDir(const char *pszDirOrFile, POPTIONS pOptions)
 {
     unsigned long ulRc = 0; /* high word = #signals, low word = #APIs successfully processed */
+    char         szBuf[CCHMAXPATH];
     char         szFileSpec[CCHMAXPATH];
     APIRET       rc;
     FILEFINDBUF3 ffb;
+    FILESTATUS3  fs;
     ULONG        ul = 1;
     HDIR         hDir = (HDIR)HDIR_CREATE;
-    char        *pszFile;
-
-    /* O. */
+    PSZ          pszDir;
+    PSZ          pszFile;
+    BOOL         fFile;
+
+    /* -0.*/
+    rc = DosQueryPathInfo(pszDirOrFile, FIL_STANDARD, &fs , sizeof(fs));
+    fFile = rc == NO_ERROR && (fs.attrFile & FILE_DIRECTORY) != FILE_DIRECTORY;
+
+    /* 0. */
+    strcpy(szBuf, pszDirOrFile);
+    pszDir = szBuf;
     if (fFile)
     {
-        if ((pszFile = strrchr(pszDir, '\\')) == NULL)
-            pszFile = strrchr(pszDir, '/');
-        if (pszFile != NULL)
+        if ((pszFile = strrchr(pszDir, '\\')) != NULL
+            || (pszFile = strrchr(pszDir, '/')) != NULL)
             *pszFile++ = '\0';
         else
@@ -379 +386 @@
     }
     else
+    {
         pszFile = NULL;
+        ul = strlen(pszDir)-1;
+        if (pszDir[ul] == '\\' || pszDir[ul] == '/')
+            pszDir[ul] = '\0';
+    }
 
 
@@ -387 +399 @@
     else
         strcat(strcpy(&szFileSpec[0], pszDir), "\\*.c*");
+    ul = 1;
     rc = DosFindFirst((PCSZ)&szFileSpec[0], &hDir,
                       FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_ARCHIVED,
@@ -419 +432 @@
                 if (fFile)
                     strcat(strcat(&szFileSpec[0], "\\"), pszFile);
-                ulRc += processDir(&szFileSpec[0], fFile, pOptions);
+                ulRc += processDir(&szFileSpec[0], pOptions);
             }
 

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.2 1999-12-06 18:11:49 bird Exp $ */
+/* $Id: db.cpp,v 1.3 1999-12-06 23:52:43 bird Exp $ */
 /*
  * DB - contains all database routines.
@@ -248 +248 @@
     if (rc >= 0 && pres != NULL && mysql_num_rows(pres) > 0)
     {   /* update function (function is found) */
+        MYSQL_ROW parow;
         if (mysql_num_rows(pres) > 1)
         {
@@ -255 +256 @@
         }
 
-        lFunction = getvalue(0, mysql_fetch_row(pres));
+        parow = mysql_fetch_row(pres);
+        if (parow != NULL)
+            lFunction = getvalue(0, parow);
         mysql_free_result(pres);
 
@@ -356 +359 @@
         if (pres != NULL)
         {
+            MYSQL_ROW parow;
+
             /* integrety check */
             if (mysql_num_rows(pres) > 1)
                 fprintf(stderr, "Integrety: author '%s' is not unique!\n", pszAuthor);
-            refcode = getvalue(0, mysql_fetch_row(pres));
+            parow = mysql_fetch_row(pres);
+            if (parow != NULL)
+                refcode = getvalue(0, parow);
+
             mysql_free_result(pres);
         }
@@ -385 +393 @@
         if (pres != NULL)
         {
-            lState = getvalue(0, mysql_fetch_row(pres));
+            MYSQL_ROW parow = mysql_fetch_row(pres);
+            if (parow != NULL)
+                lState = getvalue(0, parow);
             mysql_free_result(pres);
         }

trunk/tools/database/gd/Makefile

@@ -20 +20 @@
 
 force:
-    @echo -
+    @echo ...
 
 clean:

trunk/tools/database/makefile.icc

@@ -1 @@
-# $Id: makefile.icc,v 1.2 1999-12-06 18:11:50 bird Exp $
+# $Id: makefile.icc,v 1.3 1999-12-06 23:52:43 bird Exp $
 
 #
@@ -136 +136 @@
 
 force:
-    @$(ECHO) -
+    @$(ECHO) ...