summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-14 16:31:54 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:43:49 +0200
commit8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942 (patch)
treedec6a2387789e863bf8229cb28d74cd8de2cc83a
parenta377d1ecd42370fbf28395b75535ebfcd9f733f7 (diff)
downloadUXP-8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942.tar
UXP-8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942.tar.gz
UXP-8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942.tar.lz
UXP-8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942.tar.xz
UXP-8fa80e2c8d3d79ba2ee7481d1defbec50d7a0942.zip
Revert "Issue #1441 - Guard appomni/greomni with UXP_CUSTOM_OMNI env var."
This reverts commit 2bdbca39b210e3f13ae42ccae36935d30b36eb31.
-rw-r--r--toolkit/xre/nsAppRunner.cpp72
1 files changed, 34 insertions, 38 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index d8f95c2a8..b27e46697 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4131,49 +4131,45 @@ XRE_InitCommandLine(int aArgc, char* aArgv[])
delete[] canonArgs;
#endif
- if (PR_GetEnv("UXP_CUSTOM_OMNI")) {
- // Process CLI parameters for specifying custom omnijars
- const char *path = nullptr;
- ArgResult ar = CheckArg("greomni", true, &path);
- if (ar == ARG_BAD) {
- PR_fprintf(PR_STDERR,
- "Error: argument --greomni requires a path argument or the "
- "--osint argument was specified with the --greomni argument "
- "which is invalid.\n");
- return NS_ERROR_FAILURE;
- }
-
- if (!path)
- return rv;
+ const char *path = nullptr;
+ ArgResult ar = CheckArg("greomni", true, &path);
+ if (ar == ARG_BAD) {
+ PR_fprintf(PR_STDERR,
+ "Error: argument --greomni requires a path argument or the "
+ "--osint argument was specified with the --greomni argument "
+ "which is invalid.\n");
+ return NS_ERROR_FAILURE;
+ }
- nsCOMPtr<nsIFile> greOmni;
- rv = XRE_GetFileFromPath(path, getter_AddRefs(greOmni));
- if (NS_FAILED(rv)) {
- PR_fprintf(PR_STDERR, "Error: argument --greomni requires a valid path\n");
- return rv;
- }
+ if (!path)
+ return rv;
- ar = CheckArg("appomni", true, &path);
- if (ar == ARG_BAD) {
- PR_fprintf(PR_STDERR,
- "Error: argument --appomni requires a path argument or the "
- "--osint argument was specified with the --appomni argument "
- "which is invalid.\n");
- return NS_ERROR_FAILURE;
- }
+ nsCOMPtr<nsIFile> greOmni;
+ rv = XRE_GetFileFromPath(path, getter_AddRefs(greOmni));
+ if (NS_FAILED(rv)) {
+ PR_fprintf(PR_STDERR, "Error: argument --greomni requires a valid path\n");
+ return rv;
+ }
- nsCOMPtr<nsIFile> appOmni;
- if (path) {
- rv = XRE_GetFileFromPath(path, getter_AddRefs(appOmni));
- if (NS_FAILED(rv)) {
- PR_fprintf(PR_STDERR, "Error: argument --appomni requires a valid path\n");
- return rv;
- }
- }
+ ar = CheckArg("appomni", true, &path);
+ if (ar == ARG_BAD) {
+ PR_fprintf(PR_STDERR,
+ "Error: argument --appomni requires a path argument or the "
+ "--osint argument was specified with the --appomni argument "
+ "which is invalid.\n");
+ return NS_ERROR_FAILURE;
+ }
- mozilla::Omnijar::Init(greOmni, appOmni);
- } // UXP_CUSTOM_OMNI
+ nsCOMPtr<nsIFile> appOmni;
+ if (path) {
+ rv = XRE_GetFileFromPath(path, getter_AddRefs(appOmni));
+ if (NS_FAILED(rv)) {
+ PR_fprintf(PR_STDERR, "Error: argument --appomni requires a valid path\n");
+ return rv;
+ }
+ }
+ mozilla::Omnijar::Init(greOmni, appOmni);
return rv;
}