Changeset 50642 in vbox

Timestamp:

Feb 27, 2014 8:22:26 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92536

Message:

iprt/env.h: Added RTEnvCountEx and RTEnvGetByIndexEx for enumerating the environment.

Location:

trunk

Files:

• include/iprt/env.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/generic/env-generic.cpp (modified) (2 diffs)

trunk/include/iprt/env.h

@@ -257 +257 @@
 RTDECL(char *) RTEnvDupEx(RTENV Env, const char *pszVar);
 
+/**
+ * Counts the variables in the environment.
+ *
+ * @returns Number of variables in the environment. UINT32_MAX on error.
+ * @param   hEnv        The environment handle.
+ *                      RTENV_DEFAULT is currently not accepted.
+ */
+RTDECL(uint32_t) RTEnvCountEx(RTENV hEnv);
+
+/**
+ * Queries an environment variable by it's index.
+ *
+ * This can be used together with RTEnvCount to enumerate the environment block.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_ENV_VAR_NOT_FOUND if the index is out of bounds, output buffers
+ *          untouched.
+ * @retval  VERR_BUFFER_OVERFLOW if one of the buffers are too small.  We'll
+ *          fill it with as much we can in RTStrCopy fashion.
+ *
+ * @param   hEnv        The environment handle.
+ *                      RTENV_DEFAULT is currently not accepted.
+ * @param   iVar        The variable index.
+ * @param   pszVar      Variable name buffer.
+ * @param   cbVar       The size of the variable name buffer.
+ * @param   pszValue    Value buffer.
+ * @param   cbValue     The size of the value buffer.
+ */
+RTDECL(uint32_t) RTEnvGetByIndexEx(RTENV hEnv, uint32_t iVar, char *pszVar, size_t cbVar, char *pszValue, size_t cbValue);
+
 #endif /* IN_RING3 */
 

trunk/include/iprt/mangling.h

@@ -495 +495 @@
 # define RTDvmVolumeCreateVfsFile                       RT_MANGLER(RTDvmVolumeCreateVfsFile)
 # define RTEnvClone                                     RT_MANGLER(RTEnvClone)
+# define RTEnvCountEx                                   RT_MANGLER(RTEnvCountEx)
 # define RTEnvCreate                                    RT_MANGLER(RTEnvCreate)
 # define RTEnvDestroy                                   RT_MANGLER(RTEnvDestroy)
@@ -505 +506 @@
 # define RTEnvGet                                       RT_MANGLER(RTEnvGet)
 # define RTEnvGetBad                                    RT_MANGLER(RTEnvGetBad)
+# define RTEnvGetByIndexEx                              RT_MANGLER(RTEnvGetByIndexEx)
 # define RTEnvGetUtf8                                   RT_MANGLER(RTEnvGetUtf8)
 # define RTEnvGetEx                                     RT_MANGLER(RTEnvGetEx)

trunk/src/VBox/Runtime/generic/env-generic.cpp

@@ -234 +234 @@
 #ifdef RTENV_HAVE_WENVIRON
         papszEnv  = NULL;
-        papwszEnv = (PCRTUTF16 * const )_wenviron;
+        papwszEnv = (PCRTUTF16 * const)_wenviron;
         if (papwszEnv)
             while (papwszEnv[cVars])
@@ -842 +842 @@
 RT_EXPORT_SYMBOL(RTEnvFreeUtf16Block);
 
+
+RTDECL(uint32_t) RTEnvCountEx(RTENV hEnv)
+{
+    PRTENVINTERNAL pIntEnv = hEnv;
+    AssertPtrReturn(pIntEnv, UINT32_MAX);
+    AssertReturn(pIntEnv->u32Magic == RTENV_MAGIC, UINT32_MAX);
+
+    RTENV_LOCK(pIntEnv);
+    uint32_t cVars = (uint32_t)pIntEnv->cVars;
+    RTENV_UNLOCK(pIntEnv);
+
+    return cVars;
+}
+RT_EXPORT_SYMBOL(RTEnvCountEx);
+
+
+RTDECL(uint32_t) RTEnvGetByIndexEx(RTENV hEnv, uint32_t iVar, char *pszVar, size_t cbVar, char *pszValue, size_t cbValue)
+{
+    PRTENVINTERNAL pIntEnv = hEnv;
+    AssertPtrReturn(pIntEnv, UINT32_MAX);
+    AssertReturn(pIntEnv->u32Magic == RTENV_MAGIC, UINT32_MAX);
+    if (cbVar)
+        AssertPtrReturn(pszVar, VERR_INVALID_POINTER);
+    if (cbValue)
+        AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
+
+    RTENV_LOCK(pIntEnv);
+
+    int rc;
+    if (iVar < pIntEnv->cVars)
+    {
+        const char *pszSrcVar   = pIntEnv->papszEnv[iVar];
+        const char *pszSrcValue = strchr(pszSrcVar, '=');
+        bool        fHasEqual   = pszSrcValue != NULL;
+        if (pszSrcValue)
+            pszSrcValue++;
+        else
+            pszSrcValue = strchr(pszSrcVar, '\0');
+        rc = VINF_SUCCESS;
+        if (cbVar)
+            rc = RTStrCopyEx(pszVar, cbVar, pszSrcVar, pszSrcValue - pszSrcVar - fHasEqual);
+        if (cbValue)
+        {
+            int rc2 = RTStrCopy(pszValue, cbValue, pszSrcValue);
+            if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
+                rc = rc2;
+        }
+    }
+    else
+        rc = VERR_ENV_VAR_NOT_FOUND;
+
+    RTENV_UNLOCK(pIntEnv);
+
+    return rc;
+}
+RT_EXPORT_SYMBOL(RTEnvGetByIndexEx);
+