323657 Fixing XULRunner bustage by moving nsMacUtils class to nsMacUtilsImpl. r=dbaron sr=dbaron

xpcom/base/Makefile.in

@@ -72,7 +72,7 @@ REQUIRES	+= boehm
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-CPPSRCS		+= nsMacUtils.cpp
+CPPSRCS		+= nsMacUtilsImpl.cpp
 endif
 
 EXPORTS		= \

xpcom/base/nsMacUtilsImpl.cpp

@@ -0,0 +1,125 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is XPCOM utility functions for Mac OS X
+ *
+ * The Initial Developer of the Original Code is Google Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Mark Mentovai <mark@moxienet.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMacUtilsImpl.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <mach-o/fat.h>
+
+NS_IMPL_ISUPPORTS1(nsMacUtilsImpl, nsIMacUtils)
+
+/* readonly attribute boolean isUniversalBinary; */
+// True when the main executable is a fat file supporting at least
+// ppc and x86 (universal binary).
+NS_IMETHODIMP nsMacUtilsImpl::GetIsUniversalBinary(PRBool *aIsUniversalBinary)
+{
+  static PRBool sInitialized = PR_FALSE,
+                sIsUniversalBinary = PR_FALSE;
+
+  if (sInitialized) {
+    *aIsUniversalBinary = sIsUniversalBinary;
+    return NS_OK;
+  }
+
+  PRBool foundPPC = PR_FALSE,
+         foundX86 = PR_FALSE;
+  CFURLRef executableURL = nsnull;
+  int fd = -1;
+
+  CFBundleRef mainBundle;
+  if (!(mainBundle = ::CFBundleGetMainBundle()))
+    goto done;
+
+  if (!(executableURL = ::CFBundleCopyExecutableURL(mainBundle)))
+    goto done;
+
+  char executablePath[PATH_MAX];
+  if (!::CFURLGetFileSystemRepresentation(executableURL, PR_TRUE,
+                                          (UInt8*) executablePath,
+                                          sizeof(executablePath)))
+    goto done;
+
+  if ((fd = open(executablePath, O_RDONLY)) == -1)
+    goto done;
+
+  struct fat_header fatHeader;
+  if (read(fd, &fatHeader, sizeof(fatHeader)) != sizeof(fatHeader))
+    goto done;
+
+  // The fat header is always stored on disk as big-endian.
+  fatHeader.magic = CFSwapInt32BigToHost(fatHeader.magic);
+  fatHeader.nfat_arch = CFSwapInt32BigToHost(fatHeader.nfat_arch);
+
+  // Main executable is thin.
+  if (fatHeader.magic != FAT_MAGIC)
+    goto done;
+
+  // Loop over each architecture in the file.  We're presently only
+  // interested in 32-bit PPC and x86.
+  for (PRUint32 i = 0 ; i < fatHeader.nfat_arch ; i++) {
+    struct fat_arch fatArch;
+    if (read(fd, &fatArch, sizeof(fatArch)) != sizeof(fatArch))
+      goto done;
+
+    // This is still part of the fat header, so byte-swap as needed.
+    fatArch.cputype = CFSwapInt32BigToHost(fatArch.cputype);
+
+    // Don't mask out the ABI bits.  This allows identification of ppc64
+    // as distinct from ppc.  CPU_TYPE_X86 is preferred to CPU_TYPE_I386
+    // but does not exist prior to the 10.4 headers.
+    if (fatArch.cputype == CPU_TYPE_POWERPC)
+      foundPPC = PR_TRUE;
+    else if (fatArch.cputype == CPU_TYPE_I386)
+      foundX86 = PR_TRUE;
+  }
+
+  if (foundPPC && foundX86)
+    sIsUniversalBinary = PR_TRUE;
+
+done:
+  if (fd != -1)
+    close(fd);
+  if (executableURL)
+    ::CFRelease(executableURL);
+
+  *aIsUniversalBinary = sIsUniversalBinary;
+  sInitialized = PR_TRUE;
+
+  return NS_OK;
+}

xpcom/base/nsMacUtilsImpl.h

@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is XPCOM utility functions for Mac OS X
+ *
+ * The Initial Developer of the Original Code is Google Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Mark Mentovai <mark@moxienet.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMacUtilsImpl_h___
+#define nsMacUtilsImpl_h___
+
+#include "nsIMacUtils.h"
+
+class nsMacUtilsImpl : public nsIMacUtils
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIMACUTILS
+
+  nsMacUtilsImpl() {}
+
+private:
+  ~nsMacUtilsImpl() {}
+};
+
+// Global singleton service
+// 697BD3FD-43E5-41CE-AD5E-C339175C0818
+#define NS_MACUTILSIMPL_CLASSNAME "Mac OS X Utilities"
+#define NS_MACUTILSIMPL_CID \
+ {0x697BD3FD, 0x43E5, 0x41CE, {0xAD, 0x5E, 0xC3, 0x39, 0x17, 0x5C, 0x08, 0x18}}
+#define NS_MACUTILSIMPL_CONTRACTID "@mozilla.org/xpcom/mac-utils;1"
+
+#endif /* nsMacUtilsImpl_h___ */

xpcom/build/nsXPComInit.cpp

@@ -131,7 +131,7 @@ NS_DECL_CLASSINFO(nsStringInputStream)
 #endif
 
 #ifdef XP_MACOSX
-#include "nsMacUtils.h"
+#include "nsMacUtilsImpl.h"
 #endif
 
 #include <locale.h>
@@ -222,7 +222,7 @@ NS_GENERIC_AGGREGATED_CONSTRUCTOR_INIT(nsProperties, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUUIDGenerator)
 
 #ifdef XP_MACOSX
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacUtils)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacUtilsImpl)
 #endif
 
 static NS_METHOD
@@ -419,7 +419,7 @@ static const nsModuleComponentInfo components[] = {
 #endif
 
 #ifdef XP_MACOSX
-    COMPONENT(MACUTILS, nsMacUtilsConstructor),
+    COMPONENT(MACUTILSIMPL, nsMacUtilsImplConstructor),
 #endif
 };