Small improvement to init_process() function.

lordmulder · Oct 22, 2018 · 89b73b9 · 89b73b9
1 parent 8fa4484
commit 89b73b9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/src/Global.cpp b/src/Global.cpp
@@ -540,34 +540,50 @@ static void prependToPath(QProcessEnvironment &env, const QString &value)
 void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths, const QHash<QString, QString> *const extraEnv)
 {
 	//Environment variable names
-	static const char *const s_envvar_names_temp[] =
+	static const char *const ENVVAR_NAMES_TMP[] =
 	{
 		"TEMP", "TMP", "TMPDIR", "HOME", "USERPROFILE", "HOMEPATH", NULL
 	};
-	static const char *const s_envvar_names_remove[] =
+	static const char *const ENVVAR_NAMES_SYS[] =
 	{
-		"WGETRC", "SYSTEM_WGETRC", "HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "GNUPGHOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL
+		"WINDIR", "SYSTEMROOT", NULL
+	};
+	static const char *const ENVVAR_NAMES_DEL[] =
+	{
+		"HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "HOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE",
+		"LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL
 	};
 
 	//Initialize environment
 	QProcessEnvironment env = process.processEnvironment();
-	if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment();
+	if (env.isEmpty())
+	{
+		env = QProcessEnvironment::systemEnvironment();
+	}
 
-	//Clean a number of enviroment variables that might affect our tools
-	for(size_t i = 0; s_envvar_names_remove[i]; i++)
+	//Clean enviroment variables that might affect our tools
+	for(const char *const *ptr = ENVVAR_NAMES_DEL; *ptr; ++ptr)
 	{
-		env.remove(QString::fromLatin1(s_envvar_names_remove[i]));
-		env.remove(QString::fromLatin1(s_envvar_names_remove[i]).toLower());
+		env.remove(QString::fromLatin1(*ptr));
 	}
 
-	const QString tempDir = QDir::toNativeSeparators(temp_folder());
+	//Set up system root directory
+	const QString sysRoot = QDir::toNativeSeparators(OS::known_folder(OS::FOLDER_SYSTROOT_DIR));
+	if (!sysRoot.isEmpty())
+	{
+		for (const char *const *ptr = ENVVAR_NAMES_SYS; *ptr; ++ptr)
+		{
+			env.insert(QString::fromLatin1(*ptr), sysRoot);
+		}
+	}
 
 	//Replace TEMP directory in environment
+	const QString tempDir = QDir::toNativeSeparators(temp_folder());
 	if(bReplaceTempDir)
 	{
-		for(size_t i = 0; s_envvar_names_temp[i]; i++)
+		for (const char *const *ptr = ENVVAR_NAMES_TMP; *ptr; ++ptr)
 		{
-			env.insert(s_envvar_names_temp[i], tempDir);
+			env.insert(QString::fromLatin1(*ptr), tempDir);
 		}
 	}
 

diff --git a/src/UpdateChecker.cpp b/src/UpdateChecker.cpp
@@ -104,8 +104,10 @@ static QQueue<QString> buildRandomList(const char *const *values)
 
 static const QHash<QString, QString> *initEnvVars(void)
 {
+	const QString tempfolder = QDir::toNativeSeparators(MUtils::temp_folder());
 	QHash<QString, QString> *const environment = new QHash<QString, QString>();
-	environment->insert(QLatin1String("CURL_HOME"), QDir::toNativeSeparators(MUtils::temp_folder()));
+	environment->insert(QLatin1String("CURL_HOME"), tempfolder);
+	environment->insert(QLatin1String("GNUPGHOME"), tempfolder);
 	return environment;
 }