Changeset 330 in kBuild for trunk

Timestamp:

Oct 29, 2005 8:38:04 PM (19 years ago)

Author:

bird

Message:

Make sure we don't get driveletters on non-PC OSes.

File:

• trunk/src/kDepPre/kDepPre.c (modified) (2 diffs)

trunk/src/kDepPre/kDepPre.c

@@ -209 +209 @@
             &&  pDep->szFilename[pDep->cchFilename - 1] == '>')
             continue;
-#ifdef __WIN32__
-        {
-        char *psz;
-        char szFilename[_MAX_PATH + 1];
-        if (_fullpath(szFilename, pDep->szFilename, sizeof(szFilename)))
-            w32_fixcase(szFilename);
-        psz = szFilename;
-        while ((psz = strchr(psz, '\\')) != NULL)
-            *psz++ = '/';
-        fprintf(pOutput, " \\\n\t%s", szFilename);
-        }
-#else
+
+#if defined(__WIN32__)
+        {
+            char *psz;
+            char szFilename[_MAX_PATH + 1];
+            if (_fullpath(szFilename, pDep->szFilename, sizeof(szFilename)))
+                w32_fixcase(szFilename);
+            psz = szFilename;
+            while ((psz = strchr(psz, '\\')) != NULL)
+                *psz++ = '/';
+            fprintf(pOutput, " \\\n\t%s", szFilename);
+        }
+
+#elif !defined(__OS2__)
+        {
+            const char *psz = strchr(pDep->szFilename, ':');
+            if (psz)
+                fprintf(pOutput, " \\\n\t%s", psz + 1);
+            else
+                fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
+        }
+
+#else /* __OS2__ */
         fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
-#endif
+
+#endif /* __OS2__ */
     }
     fprintf(pOutput, "\n\n");
@@ -602 +614 @@
         {
             pInput = fopen(argv[i], "r");
-            if (!pOutput)
+            if (!pInput)
             {
-                fprintf(stderr, "%s: error: Failed to open optput file '%s'.\n", argv[0], argv[i]);
+                fprintf(stderr, "%s: error: Failed to open input file '%s'.\n", argv[0], argv[i]);
                 return 1;
             }