Fixed bug: we can now handle "a:b" as a file name.

webkit/fileapi/obfuscated_file_util.cc

 // Copyright (c) 2012 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 "webkit/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 279 matching lines @@
     // The file doesn't exist.
     if (!(file_flags & (base::PLATFORM_FILE_CREATE |
         base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_OPEN_ALWAYS)))
       return base::PLATFORM_FILE_ERROR_NOT_FOUND;
     FileId parent_id;
     if (!db->GetFileWithPath(virtual_path.internal_path().DirName(),
                              &parent_id))
       return base::PLATFORM_FILE_ERROR_NOT_FOUND;
     FileInfo file_info;
     InitFileInfo(&file_info, parent_id,
-                 virtual_path.internal_path().BaseName().value());
+                 VirtualPath::BaseName(virtual_path.internal_path()).value());
     if (!AllocateQuotaForPath(context, 1, file_info.name.size()))
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
     PlatformFileError error = CreateFile(
         context, FileSystemPath(),
         virtual_path.origin(), virtual_path.type(), &file_info,
         file_flags, file_handle);
     if (created && base::PLATFORM_FILE_OK == error)
       *created = true;
     return error;
   }
@@ skipping 42 matching lines @@
     if (created)
       *created = false;
     return base::PLATFORM_FILE_OK;
   }
   FileId parent_id;
   if (!db->GetFileWithPath(virtual_path.internal_path().DirName(), &parent_id))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   FileInfo file_info;
   InitFileInfo(&file_info, parent_id,
-               virtual_path.internal_path().BaseName().value());
+               VirtualPath::BaseName(virtual_path.internal_path()).value());
   if (!AllocateQuotaForPath(context, 1, file_info.name.size()))
     return base::PLATFORM_FILE_ERROR_NO_SPACE;
   PlatformFileError error = CreateFile(context,
       FileSystemPath(),
       virtual_path.origin(), virtual_path.type(), &file_info,
       0, NULL);
   if (created && base::PLATFORM_FILE_OK == error)
     *created = true;
   return error;
 }
@@ skipping 15 matching lines @@
     if (!db->GetFileInfo(file_id, &file_info)) {
       NOTREACHED();
       return base::PLATFORM_FILE_ERROR_FAILED;
     }
     if (!file_info.is_directory())
       return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
     return base::PLATFORM_FILE_OK;
   }
 
   std::vector<FilePath::StringType> components;
-  virtual_path.internal_path().GetComponents(&components);
+  VirtualPath::GetComponents(virtual_path.internal_path(), &components);
   FileId parent_id = 0;
   size_t index;
   for (index = 0; index < components.size(); ++index) {
     FilePath::StringType name = components[index];
     if (name == FILE_PATH_LITERAL("/"))
       continue;
     if (!db->GetChildWithName(parent_id, name, &parent_id))
       break;
   }
   if (!recursive && components.size() - index > 1)
@@ skipping 299 matching lines @@
         TouchDirectory(db, dest_file_info.parent_id);
       return error;
     } else {
       FileId dest_parent_id;
       if (!db->GetFileWithPath(dest_path.internal_path().DirName(),
                                &dest_parent_id)) {
         NOTREACHED();  // We shouldn't be called in this case.
         return base::PLATFORM_FILE_ERROR_NOT_FOUND;
       }
       InitFileInfo(&dest_file_info, dest_parent_id,
-          dest_path.internal_path().BaseName().value());
+          VirtualPath::BaseName(dest_path.internal_path()).value());
       if (!AllocateQuotaForPath(context, 1, dest_file_info.name.size()))
         return base::PLATFORM_FILE_ERROR_NO_SPACE;
       return CreateFile(context, src_local_path,
                         dest_path.origin(), dest_path.type(), &dest_file_info,
                         0, NULL);
     }
   } else {  // It's a move.
     if (overwrite) {
       AllocateQuotaForPath(context, -1,
           -static_cast<int64>(src_file_info.name.size()));
@@ skipping 13 matching lines @@
       FileId dest_parent_id;
       if (!db->GetFileWithPath(dest_path.internal_path().DirName(),
                                &dest_parent_id)) {
         NOTREACHED();
         return base::PLATFORM_FILE_ERROR_FAILED;
       }
       FilePath dest_internal_path = dest_path.internal_path();
       FilePath src_internal_path = src_path.internal_path();
       if (!AllocateQuotaForPath(
           context, 0,
-          static_cast<int64>(dest_internal_path.BaseName().value().size())
-              -static_cast<int64>(src_file_info.name.size())))
+          static_cast<int64>(
+              VirtualPath::BaseName(dest_internal_path).value().size()) -
+              static_cast<int64>(src_file_info.name.size())))
         return base::PLATFORM_FILE_ERROR_NO_SPACE;
       FileId src_parent_id = src_file_info.parent_id;
       src_file_info.parent_id = dest_parent_id;
