Solaris patch

base/base_paths_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base_paths.h"
 
 #include <ostream>
 #include <string>
 
 #include "build/build_config.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/nix/xdg_util.h"
 
 #if defined(OS_FREEBSD)
 #include <sys/param.h>
 #include <sys/sysctl.h>
+#elif defined(OS_SOLARIS)
+#include <stdlib.h>
 #endif
 
 namespace base {
 
 #if defined(OS_LINUX)
 const char kSelfExe[] = "/proc/self/exe";
-#elif defined(OS_SOLARIS)
-const char kSelfExe[] = getexecname();

[Evan Martin, 2011/06/24 17:51:18]

Thanks for fixing this!

 #endif
 
 // The name of this file relative to the source root. This is used for checking
 // that the source checkout is in the correct place.
 static const char kThisSourceFile[] = "base/base_paths_linux.cc";
 
 bool PathProviderPosix(int key, FilePath* result) {
   FilePath path;
   switch (key) {
     case base::FILE_EXE:
@@ skipping 11 matching lines @@
       char bin_dir[PATH_MAX + 1];
       size_t length = sizeof(bin_dir);
       int error = sysctl(name, 4, bin_dir, &length, NULL, 0);
       if (error < 0 || length == 0 || strlen(bin_dir) == 0) {
         NOTREACHED() << "Unable to resolve path.";
         return false;
       }
       bin_dir[strlen(bin_dir)] = 0;
       *result = FilePath(bin_dir);
       return true;
+#elif defined(OS_SOLARIS)
+      char bin_dir[PATH_MAX + 1];
+      if (realpath(getexecname(), bin_dir) == NULL) {
+        NOTREACHED() << "Unable to resolve " << getexecname() << ".";
+        return false;
+      }
+      *result = FilePath(bin_dir);
+      return true;
 #endif
     }
     case base::DIR_SOURCE_ROOT: {
       // Allow passing this in the environment, for more flexibility in build
       // tree configurations (sub-project builds, gyp --output_dir, etc.)
       scoped_ptr<base::Environment> env(base::Environment::Create());
       std::string cr_source_root;
       if (env->GetVar("CR_SOURCE_ROOT", &cr_source_root)) {
         path = FilePath(cr_source_root);
         if (file_util::PathExists(path.Append(kThisSourceFile))) {
@@ skipping 38 matching lines @@
       scoped_ptr<base::Environment> env(base::Environment::Create());
       FilePath cache_dir(base::nix::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
                                                     ".cache"));
       *result = cache_dir;
       return true;
   }
   return false;
 }
 
 }  // namespace base