Changeset 1093 in kBuild

Timestamp:

Sep 9, 2007 12:21:19 AM (17 years ago)

Author:

bird

Message:

Fixed some OS/2 issues.

File:

• trunk/src/kObjCache/kObjCache.c (modified) (3 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -51 +51 @@
 # ifdef __OS2__
 #  include <unistd.h>
+#  include <sys/wait.h>
 # endif
 # if defined(_MSC_VER)
 #  include <direct.h>
    typedef intptr_t pid_t;
+# endif
+# ifndef _P_WAIT
+#  define _P_WAIT   P_WAIT
+# endif 
+# ifndef _P_NOWAIT
+#  define _P_NOWAIT P_NOWAIT
 # endif
 #else
@@ -254 +261 @@
 static char *AbsPath(const char *pszPath)
 {
+/** @todo this isn't really working as it should... */
     char szTmp[PATH_MAX];
-#if defined(__OS2__) || defined(__WIN__)
+#if defined(__OS2__)
+    if (    _fullpath(szTmp, *pszPath ? pszPath : ".", sizeof(szTmp))
+        &&  !realpath(pszPath, szTmp))
+        return xstrdup(pszPath);
+#elif defined(__WIN__)
     if (!_fullpath(szTmp, *pszPath ? pszPath : ".", sizeof(szTmp)))
         return xstrdup(pszPath);
@@ -275 +287 @@
 {
     const char *pszFilename = strchr(pszPath, '\0') - 1;
+    if (pszFilename < pszPath)
+        return pszPath;
     while (     pszFilename > pszPath
            &&   !IS_SLASH_DRV(pszFilename[-1]))