Changeset 27 for trunk/src/kmk/var.c

Timestamp:

Nov 27, 2002, 1:35:20 AM (23 years ago)

Author:

bird

Message:

OS2 / VAC308

File:

• trunk/src/kmk/var.c (modified) (5 diffs)

trunk/src/kmk/var.c

@@ -88 +88 @@
  */
 
+#ifdef USE_KLIB
+ #include <kLib/kLib.h>
+#endif
+
 #include    <ctype.h>
 #include    <sys/types.h>
@@ -163 +167 @@
 } VarPattern;
 
-typedef struct { 
-    regex_t        re; 
+typedef struct {
+    regex_t        re;
     int            nsub;
     regmatch_t    *matches;
@@ -309 +313 @@
     }
     if ((var == NILLNODE) && (flags & FIND_ENV)) {
-        char *env;
-
+        #ifdef USE_KLIB
+        const char *env;
+        if ((env = kEnvGet (name)) != NULL) {
+        #else
+        char *env;
         if ((env = getenv (name)) != NULL) {
+        #endif
             int         len;
 
@@ -493 +501 @@
      */
     if (ctxt == VAR_CMD) {
+        #ifdef USE_KLIB
+        kEnvSet(name, val);
+        #else
         setenv(name, val, 1);
+        #endif
     }
 }
@@ -1547 +1559 @@
                         Boolean rfree;
                         char*   rval = Var_Parse(tstr, ctxt, err, &rlen, &rfree);
-                
+
                         if (rval == var_Error) {
                                 Fatal("Error expanding embedded variable.");