From feab23649a065044b701eaa8259f7c48d21915f2 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 28 Sep 2017 10:49:48 +0900
Subject: [PATCH] Bug 1403366 - When NS_XPCOM_INIT_CURRENT_PROCESS_DIR is not
 already set, fallback to BinaryPath's parent. r=froydnj

The Windows and OSX code paths were essentially doing the same thing,
and the Unix fallback was using an old convention that is pretty much
outdated.

Under normal conditions (XPCOM initialized by Firefox),
NS_XPCOM_INIT_CURRENT_PROCESS_DIR is set from BinaryPath anyways, so
this only really affects adhoc XPCOM initialization from e.g. C++ unit
tests.

--HG--
extra : rebase_source : f7faa6f22ffc56fb4da7ae96eb571a35fa6f615d
---
 xpcom/io/moz.build              |   5 +-
 xpcom/io/nsDirectoryService.cpp | 105 +-------------------------------
 2 files changed, 7 insertions(+), 103 deletions(-)

diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build
index 25354ea38c40..3480ba63a5c1 100644
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -132,7 +132,10 @@ FINAL_LIBRARY = 'xul'
 if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']:
     DEFINES['HAVE_USR_LIB64_DIR'] = True
 
-LOCAL_INCLUDES += ['!..']
+LOCAL_INCLUDES += [
+    '!..',
+    '../build',
+]
 
 if CONFIG['_MSC_VER']:
     # This is intended as a temporary hack to support building with VS2015.
diff --git a/xpcom/io/nsDirectoryService.cpp b/xpcom/io/nsDirectoryService.cpp
index f05b94eafdd1..f08656a71eb8 100644
--- a/xpcom/io/nsDirectoryService.cpp
+++ b/xpcom/io/nsDirectoryService.cpp
@@ -37,6 +37,7 @@
 
 #include "SpecialSystemDirectory.h"
 #include "nsAppFileLocationProvider.h"
+#include "BinaryPath.h"
 
 using namespace mozilla;
 
@@ -73,109 +74,9 @@ nsDirectoryService::GetCurrentProcessDirectory(nsIFile** aFile)
     return NS_OK;
   }
 
-  RefPtr<nsLocalFile> localFile = new nsLocalFile;
-
-#ifdef XP_WIN
-  wchar_t buf[MAX_PATH + 1];
-  SetLastError(ERROR_SUCCESS);
-  if (GetModuleFileNameW(0, buf, mozilla::ArrayLength(buf)) &&
-      GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-    // chop off the executable name by finding the rightmost backslash
-    wchar_t* lastSlash = wcsrchr(buf, L'\\');
-    if (lastSlash) {
-      *(lastSlash + 1) = L'\0';
-    }
-
-    localFile->InitWithPath(nsDependentString(buf));
-    localFile.forget(aFile);
-    return NS_OK;
+  if (NS_SUCCEEDED(BinaryPath::GetFile(getter_AddRefs(file)))) {
+    return file->GetParent(aFile);
   }
-
-#elif defined(MOZ_WIDGET_COCOA)
-  // Works even if we're not bundled.
-  CFBundleRef appBundle = CFBundleGetMainBundle();
-  if (appBundle) {
-    CFURLRef bundleURL = CFBundleCopyExecutableURL(appBundle);
-    if (bundleURL) {
-      CFURLRef parentURL = CFURLCreateCopyDeletingLastPathComponent(
-        kCFAllocatorDefault, bundleURL);
-      if (parentURL) {
-        // Pass true for the "resolveAgainstBase" arg to CFURLGetFileSystemRepresentation.
-        // This will resolve the relative portion of the CFURL against it base, giving a full
-        // path, which CFURLCopyFileSystemPath doesn't do.
-        char buffer[PATH_MAX];
-        if (CFURLGetFileSystemRepresentation(parentURL, true,
-                                             (UInt8*)buffer, sizeof(buffer))) {
-#ifdef DEBUG_conrad
-          printf("nsDirectoryService - CurrentProcessDir is: %s\n", buffer);
-#endif
-          nsresult rv = localFile->InitWithNativePath(nsDependentCString(buffer));
-          if (NS_SUCCEEDED(rv)) {
-            localFile.forget(aFile);
-          }
-        }
-        CFRelease(parentURL);
-      }
-      CFRelease(bundleURL);
-    }
-  }
-
-  NS_ASSERTION(*aFile, "nsDirectoryService - Could not determine CurrentProcessDir.\n");
-  if (*aFile) {
-    return NS_OK;
-  }
-
-#elif defined(XP_UNIX)
-
-  // In the absence of a good way to get the executable directory let
-  // us try this for unix:
-  //    - if MOZILLA_FIVE_HOME is defined, that is it
-  //    - else give the current directory
-  char buf[MAXPATHLEN];
-
-  // The MOZ_DEFAULT_MOZILLA_FIVE_HOME variable can be set at configure time with
-  // a --with-default-mozilla-five-home=foo autoconf flag.
-  //
-  // The idea here is to allow for builds that have a default MOZILLA_FIVE_HOME
-  // regardless of the environment.  This makes it easier to write apps that
-  // embed mozilla without having to worry about setting up the environment
-  //
-  // We do this by putenv()ing the default value into the environment.  Note that
-  // we only do this if it is not already set.
-#ifdef MOZ_DEFAULT_MOZILLA_FIVE_HOME
-  const char* home = PR_GetEnv("MOZILLA_FIVE_HOME");
-  if (!home || !*home) {
-    putenv("MOZILLA_FIVE_HOME=" MOZ_DEFAULT_MOZILLA_FIVE_HOME);
-  }
-#endif
-
-  char* moz5 = PR_GetEnv("MOZILLA_FIVE_HOME");
-  if (moz5 && *moz5) {
-    if (realpath(moz5, buf)) {
-      localFile->InitWithNativePath(nsDependentCString(buf));
-      localFile.forget(aFile);
-      return NS_OK;
-    }
-  }
-#if defined(DEBUG)
-  static bool firstWarning = true;
-
-  if ((!moz5 || !*moz5) && firstWarning) {
-    // Warn that MOZILLA_FIVE_HOME not set, once.
-    printf("Warning: MOZILLA_FIVE_HOME not set.\n");
-    firstWarning = false;
-  }
-#endif /* DEBUG */
-
-  // Fall back to current directory.
-  if (getcwd(buf, sizeof(buf))) {
-    localFile->InitWithNativePath(nsDependentCString(buf));
-    localFile.forget(aFile);
-    return NS_OK;
-  }
-
-#endif
-
   NS_ERROR("unable to get current process directory");
   return NS_ERROR_FAILURE;
 } // GetCurrentProcessDirectory()