Implement PortableProfile: if a dir named "PortableProfile" exits in …

…the same dir of the stub, use it as the profile.

src/stub/nsXULStub.cpp

@@ -161,6 +161,7 @@ main(int argc, char **argv)
   char iniPath[MAXPATHLEN];
   char tmpPath[MAXPATHLEN];
   char greDir[MAXPATHLEN];
+  char portableProfileDir[MAXPATHLEN];
   bool greFound = false;
 
 #if defined(XP_MACOSX)
@@ -268,6 +269,9 @@ main(int argc, char **argv)
 
   greFound = FolderExists(greDir);
 
+  snprintf(portableProfileDir, sizeof(portableProfileDir),
+	  "%sPortableProfile", iniPath);
+
 #ifdef XP_UNIX
   if (greFound) {
     char resolved_greDir[MAXPATHLEN] = "";
@@ -439,7 +443,29 @@ main(int argc, char **argv)
 #endif
     }
 
+    bool hasProfileArg = false;
+    for (int i = 1; i < argc; i++) {
+      if (strcmp(argv[i], "-profile") == 0) {
+        hasProfileArg = true;
+        break;
+      }
+    }
+    char** oldArgv = argv;
+    if (!hasProfileArg && FolderExists(portableProfileDir)) {
+      int oldArgc = argc;
+      argc = oldArgc + 2;
+      argv = new char*[argc + 1];
+      memcpy(argv, oldArgv, sizeof(char*) * oldArgc);
+      argv[argc - 2] = "-profile";
+      argv[argc - 1] = portableProfileDir;
+      argv[argc] = 0;
+    }
+
     retval = XRE_main(argc, argv, appData, 0);
+
+    if (oldArgv != argv) {
+      delete argv;
+    }
   }
 
   NS_LogTerm();