Changeset 55562 in vbox for trunk/src/VBox/Runtime/r3/win/env-win.cpp

Timestamp:

Apr 30, 2015 3:15:15 PM (10 years ago)

Author:

vboxsync

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

99930

Message:

IPRT: Added RTEnvCreateChangeRecord, RTEnvApplyChanges RTEnvIsChangeRecord and RTEnvGetByIndexRawEx for the purpose of creating a block of environment changes. The use case for this is guest control.

File:

• trunk/src/VBox/Runtime/r3/win/env-win.cpp (modified) (8 diffs)

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

@@ -54 +54 @@
 RTDECL(bool) RTEnvExistsUtf8(const char *pszVar)
 {
+    AssertReturn(strchr(pszVar, '=') == NULL, false);
+
     PRTUTF16 pwszVar;
     int rc = RTStrToUtf16(pszVar, &pwszVar);
@@ -65 +67 @@
 RTDECL(const char *) RTEnvGetBad(const char *pszVar)
 {
+    AssertReturn(strchr(pszVar, '=') == NULL, NULL);
     return getenv(pszVar);
 }
@@ -81 +84 @@
     AssertPtrNullReturn(pcchActual, VERR_INVALID_POINTER);
     AssertReturn(pcchActual || (pszValue && cbValue), VERR_INVALID_PARAMETER);
+    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
 
     if (pcchActual)
@@ -87 +91 @@
     PRTUTF16 pwszVar;
     int rc = RTStrToUtf16(pszVar, &pwszVar);
-    AssertRCReturn(rc, false);
+    AssertRCReturn(rc, rc);
 
     /** @todo Consider _wgetenv_s or GetEnvironmentVariableW here to avoid the
@@ -140 +144 @@
 RTDECL(int) RTEnvSetBad(const char *pszVar, const char *pszValue)
 {
+    AssertMsgReturn(strchr(pszVar, '=') == NULL, ("'%s'\n", pszVar), VERR_ENV_INVALID_VAR_NAME);
+
     /* make a local copy and feed it to putenv. */
     const size_t cchVar = strlen(pszVar);
@@ -167 +173 @@
 RTDECL(int) RTEnvSetUtf8(const char *pszVar, const char *pszValue)
 {
+    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
+
     size_t cwcVar;
     int rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcVar);
@@ -204 +212 @@
 RTDECL(int) RTEnvUnsetBad(const char *pszVar)
 {
-    AssertReturn(!strchr(pszVar, '='), VERR_INVALID_PARAMETER);
+    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
 
     /*
@@ -244 +252 @@
 RTDECL(int) RTEnvUnsetUtf8(const char *pszVar)
 {
+    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
+
     size_t cwcVar;
     int rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcVar);