Remove deprecated FSRef-manipulation methods.

webrtc/base/unixfilesystem.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 43 matching lines @@
 // Defined in applefilesystem.mm.  No header file to discourage use
 // elsewhere; other places should use GetApp{Data,Temp}Folder() in
 // this file.  Don't copy/paste.  I mean it.
 char* AppleDataDirectory();
 char* AppleTempDirectory();
 void AppleAppName(rtc::Pathname* path);
 #endif
 
 namespace rtc {
 
-#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
+#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_MAC)
 char* UnixFilesystem::app_temp_path_ = NULL;
 #else
 char* UnixFilesystem::provided_app_data_folder_ = NULL;
 char* UnixFilesystem::provided_app_temp_folder_ = NULL;
 
 void UnixFilesystem::SetAppDataFolder(const std::string& folder) {
   delete [] provided_app_data_folder_;
   provided_app_data_folder_ = CopyString(folder);
 }
 
 void UnixFilesystem::SetAppTempFolder(const std::string& folder) {
   delete [] provided_app_temp_folder_;
   provided_app_temp_folder_ = CopyString(folder);
 }
 #endif
 
 UnixFilesystem::UnixFilesystem() {
-#if defined(WEBRTC_IOS)
+#if defined(WEBRTC_MAC)
   if (!provided_app_data_folder_)
     provided_app_data_folder_ = AppleDataDirectory();
   if (!provided_app_temp_folder_)
     provided_app_temp_folder_ = AppleTempDirectory();
 #endif
 }
 
 UnixFilesystem::~UnixFilesystem() {}
 
 bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) {
@@ skipping 71 matching lines @@
   if (!IsFolder(folder)) {
     ASSERT(IsFolder(folder));
     return false;
   }
   std::string no_slash(folder.pathname(), 0, folder.pathname().length()-1);
   return ::rmdir(no_slash.c_str()) == 0;
 }
 
 bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create,
                                         const std::string *append) {
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
   ASSERT(provided_app_temp_folder_ != NULL);
   pathname.SetPathname(provided_app_temp_folder_, "");
 #else
   if (const char* tmpdir = getenv("TMPDIR")) {
     pathname.SetPathname(tmpdir, "");
   } else if (const char* tmp = getenv("TMP")) {
     pathname.SetPathname(tmp, "");
   } else {
 #ifdef P_tmpdir
     pathname.SetPathname(P_tmpdir, "");
@@ skipping 89 matching lines @@
 
   while (source->Read(buf, sizeof(buf), &len, NULL) == SR_SUCCESS)
     dest->Write(buf, len, NULL, NULL);
 
   delete source;
   delete dest;
   return true;
 }
 
 bool UnixFilesystem::IsTemporaryPath(const Pathname& pathname) {
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
   ASSERT(provided_app_temp_folder_ != NULL);
 #endif
 
   const char* const kTempPrefixes[] = {
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
     provided_app_temp_folder_,
-#else
-    "/tmp/", "/var/tmp/",
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
     "/private/tmp/", "/private/var/tmp/", "/private/var/folders/",
 #endif  // WEBRTC_MAC && !defined(WEBRTC_IOS)
+#else
+    "/tmp/", "/var/tmp/",
 #endif  // WEBRTC_ANDROID || WEBRTC_IOS
   };
   for (size_t i = 0; i < arraysize(kTempPrefixes); ++i) {
     if (0 == strncmp(pathname.pathname().c_str(), kTempPrefixes[i],
                      strlen(kTempPrefixes[i])))
       return true;
   }
   return false;
 }
 
@@ skipping 52 matching lines @@
   ssize_t len = readlink("/proc/self/exe", buffer, arraysize(buffer) - 1);
   if ((len <= 0) || (len == PATH_MAX + 1))
     return false;
   buffer[len] = '\0';
   path->SetPathname(buffer);
   return true;
 #endif  // WEBRTC_MAC && !defined(WEBRTC_IOS)
 }
 
 bool UnixFilesystem::GetAppDataFolder(Pathname* path, bool per_user) {
+  // On macOS and iOS, there is no requirement that the path contains the
+  // organization.
+#if !defined(WEBRTC_MAC)
   ASSERT(!organization_name_.empty());
+#endif
   ASSERT(!application_name_.empty());
 
   // First get the base directory for app data.
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-  if (per_user) {
-    // Use ~/Library/Application Support/<orgname>/<appname>/
-    FSRef fr;
-    if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType,
-                          kCreateFolder, &fr))
-      return false;
-    unsigned char buffer[NAME_MAX+1];
-    if (0 != FSRefMakePath(&fr, buffer, arraysize(buffer)))
-      return false;
-    path->SetPathname(reinterpret_cast<char*>(buffer), "");
-  } else {
-    // TODO
-    return false;
-  }
-#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)  // && !WEBRTC_MAC || WEBRTC_IOS
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
   ASSERT(provided_app_data_folder_ != NULL);
   path->SetPathname(provided_app_data_folder_, "");
-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)  // && !WEBRTC_MAC && !WEBRTC_IOS && !WEBRTC_ANDROID
+#elif defined(WEBRTC_LINUX) // && !WEBRTC_MAC && !WEBRTC_ANDROID
   if (per_user) {
     // We follow the recommendations in
     // http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
     // It specifies separate directories for data and config files, but
     // GetAppDataFolder() does not distinguish. We just return the config dir
     // path.
     const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
     if (xdg_config_home) {
       path->SetPathname(xdg_config_home, "");
     } else {
@@ skipping 43 matching lines @@
   // avoids both issues since it will fail if the path is not owned by us.
   if (0 != ::chmod(path->pathname().c_str(), 0700)) {
     LOG_ERR(LS_ERROR) << "Can't set mode on " << path;
     return false;
   }
 #endif
   return true;
 }
 
 bool UnixFilesystem::GetAppTempFolder(Pathname* path) {
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
   ASSERT(provided_app_temp_folder_ != NULL);
   path->SetPathname(provided_app_temp_folder_);
   return true;
 #else
   ASSERT(!application_name_.empty());
   // TODO: Consider whether we are worried about thread safety.
   if (app_temp_path_ != NULL && strlen(app_temp_path_) > 0) {
     path->SetPathname(app_temp_path_);
     return true;
   }
@@ skipping 77 matching lines @@
 
 }  // namespace rtc
 
 #if defined(__native_client__)
 extern "C" int __attribute__((weak))
 link(const char* oldpath, const char* newpath) {
   errno = EACCES;
   return -1;
 }
 #endif