Changeset 18 for trunk/src/helpers/dosh2.c

Timestamp:

Jan 1, 2001, 4:30:29 PM (25 years ago)

Author:

umoeller

Message:

Tons of updates.

File:

• trunk/src/helpers/dosh2.c (modified) (7 diffs)

trunk/src/helpers/dosh2.c

@@ -552 +552 @@
  *      If "VARNAME" has already been set to something
  *      in the string array in pEnv, that array item
- *      is replaced. Otherwise a new item is added to
- *      the array, and pEnv->cVars is raised by one.
+ *      is replaced.
+ *
+ *      OTOH, if "VARNAME" has not been set yet, a new
+ *      item is added to the array, and pEnv->cVars is
+ *      raised by one. In that case, fAddFirst determines
+ *      whether the new array item is added to the front
+ *      or the tail of the environment list.
  *
  *@@added V0.9.4 (2000-07-19) [umoeller]
+ *@@changed V0.9.7 (2000-12-17) [umoeller]: added fAddFirst
  */
 
 APIRET doshSetEnvironmentVar(PDOSENVIRONMENT pEnv,
-                             PSZ pszNewEnv)
+                             PSZ pszNewEnv,
+                             BOOL fAddFirst)
 {
     APIRET  arc = NO_ERROR;
@@ -576 +583 @@
                 free(*ppszEnvLine);
                 *ppszEnvLine = strdup(pszNewEnv);
+                if (!(*ppszEnvLine))
+                    arc = ERROR_NOT_ENOUGH_MEMORY;
             }
             else
             {
-                PSZ *ppszNew;
-                PSZ *papszNew;
+                PSZ *ppszNew = NULL;
+                PSZ *papszNew = NULL;
                 // not set already:
-                // append
-                // reallocate array and add new string
-                papszNew = (PSZ*)realloc(pEnv->papszVars, sizeof(PSZ) * (pEnv->cVars + 1));
+                if (fAddFirst)
+                {
+                    // add as first entry:
+                    papszNew = (PSZ*)malloc(sizeof(PSZ) * (pEnv->cVars + 1));
+                    // overwrite first entry
+                    ppszNew = papszNew;
+                    // copy old entries
+                    memcpy(papszNew + 1,                // second new entry
+                           pEnv->papszVars,             // first old entry
+                           sizeof(PSZ) * pEnv->cVars);
+                }
+                else
+                {
+                    // append at the tail:
+                    // reallocate array and add new string
+                    papszNew = (PSZ*)realloc(pEnv->papszVars,
+                                             sizeof(PSZ) * (pEnv->cVars + 1));
+                    // overwrite last entry
+                    ppszNew = papszNew + pEnv->cVars;
+                }
+
                 if (!papszNew)
                     arc = ERROR_NOT_ENOUGH_MEMORY;
@@ -590 +617 @@
                 {
                     pEnv->papszVars = papszNew;
-                    ppszNew = pEnv->papszVars + pEnv->cVars;
                     pEnv->cVars++;
                     *ppszNew = strdup(pszNewEnv);
@@ -618 +644 @@
 APIRET doshConvertEnvironment(PDOSENVIRONMENT pEnv,
                               PSZ *ppszEnv,     // out: environment string
-                              PULONG pulSize)  // out: size of block allocated in *ppszEnv
+                              PULONG pulSize)  // out: size of block allocated in *ppszEnv; ptr can be NULL
 {
     APIRET  arc = NO_ERROR;
@@ -652 +678 @@
             {
                 PSZ     pTarget = *ppszEnv;
-                *pulSize = cbNeeded;
+                if (pulSize)
+                    *pulSize = cbNeeded;
                 ppszThis = pEnv->papszVars;
 
@@ -831 +858 @@
                             // specified in header
                             arc = DosSetFilePtr(hFile,
-                                                (*ppExec)->pDosExeHeader->usNewHeaderOfs,
+                                                (*ppExec)->pDosExeHeader->ulNewHeaderOfs,
                                                 FILE_BEGIN,
                                                 &ulLocal);
@@ -847 +874 @@
                                 // reset file ptr
                                 DosSetFilePtr(hFile,
-                                              (*ppExec)->pDosExeHeader->usNewHeaderOfs,
+                                              (*ppExec)->pDosExeHeader->ulNewHeaderOfs,
                                               FILE_BEGIN,
                                               &ulLocal);