Changeset 223 for trunk/src

Timestamp:

Sep 4, 2002, 9:54:50 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk/src/helpers

Files:

• apps.c (modified) (4 diffs)
• makefile (modified) (3 diffs)

trunk/src/helpers/apps.c

@@ -258 +258 @@
 
 PSZ* appFindEnvironmentVar(PDOSENVIRONMENT pEnv,
-                           PSZ pszVarName)
+                           PCSZ pszVarName)
 {
     PSZ     *ppszRet = 0;
@@ -289 +289 @@
                 if (    (ulLenThis == ulVarNameLen)
                      && (!memicmp(pszThis,
-                                  pszVarName,
+                                  (PVOID)pszVarName,
                                   ulVarNameLen))
                    )
@@ -330 +330 @@
 
 APIRET appSetEnvironmentVar(PDOSENVIRONMENT pEnv,
-                            PSZ pszNewEnv,
+                            PCSZ pszNewEnv,
                             BOOL fAddFirst)
 {
@@ -399 +399 @@
     return arc;
 }
+
+
+/*
+ *@@ appSetEnvironmentVars:
+ *      Apply a number of changes or additions to an environment
+ *      initialized by appGetEnvironment. The changes or additions
+ *      is to the environment is passed in as a pointer (pcszEnv) to
+ *      a set of zero terminated VARNAME=VALUE string which ends with
+ *      an empty string. (Hence just like the environment block
+ *      representation in OS/2.)
+ *
+ *@@added V0.9.21 (2002-09-04) [bird]
+ */
+
+APIRET appSetEnvironmentVars(PDOSENVIRONMENT pEnv,
+                             PCSZ pcszEnv)
+{
+    APIRET  arc = NO_ERROR;
+    if (    (!pEnv)
+         || (!pcszEnv)
+       )
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        while (arc == NO_ERROR && *pcszEnv != '\0')
+        {
+            arc = appSetEnvironmentVar(pEnv, pcszEnv, FALSE);
+            pcszEnv += strlen(pcszEnv) + 1;
+        }
+    }
+    return arc;
+}
+
 
 /*

trunk/src/helpers/makefile

@@ -153 +153 @@
     !emxomfar cr $* $?
 !else
-    rm -f $@
+    - del $@
     ilib /nol /nob $@ @<<$(TEMP)\ilib.lnk
 +$(OBJS: =&^
@@ -165 +165 @@
     !emxomfar cr $* $?
 !else
-    rm -f $@
+    - del $@
     ilib /nol /nob $@ @<<
 +$(CPOBJS: =&^
@@ -177 +177 @@
     !emxomfar cr $* $?
 !else
-    rm -f $@
+    - del $@
     ilib /nol /nob $@ @<<
 +$(PLAINCOBJS: =&^