Changeset 1527 in kBuild

Timestamp:

Apr 13, 2008 2:20:41 AM (17 years ago)

Author:

bird

Message:

Intercept BEGINLIBPATH, ENDLIBPATH and LIBPATHSTRICT on OS/2. Print revision number in the version info.

File:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * kmk_redirect - Do simple program <-> file redirection.
- *
- * Copyright (c) 2007 knut st. osmundsen <[email protected]>
- *
+ * kmk_redirect - Do simple program <-> file redirection (++).
+ */
+
+/*
+ * Copyright (c) 2007-2008 knut st. osmundsen <[email protected]>
  *
  * This file is part of kBuild.
@@ -42 +42 @@
 #endif
 
+#ifdef __OS2__
+# define INCL_BASE
+# include <os2.h>
+# ifndef LIBPATHSTRICT
+#  define LIBPATHSTRICT 3
+# endif
+#endif 
 
 
@@ -125 +132 @@
             if (*psz == 'V')
             {
-                printf("kmk_redirect - kBuild version %d.%d.%d\n"
-                       "Copyright (C) 2007 Knut St. Osmundsen\n",
-                       KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
+                printf("kmk_redirect - kBuild version %d.%d.%d (r%u)\n"
+                       "Copyright (C) 2007-2008 Knut St. Osmundsen\n",
+                       KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH,
+                       KBUILD_SVN_REV);
                 return 0;
             }
@@ -148 +156 @@
                     psz = argv[++i];
                 }
+#ifdef __OS2__
+                if (    !strncmp(psz, "BEGINLIBPATH=",  sizeof("BEGINLIBPATH=") - 1)
+                    ||  !strncmp(psz, "ENDLIBPATH=",    sizeof("ENDLIBPATH=") - 1)
+                    ||  !strncmp(psz, "LIBPATHSTRICT=", sizeof("LIBPATHSTRICT=") - 1))
+                {
+                    ULONG ulVar = *psz == 'B' ? BEGINLIBPATH
+                                : *psz == 'E' ? ENDLIBPATH
+                                :               LIBPATHSTRICT;
+                    const char *pszVal = strchr(psz, '=') + 1;
+                    APIRET rc = DosSetExtLIBPATH(pszVal, ulVar);
+                    if (rc)
+                    {
+                        fprintf(pStdErr, "%s: error: DosSetExtLibPath(\"%s\", %.*s (%ul)): %ul\n", 
+                                argv[0], pszVal, pszVal - psz - 1, psz, ulVar, rc);
+                        return 1;
+                    }
+                }
+                else
+#endif /* __OS2__ */
                 if (putenv(psz))
                 {