Changeset 3556 for trunk/tools

Timestamp:

May 18, 2000, 11:28:40 PM (25 years ago)

Author:

bird

Message:

Hot fix for bug in langRC. '"' weren't removed in RCINCLUDE statements.
extention ".orc" is handled by langRC.

File:

• trunk/tools/fastdep/fastdep.c (modified) (8 diffs)

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.19 2000-03-24 01:50:36 bird Exp $
+/* $Id: fastdep.c,v 1.20 2000-05-18 21:28:40 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
@@ -243 +243 @@
 static const char *apszExtC_CPP[] = {"c", "sqc", "cpp", "h", "hpp", NULL};
 static const char *apszExtAsm[]   = {"asm", "inc", NULL};
-static const char *apszExtRC[]    = {"rc", "dlg", NULL};
+static const char *apszExtRC[]    = {"rc", "orc", "dlg", NULL};
 static const char *apszExtCOBOL[] = {"cbl", "cob", "sqb", NULL};
 static CONFIGENTRY aConfig[] =
@@ -261 +261 @@
     {
         apszExtRC,
-        1,
+        2,
         langRC,
     },
@@ -1287 +1287 @@
 
         /* is this an include? */
-        if (   (i1 = strncmp(&szBuffer[i], "#include", 8)) == 0
-            ||       strncmp(&szBuffer[i], "RCINCLUDE", 9) == 0
-            || (i1 = strncmp(&szBuffer[i], "DLGINCLUDE", 10)) == 0
+        i1 = 1;
+        if (   strncmp(&szBuffer[i], "#include", 8) == 0
+            || (i1 = strncmp(&szBuffer[i], "RCINCLUDE", 9)) == 0
+            || strncmp(&szBuffer[i], "DLGINCLUDE", 10) == 0
             )
         {
@@ -1297 +1298 @@
             int  j;
 
-            if (i1 == 0)
+            if (i1 != 0)
             {   /*
                  * #include <file.h>,  #include "file.h" or DLGINCLUDE 1 "file.h"
@@ -1320 +1321 @@
             }
             else
-            {   /* RCINCLUDE filename.dlg
+            {   /*
+                 * RCINCLUDE ["]filename.dlg["]
                  * Extract filename.
                  */
@@ -1326 +1328 @@
                 /* skip to filename.dlg start - if eol will continue to loop. */
                 i += 9;
-                while (szBuffer[i] == ' ' || szBuffer[i] == '\t')
+                while (szBuffer[i] == ' ' || szBuffer[i] == '\t' || szBuffer[i] == '"')
                     i++;
                 if (szBuffer[i] == '\0')
@@ -1333 +1335 @@
                 /* search to end of filename. */
                 j = i+1;
-                while (szBuffer[i+j] != ' ' && szBuffer[i+j] != '\t' && szBuffer[i+j] != '\0')
+                while (   szBuffer[i+j] != ' ' && szBuffer[i+j] != '\t'
+                       && szBuffer[i+j] != '"' && szBuffer[i+j] != '\0')
                     j++;
             }