Changeset 4793 for trunk/src

Timestamp:

Dec 12, 2000, 8:09:48 PM (25 years ago)

Author:

bird

Message:

Corrected a race due to bad end-of-loop detechtion in SearchPaths.
Changed the file clipping SearchPaths so it will work for BOOKSHELF search
for the DDK base directory.
Corrected search for the DDK base directory.

File:

• trunk/src/win32k/configure.cmd (modified) (5 diffs)

trunk/src/win32k/configure.cmd

@@ -1 @@
-/* $Id: configure.cmd,v 1.13 2000-12-11 06:27:57 bird Exp $
+/* $Id: configure.cmd,v 1.14 2000-12-12 19:09:48 bird Exp $
  *
  * Configuration script.
@@ -27 +27 @@
 
     /* create empty .depend file */
-    'echo #run nmake dep > .depend'
+    call lineout '.depend', '# Run nmake dep'
+    call lineout '.depend'
 
     /* open target file */
@@ -66 +67 @@
         call lineout sIncFile, '# DDKPATH: base directory of ddk base. (ie. \DDK\BASE not \DDK for DDK v4.0+)'
         call lineout sIncFile, '################################################################################'
-        sDDK = SearchPaths('INCLUDE', '..\h\dhcalls.h', 'PATH', '..\h\dhcalls.h', 'BOOKSHELF', '..\h\dhcalls.h', 'Path to DDK "\BASE" directory (ie. F:\DDK\BASE):');
+        sDDK = SearchPaths('INCLUDE', '..\h\dhcalls.h', 'PATH', '..\h\dhcalls.h', 'BOOKSHELF', '..\base\.\h\dhcalls.h', 'Path to DDK "\BASE" directory (ie. F:\DDK\BASE):');
         call lineout sIncFile, 'DDKPATH          =' sDDK
         call lineout sIncFile, ''
@@ -155 +156 @@
 SearchPaths: procedure expose fInteractive;
     i = 1;
-    sEnv  = arg(i);
-    sFile = arg(i+1);
     sPath = '';
-    do while (sPath == '' & sEnv <> '' & sFile <> '')
+
+    /*
+     * Search for the given environments/files combinations.
+     */
+    do i = 2 to arg() by 2
+        sEnv  = arg(i-1);
+        sFile = arg(i);
+        say i':' sEnv '-' sFile;
         sPath = SysSearchPath(sEnv, sFile);
-        /* debug: say 'sEnv:'sEnv 'sFile:'sFile 'sPath:'sPath 'i:'i */
-        i = i + 2;
-        if (arg() > i + 1) then
-        do
-            sEnv  = arg(i);
-            sFile = arg(i+1);
-        end
-    end
-
-    if (sPath == '' & sEnv <> '' & sFile == '') then
-    do
-        say sEnv;
+        say 'SysSearchPath('sEnv',' sFile') ->' sPath;
+        if (sPath <> '') then
+           leave;
+    end
+
+    /* did we find it? */
+    if (sPath = '') then
+    do  /*
+         * If interactive mode, we'll ask for the the path, else skip it.
+         */
+        say arg(arg());
         if (fInteractive = 1) then
             sPath = linein();
@@ -178 +183 @@
     end
     else
-    do
-        if (sPath <> '') then
-        do
-            /* look for ..\. */
-            i = lastpos('..\', sFile);
-            if (i <> 0) then
-                sFile = substr(sFile, i + 2);
-
-            /* cut equally */
-            i = lastpos(sFile, sPath);
-            if i == 0 then
-                say '!error! sFile:'sFile  'sPath:'sPath;
-            /* debug: say 'sPath:'sPath  'sFile:'sFile */
-            sPath = substr(sPath, 1, i-1);
-        end
+    do  /*
+         * Trim the result for the file part.
+         */
+        /* look for .\ or ..\ */
+        i = lastpos('.\', sFile);
+        if (i <> 0) then
+            sFile = substr(sFile, i + 1);
+
+        /* cut equally */
+        i = lastpos(sFile, sPath);
+        if (i = 0) then
+            say '!error! sFile:'sFile  'sPath:'sPath;
+        /* debug: say 'sPath:'sPath  'sFile:'sFile */
+        sPath = substr(sPath, 1, i-1);
     end