Changeset 1494 in vbox

Timestamp:

Mar 15, 2007 1:18:15 AM (18 years ago)

Author:

vboxsync

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

19558

Message:

two new RTEnv APIs.

Location:

trunk

Files:

• include/iprt/env.h (modified) (2 diffs)
• src/VBox/Runtime/r3/posix/env-posix.cpp (modified) (4 diffs)

trunk/include/iprt/env.h

@@ -34 +34 @@
 #ifdef IN_RING3
 
+
+/**
+ * Checks if an environment variable exists.
+ * 
+ * @returns IPRT status code. Typical error is VERR_NO_MEMORY.
+ * 
+ * @param   pszVar      The environment variable name.
+ */
+RTDECL(bool) RTEnvExist(const char *pszVar);
+
 /**
  * Gets an environment variable (getenv).
@@ -56 +66 @@
 RTDECL(int) RTEnvPut(const char *pszVarEqualValue);
 
+/**
+ * Sets an environment variable (setenv(,,1)).
+ * 
+ * @returns IPRT status code. Typical error is VERR_NO_MEMORY.
+ * 
+ * @param   pszVar      The environment variable name.
+ * @param   pszValue    The environment variable value.
+ */
+RTDECL(int) RTEnvSet(const char *pszVar, const char *pszValue);
+
 /** @todo Add the missing environment APIs: safe, printf like, and various modifications. */
 

trunk/src/VBox/Runtime/r3/posix/env-posix.cpp

@@ -26 +26 @@
 #include <iprt/env.h>
 #include <iprt/string.h>
+#include <iprt/alloca.h>
 
 #include <stdlib.h>
@@ -31 +32 @@
 
 
-/**
- * Gets an environment variable (getenv).
- * 
- * The caller is responsible for ensuring that nobody changes the environment 
- * while it's using the returned string pointer!
- * 
- * @returns Pointer to read only string on success, NULL if the variable wasn't found.
- * 
- * @param   pszVar      The environment variable name.
- */
+RTDECL(bool) RTEnvExist(const char *pszVar)
+{
+    return getenv(pszVar) != NULL;
+}
+
+
 RTDECL(const char *) RTEnvGet(const char *pszVar)
 {
@@ -47 +44 @@
 
 
-/**
- * Puts an variable=value string into the environment (putenv).
- * 
- * @returns IPRT status code. Typical error is VERR_NO_MEMORY.
- * 
- * @param   pszVarEqualValue    The variable '=' value string. If the value and '=' is 
- *                              omitted, the variable is removed from the environment.
- */
 RTDECL(int) RTEnvPut(const char *pszVarEqualValue)
 {
-    /** @todo putenv is a memory leak. deal with this on a per system basis. */
+    /** @todo putenv is a source memory leaks. deal with this on a per system basis. */
     if (!putenv((char *)pszVarEqualValue))
         return 0;
@@ -63 +52 @@
 }
 
+RTDECL(int) RTEnvSet(const char *pszVar, const char *pszValue)
+{
+#if defined(_MSC_VER)
+    /* make a local copy and feed it to putenv. */
+    const size_t cchVar = strlen(pszVar);
+    const size_t cchValue = strlen(pszValue);
+    char *pszTmp = (char *)alloca(cchVar + cchValue + 2 + !*pszValue);
+    memcpy(pszTmp, pszVar, cchVar);
+    pszTmp[cchVar] = '=';
+    if (*pszValue)
+        memcpy(pszTmp + cchVar + 1, pszValue, cchValue + 1);
+    else
+    {
+        pszTmp[cchVar + 1] = ' '; /* wrong, but putenv will remove it otherwise. */
+        pszTmp[cchVar + 2] = '\0';
+    }
+
+    if (!putenv(pszTmp))
+        return 0;
+    return RTErrConvertFromErrno(errno);
+    
+#else
+    if (!setenv(pszVar, pszValue, 1))
+        return VINF_SUCCESS;
+    return RTErrConvertFromErrno(errno);
+#endif 
+}
+