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

Timestamp:

May 27, 2001, 8:10:36 AM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/dosh2.c (modified) (1 diff)

trunk/src/helpers/dosh2.c

@@ -349 +349 @@
 
     return (arc);       // V0.9.9 (2001-04-04) [umoeller]
-}
-
-/*
- *@@category: Helpers\Control program helpers\Environment management
- *      helpers for managing those ugly environment string arrays
- *      that are used with DosStartSession and WinStartApp.
- */
-
-/* ******************************************************************
- *
- *   Environment helpers
- *
- ********************************************************************/
-
-/*
- *@@ doshParseEnvironment:
- *      this takes one of those ugly environment strings
- *      as used by DosStartSession and WinStartApp (with
- *      lots of zero-terminated strings one after another
- *      and a duplicate zero byte as a terminator) as
- *      input and splits it into an array of separate
- *      strings in pEnv.
- *
- *      The newly allocated strings are stored in in
- *      pEnv->papszVars. The array count is stored in
- *      pEnv->cVars.
- *
- *      Each environment variable will be copied into
- *      one newly allocated string in the array. Use
- *      doshFreeEnvironment to free the memory allocated
- *      by this function.
- *
- *      Use the following code to browse thru the array:
- +
- +          DOSENVIRONMENT Env = {0};
- +          if (doshParseEnvironment(pszEnv,
- +                                   &Env)
- +                  == NO_ERROR)
- +          {
- +              if (Env.papszVars)
- +              {
- +                  PSZ *ppszThis = Env.papszVars;
- +                  for (ul = 0;
- +                       ul < Env.cVars;
- +                       ul++)
- +                  {
- +                      PSZ pszThis = *ppszThis;
- +                      // pszThis now has something like PATH=C:\TEMP
- +                      // ...
- +                      // next environment string
- +                      ppszThis++;
- +                  }
- +              }
- +              doshFreeEnvironment(&Env);
- +          }
- *
- *@@added V0.9.4 (2000-08-02) [umoeller]
- */
-
-APIRET doshParseEnvironment(const char *pcszEnv,
-                            PDOSENVIRONMENT pEnv)
-{
-    APIRET arc = NO_ERROR;
-    if (!pcszEnv)
-        arc = ERROR_INVALID_PARAMETER;
-    else
-    {
-        PSZ     pszVarThis = (PSZ)pcszEnv;
-        ULONG   cVars = 0;
-        // count strings
-        while (*pszVarThis)
-        {
-            cVars++;
-            pszVarThis += strlen(pszVarThis) + 1;
-        }
-
-        pEnv->cVars = cVars;
-        pEnv->papszVars = 0;
-
-        if (cVars)
-        {
-            PSZ *papsz = (PSZ*)malloc(sizeof(PSZ) * cVars);
-            if (!papsz)
-                arc = ERROR_NOT_ENOUGH_MEMORY;
-            else
-            {
-                PSZ *ppszTarget = papsz;
-                memset(papsz, 0, sizeof(PSZ) * cVars);
-                pszVarThis = (PSZ)pcszEnv;
-                while (*pszVarThis)
-                {
-                    *ppszTarget = strdup(pszVarThis);
-                    ppszTarget++;
-                    pszVarThis += strlen(pszVarThis) + 1;
-                }
-
-                pEnv->papszVars = papsz;
-            }
-        }
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshGetEnvironment:
- *      calls doshParseEnvironment for the current
- *      process environment, which is retrieved from
- *      the info blocks.
- *
- *@@added V0.9.4 (2000-07-19) [umoeller]
- */
-
-APIRET doshGetEnvironment(PDOSENVIRONMENT pEnv)
-{
-    APIRET  arc = NO_ERROR;
-    if (!pEnv)
-        arc = ERROR_INVALID_PARAMETER;
-    else
-    {
-        PTIB    ptib = 0;
-        PPIB    ppib = 0;
-        arc = DosGetInfoBlocks(&ptib, &ppib);
-        if (arc == NO_ERROR)
-        {
-            PSZ pszEnv = ppib->pib_pchenv;
-            if (pszEnv)
-                arc = doshParseEnvironment(pszEnv, pEnv);
-            else
-                arc = ERROR_BAD_ENVIRONMENT;
-        }
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshFindEnvironmentVar:
- *      returns the PSZ* in the pEnv->papszVars array
- *      which specifies the environment variable in pszVarName.
- *
- *      With pszVarName, you can either specify the variable
- *      name only ("VARNAME") or a full environment string
- *      ("VARNAME=BLAH"). In any case, only the variable name
- *      is compared.
- *
- *      Returns NULL if no such variable name was found in
- *      the array.
- *
- *@@added V0.9.4 (2000-07-19) [umoeller]
- *@@changed V0.9.12 (2001-05-21) [umoeller]: fixed memory leak
- */
-
-PSZ* doshFindEnvironmentVar(PDOSENVIRONMENT pEnv,
-                            PSZ pszVarName)
-{
-    PSZ *ppszRet = 0;
-    if (pEnv)
-    {
-        if ((pEnv->papszVars) && (pszVarName))
-        {
-            PSZ     *ppszThis = pEnv->papszVars;
-            PSZ     pszThis;
-            ULONG   ul = 0;
-            ULONG   ulVarNameLen = 0;
-
-            PSZ     pszSearch = NULL; // receives "VARNAME="
-            PSZ     pFirstEqual = strchr(pszVarName, '=');
-            if (pFirstEqual)
-                pszSearch = strhSubstr(pszVarName, pFirstEqual + 1);
-            else
-            {
-                ulVarNameLen = strlen(pszVarName);
-                pszSearch = (PSZ)malloc(ulVarNameLen + 2);
-                memcpy(pszSearch, pszVarName, ulVarNameLen);
-                *(pszSearch + ulVarNameLen) = '=';
-                *(pszSearch + ulVarNameLen + 1) = 0;
-            }
-
-            ulVarNameLen = strlen(pszSearch);
-
-            for (ul = 0;
-                 ul < pEnv->cVars;
-                 ul++)
-            {
-                pszThis = *ppszThis;
-
-                if (strnicmp(*ppszThis, pszSearch, ulVarNameLen) == 0)
-                {
-                    ppszRet = ppszThis;
-                    break;
-                }
-
-                // next environment string
-                ppszThis++;
-            }
-
-            free(pszSearch);        // was missing V0.9.12 (2001-05-21) [umoeller]
-        }
-    }
-
-    return (ppszRet);
-}
-
-/*
- *@@ doshSetEnvironmentVar:
- *      sets an environment variable in the specified
- *      environment, which must have been initialized
- *      using doshGetEnvironment first.
- *
- *      pszNewEnv must be a full environment string
- *      in the form "VARNAME=VALUE".
- *
- *      If "VARNAME" has already been set to something
- *      in the string array in pEnv, that array item
- *      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
- *@@changed V0.9.12 (2001-05-21) [umoeller]: fixed memory leak
- */
-
-APIRET doshSetEnvironmentVar(PDOSENVIRONMENT pEnv,
-                             PSZ pszNewEnv,
-                             BOOL fAddFirst)
-{
-    APIRET  arc = NO_ERROR;
-    if (!pEnv)
-        arc = ERROR_INVALID_PARAMETER;
-    else
-    {
-        if ((!pEnv->papszVars) || (!pszNewEnv))
-            arc = ERROR_INVALID_PARAMETER;
-        else
-        {
-            PSZ *ppszEnvLine = doshFindEnvironmentVar(pEnv, pszNewEnv);
-            if (ppszEnvLine)
-            {
-                // was set already: replace
-                free(*ppszEnvLine);
-                *ppszEnvLine = strdup(pszNewEnv);
-                if (!(*ppszEnvLine))
-                    arc = ERROR_NOT_ENOUGH_MEMORY;
-            }
-            else
-            {
-                PSZ *ppszNew = NULL;
-                PSZ *papszNew = NULL;
-                // not set already:
-                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;
-                else
-                {
-                    if (pEnv->papszVars)
-                        free(pEnv->papszVars);      // was missing V0.9.12 (2001-05-21) [umoeller]
-
-                    pEnv->papszVars = papszNew;
-                    pEnv->cVars++;
-                    *ppszNew = strdup(pszNewEnv);
-                }
-            }
-        }
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshConvertEnvironment:
- *      converts an environment initialized by doshGetEnvironment
- *      to the string format required by WinStartApp and DosExecPgm,
- *      that is, one memory block is allocated in *ppszEnv and all
- *      strings in pEnv->papszVars are copied to that block. Each
- *      string is terminated with a null character; the last string
- *      is terminated with two null characters.
- *
- *      Use free() to free the memory block allocated by this
- *      function in *ppszEnv.
- *
- *@@added V0.9.4 (2000-07-19) [umoeller]
- */
-
-APIRET doshConvertEnvironment(PDOSENVIRONMENT pEnv,
-                              PSZ *ppszEnv,     // out: environment string
-                              PULONG pulSize)  // out: size of block allocated in *ppszEnv; ptr can be NULL
-{
-    APIRET  arc = NO_ERROR;
-    if (!pEnv)
-        arc = ERROR_INVALID_PARAMETER;
-    else
-    {
-        if (!pEnv->papszVars)
-            arc = ERROR_INVALID_PARAMETER;
-        else
-        {
-            // count memory needed for all strings
-            ULONG   cbNeeded = 0,
-                    ul = 0;
-            PSZ     *ppszThis = pEnv->papszVars;
-
-            for (ul = 0;
-                 ul < pEnv->cVars;
-                 ul++)
-            {
-                cbNeeded += strlen(*ppszThis) + 1; // length of string plus null terminator
-
-                // next environment string
-                ppszThis++;
-            }
-
-            cbNeeded++;     // for another null terminator
-
-            *ppszEnv = (PSZ)malloc(cbNeeded);
-            if (!(*ppszEnv))
-                arc = ERROR_NOT_ENOUGH_MEMORY;
-            else
-            {
-                PSZ     pTarget = *ppszEnv;
-                if (pulSize)
-                    *pulSize = cbNeeded;
-                ppszThis = pEnv->papszVars;
-
-                // now copy each string
-                for (ul = 0;
-                     ul < pEnv->cVars;
-                     ul++)
-                {
-                    PSZ pSource = *ppszThis;
-
-                    while ((*pTarget++ = *pSource++))
-                        ;
-
-                    // *pTarget++ = 0;     // append null terminator per string
-
-                    // next environment string
-                    ppszThis++;
-                }
-
-                *pTarget++ = 0;     // append second null terminator
-            }
-        }
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshFreeEnvironment:
- *      frees memory allocated by doshGetEnvironment.
- *
- *@@added V0.9.4 (2000-07-19) [umoeller]
- */
-
-APIRET doshFreeEnvironment(PDOSENVIRONMENT pEnv)
-{
-    APIRET  arc = NO_ERROR;
-    if (!pEnv)
-        arc = ERROR_INVALID_PARAMETER;
-    else
-    {
-        if (!pEnv->papszVars)
-            arc = ERROR_INVALID_PARAMETER;
-        else
-        {
-            PSZ     *ppszThis = pEnv->papszVars;
-            PSZ     pszThis;
-            ULONG   ul = 0;
-
-            for (ul = 0;
-                 ul < pEnv->cVars;
-                 ul++)
-            {
-                pszThis = *ppszThis;
-                free(pszThis);
-                // *ppszThis = NULL;
-                // next environment string
-                ppszThis++;
-            }
-
-            free(pEnv->papszVars);
-            pEnv->cVars = 0;
-        }
-    }
-
-    return (arc);
 }