-      src_file_info.name = dest_path.internal_path().BaseName().value();
+      src_file_info.name =
+          VirtualPath::BaseName(dest_path.internal_path()).value();
       if (!db->UpdateFileInfo(src_file_id, src_file_info))
         return base::PLATFORM_FILE_ERROR_FAILED;
       UpdatePathQuotaUsage(
           context, src_path.origin(), src_path.type(), 0,
-          static_cast<int64>(dest_internal_path.BaseName().value().size()) -
-              static_cast<int64>(src_internal_path.BaseName().value().size()));
+          static_cast<int64>(
+              VirtualPath::BaseName(dest_internal_path).value().size()) -
+              static_cast<int64>(
+                  VirtualPath::BaseName(src_internal_path).value().size()));
       TouchDirectory(db, src_parent_id);
       TouchDirectory(db, dest_parent_id);
       return base::PLATFORM_FILE_OK;
     }
   }
   NOTREACHED();
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
 PlatformFileError ObfuscatedFileUtil::CopyInForeignFile(
@@ skipping 20 matching lines @@
         underlying_src_path,
         dest_local_path, true /* copy */);
   } else {
     FileId dest_parent_id;
     if (!db->GetFileWithPath(dest_path.internal_path().DirName(),
                              &dest_parent_id)) {
       NOTREACHED();  // We shouldn't be called in this case.
       return base::PLATFORM_FILE_ERROR_NOT_FOUND;
     }
     InitFileInfo(&dest_file_info, dest_parent_id,
-        dest_path.internal_path().BaseName().value());
+        VirtualPath::BaseName(dest_path.internal_path()).value());
     if (!AllocateQuotaForPath(context, 1, dest_file_info.name.size()))
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
     return CreateFile(context, underlying_src_path,
                       dest_path.origin(), dest_path.type(), &dest_file_info,
                       0, NULL);
   }
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
 PlatformFileError ObfuscatedFileUtil::DeleteFile(
@@ skipping 130 matching lines @@
     if (db->GetFileWithPath(relative_virtual_path, &file_id)) {
       NOTREACHED();  // File already exists.
       return false;
     }
     if (!db->GetFileWithPath(relative_virtual_path.DirName(), &file_id)) {
       NOTREACHED();  // Parent doesn't exist.
       return false;
     }
 
     FileInfo file_info;
-    file_info.name = src_full_path.BaseName().value();
+    file_info.name = VirtualPath::BaseName(src_full_path).value();
     if (file_util::FileEnumerator::IsDirectory(info)) {
 #if defined(OS_WIN)
       file_info.modification_time =
           base::Time::FromFileTime(info.ftLastWriteTime);
 #elif defined(OS_POSIX)
       file_info.modification_time = base::Time::FromTimeT(info.stat.st_mtime);
 #endif
     } else {
       file_info.data_path =
           FilePath(kLegacyDataDirectory).Append(relative_virtual_path);
@@ skipping 60 matching lines @@
   if (path.empty())
     return true;
   if (!file_util::DirectoryExists(path))
     return true;
   path = path.AppendASCII(kDirectoryDatabaseName);
   return FileSystemDirectoryDatabase::DestroyDatabase(path);
 }
 
 // static
 int64 ObfuscatedFileUtil::ComputeFilePathCost(const FilePath& path) {
-  return GetPathQuotaUsage(1, path.BaseName().value().size());
+  return GetPathQuotaUsage(1, VirtualPath::BaseName(path).value().size());
 }
 
 PlatformFileError ObfuscatedFileUtil::GetFileInfoInternal(
     FileSystemDirectoryDatabase* db,
     FileSystemOperationContext* context,
     const GURL& origin,
     FileSystemType type,
     FileId file_id,
     FileInfo* local_info,
     base::PlatformFileInfo* file_info,
@@ skipping 251 matching lines @@
       return false;
     }
     origin_database_.reset(
         new FileSystemOriginDatabase(
             file_system_directory_.AppendASCII(kOriginDatabaseName)));
   }
   return true;
 }
 
 }  // namespace fileapi