Changeset 16684 in vbox for trunk

Timestamp:

Feb 11, 2009 4:47:53 PM (16 years ago)

Author:

vboxsync

Message:

cbinding: Added the functions to get and set the environment variables.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMC.cpp (modified) (4 diffs)
• cbinding.h (modified) (1 diff)
• makefile.tstLinuxC (modified) (2 diffs)
• tstLinuxC.c (modified) (1 diff)

trunk/src/VBox/Main/cbinding/VBoxXPCOMC.cpp

@@ -26 +26 @@
 
 #include <iprt/string.h>
+#include <iprt/env.h>
 #include <VBox/log.h>
 
 #include "VirtualBox_XPCOM.h"
+#include "VBox/com/com.h"
 #include "cbinding.h"
 
@@ -71 +73 @@
 }
 
+VBOXXPCOMC_DECL(int)
+VBoxSetEnv(const char *pszVar, const char *pszValue)
+{
+    return RTEnvSet(pszVar, pszValue);
+}
+
+VBOXXPCOMC_DECL(const char*)
+VBoxGetEnv(const char *pszVar)
+{
+    return RTEnvGet(pszVar);
+}
+
 VBOXXPCOMC_DECL(void)
 VBoxComInitialize(IVirtualBox **virtualBox, ISession **session)
@@ -82 +96 @@
     Ivirtualbox = *virtualBox;
 
-    rc = NS_InitXPCOM2(&serviceManager, nsnull, nsnull);
+    rc = com::Initialize();
     if (NS_FAILED(rc))
     {
@@ -136 +150 @@
     if (serviceManager)
         NS_RELEASE(serviceManager); // decrement refcount
-    NS_ShutdownXPCOM(nsnull);
+    com::Shutdown();
     Log(("Cbinding: Cleaned up the created IVirtualBox and ISession Objects.\n"));
 }

trunk/src/VBox/Main/cbinding/cbinding.h

@@ -56 +56 @@
 VBOXXPCOMC_DECL(int) VBoxUtf8ToUtf16(const char *pszString, PRUnichar **ppwszString);
 
+/* Getting and Setting the Enviornment Variables */
+VBOXXPCOMC_DECL(const char*) VBoxGetEnv(const char *pszVar);
+VBOXXPCOMC_DECL(int) VBoxSetEnv(const char *pszVar, const char *pszValue);
+
 #ifdef __cplusplus
 }

trunk/src/VBox/Main/cbinding/makefile.tstLinuxC

@@ -32 +32 @@
 
 .PHONY: all
-all: tstLinuxC run
+all: tstLinuxC
 
 .PHONY: clean
 clean:
-        rm -f tstLinuxC.o tstLinuxC run
+        rm -f tstLinuxC.o tstLinuxC
 
 tstLinuxC: tstLinuxC.o
@@ -43 +43 @@
 tstLinuxC.o: tstLinuxC.c
         $(CC) $(CFLAGS) -DRT_OS_LINUX -DMOZ_UNICODE $(INCS_XPCOM) -o $@ -c $<
-
-run:
-        echo "env VBOX_XPCOM_HOME=$(PATH_BIN) ./tstLinuxC" > $@
-        chmod a+x $@

trunk/src/VBox/Main/cbinding/tstLinuxC.c

@@ -306 +306 @@
     PRUnichar *homefolderUtf16  = NULL;
     nsresult rc;     /* Result code of various function (method) calls. */
+    FILE *fpsetenv;
+
+    if ((fpsetenv = fopen("/opt/VirtualBox/VBoxXPCOMC.so", "r")) != NULL) {
+        VBoxSetEnv("VBOX_APP_HOME","/opt/VirtualBox/");
+        fclose (fpsetenv);
+    }
+    if ((fpsetenv = fopen("/usr/lib/virtualbox/VBoxXPCOMC.so", "r")) != NULL) {
+        VBoxSetEnv("VBOX_APP_HOME","/usr/lib/virtualbox/");
+        fclose (fpsetenv);
+    }
 
     printf("Starting Main\n");