mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-11-10 07:06:34 +00:00
c7026b9094
* Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Updated AddOnContentLocationResolver and RegisteredLocationResolver to 9.0.0 * Finished updating lr to 9.0.0 * Updated NCM to 9.0.0 * Fix libstrat includes * Fixed application launching * title_id_2 -> owner_tid * Updated to new-ipc * Change to using pure virtuals * Title Id -> Program Id * Fixed compilation against master * std::scoped_lock<> -> std::scoped_lock * Adopted R_UNLESS and R_CONVERT * Prefix namespace to Results * Adopt std::numeric_limits * Fixed incorrect error handling in ReadFile * Adopted AMS_ABORT_UNLESS * Adopt util::GenerateUuid() * Syntax improvements * ncm_types: Address review * Address more review comments * Updated copyrights * Address more feedback * More feedback addressed * More changes * Move dispatch tables out of interface files * Addressed remaining comments * lr: move into libstratosphere * ncm: Fix logic inversion * lr: Add comments * lr: Remove whitespace * ncm: Start addressing feedback * ncm: Cleanup InitializeContentManager * lr: support client-side usage * lr_service -> lr_api * ncm: Begin refactoring content manager * ncm: More content manager improvements * ncm: Content manager mount improvements * ldr: use lr bindings * lr bindings usage: minor fixes * ncm/lr: Pointer placement * ncm: placeholder accessor cleanup * ncm: minor fixes * ncm: refactor rights cache * ncm: content meta database cleanup * ncm: move content meta database impl out of interface file * ncm: Use const ContentMetaKey & * ncm: fix other non-const ContentMetaKey references * ncm: content meta database cleanup * ncm: content storage fixes for 2.0.0 * ncm: add missing end of file newlines * ncm: implement ContentMetaReader * ncm: client-side api * ncm: trim trailing spaces * ncm: FS_MAX_PATH-1 -> fs::EntryNameLengthMax * ncm: Use PathString and Path * fs: implement accessor wrappers for ncm * fs: implement user fs wrappers * fs: add MountSdCard * ncm: move to content manager impl * ncm: fix up main * kvdb: use fs:: * fs: Add wrappers needed for ncm * ncm: use fs bindings, other refactoring * ncm: minor fixes * fsa: fix ReadFile without size output * fs: add substorage, rom path tool * ncm: fix dangling fsdev usage * fs: fix bug in Commit * fs: fixed incorrect mode check * fs: implement Mount(System)Data * ncm: don't delete hos * results: add R_SUCCEED_IF * ams-except-ncm: use R_SUCCEED_IF * ncm: added comments * ncm: fix api definitions * ncm: use R_SUCCEED_IF * pm: think of the savings * ncm: employ kernel strats * ncm: Nintendo has 5 MiB of heap. Give ourselves 4 to be safe, pending analysis * ncm: refactor IDs, split types header into many headers * ams.mitm: use fs bindings instead of stdio * fs: SystemData uses SystemDataId * ncm: improve meta-db accuracy * ncm: inline getlatestkey * fs: improve UnsupportedOperation results * fs: modernize mount utils * ams: misc fixes for merge-errors * fs: improve unsupportedoperation results * git subrepo pull emummc subrepo: subdir: "emummc" merged: "d12dd546" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "d12dd546" git-subrepo: version: "0.4.1" origin: "???" commit: "???" * util: add boundedmap * ncm: minor style fixes * ncm: don't unmount if mounting fails * lr: bug fixes * ncm: implement ncm.for-initialize + ncm.for-safemode * lr: ncm::ProgramId::Invalid -> ncm::InvalidProgramId * ncm: fix open directory mode on 1.0.0 * ncm: fix fs use, implement more of < 4.0.0 for-initialize/safemode * ncm: implement packagedcontent -> content for building metadb * ncm: fix save data flag management * ncm: address some review suggestions (thanks @leoetlino!) * updater: use fs bindings * fs: implement MountCode * fs: prefer make_unique to operator new * ncm: implement remaining ContentMetaDatabaseBuilder functionality Co-authored-by: Michael Scire <SciresM@gmail.com>
243 lines
8.9 KiB
C++
243 lines
8.9 KiB
C++
/*
|
|
* Copyright (c) 2018-2020 Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <stratosphere.hpp>
|
|
#include "fs_file_accessor.hpp"
|
|
#include "fs_directory_accessor.hpp"
|
|
#include "fs_filesystem_accessor.hpp"
|
|
|
|
namespace ams::fs::impl {
|
|
|
|
namespace {
|
|
|
|
template<typename List, typename Iter>
|
|
void Remove(List &list, Iter *desired) {
|
|
for (auto it = list.cbegin(); it != list.cend(); it++) {
|
|
if (it.operator->() == desired) {
|
|
list.erase(it);
|
|
return;
|
|
}
|
|
}
|
|
|
|
/* This should never happen. */
|
|
AMS_ABORT();
|
|
}
|
|
|
|
Result ValidatePath(const char *mount_name, const char *path) {
|
|
const size_t mount_name_len = strnlen(mount_name, MountNameLengthMax);
|
|
const size_t path_len = strnlen(path, EntryNameLengthMax);
|
|
R_UNLESS(mount_name_len + 1 + path_len <= EntryNameLengthMax, fs::ResultTooLongPath());
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result ValidateMountName(const char *name) {
|
|
R_UNLESS(name[0] != 0, fs::ResultInvalidMountName());
|
|
R_UNLESS(strnlen(name, sizeof(MountName)) < sizeof(MountName), fs::ResultInvalidMountName());
|
|
return ResultSuccess();
|
|
}
|
|
|
|
template<typename List>
|
|
Result ValidateNoOpenWriteModeFiles(List &list) {
|
|
for (auto it = list.cbegin(); it != list.cend(); it++) {
|
|
R_UNLESS((it->GetOpenMode() & OpenMode_Write) == 0, fs::ResultWriteModeFileNotClosed());
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
}
|
|
|
|
FileSystemAccessor::FileSystemAccessor(const char *n, std::unique_ptr<fsa::IFileSystem> &&fs, std::unique_ptr<fsa::ICommonMountNameGenerator> &&generator)
|
|
: impl(std::move(fs)), mount_name_generator(std::move(generator)),
|
|
access_log_enabled(false), data_cache_attachable(false), path_cache_attachable(false), path_cache_attached(false), multi_commit_supported(false)
|
|
{
|
|
R_ABORT_UNLESS(ValidateMountName(n));
|
|
std::strncpy(this->name.str, n, MountNameLengthMax);
|
|
this->name.str[MountNameLengthMax] = 0;
|
|
}
|
|
|
|
FileSystemAccessor::~FileSystemAccessor() {
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
|
|
/* TODO: Iterate over list entries. */
|
|
|
|
if (!this->open_file_list.empty()) { R_ABORT_UNLESS(fs::ResultFileNotClosed()); }
|
|
if (!this->open_dir_list.empty()) { R_ABORT_UNLESS(fs::ResultDirectoryNotClosed()); }
|
|
|
|
if (this->path_cache_attached) {
|
|
/* TODO: Invalidate path cache */
|
|
}
|
|
}
|
|
|
|
Result FileSystemAccessor::GetCommonMountName(char *dst, size_t dst_size) const {
|
|
R_UNLESS(this->mount_name_generator != nullptr, fs::ResultPreconditionViolation());
|
|
return this->mount_name_generator->GenerateCommonMountName(dst, dst_size);
|
|
}
|
|
|
|
std::shared_ptr<fssrv::impl::FileSystemInterfaceAdapter> FileSystemAccessor::GetMultiCommitTarget() {
|
|
if (this->multi_commit_supported) {
|
|
/* TODO: Support multi commit. */
|
|
AMS_ABORT();
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void FileSystemAccessor::NotifyCloseFile(FileAccessor *f) {
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
Remove(this->open_file_list, f);
|
|
}
|
|
|
|
void FileSystemAccessor::NotifyCloseDirectory(DirectoryAccessor *d) {
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
Remove(this->open_dir_list, d);
|
|
}
|
|
|
|
Result FileSystemAccessor::CreateFile(const char *path, s64 size, int option) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
if (this->path_cache_attached) {
|
|
/* TODO: Path cache */
|
|
R_TRY(this->impl->CreateFile(path, size, option));
|
|
} else {
|
|
R_TRY(this->impl->CreateFile(path, size, option));
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileSystemAccessor::DeleteFile(const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->DeleteFile(path);
|
|
}
|
|
|
|
Result FileSystemAccessor::CreateDirectory(const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->CreateDirectory(path);
|
|
}
|
|
|
|
Result FileSystemAccessor::DeleteDirectory(const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->DeleteDirectory(path);
|
|
}
|
|
|
|
Result FileSystemAccessor::DeleteDirectoryRecursively(const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->DeleteDirectoryRecursively(path);
|
|
}
|
|
|
|
Result FileSystemAccessor::RenameFile(const char *old_path, const char *new_path) {
|
|
R_TRY(ValidatePath(this->name.str, old_path));
|
|
R_TRY(ValidatePath(this->name.str, new_path));
|
|
if (this->path_cache_attached) {
|
|
/* TODO: Path cache */
|
|
R_TRY(this->impl->RenameFile(old_path, new_path));
|
|
} else {
|
|
R_TRY(this->impl->RenameFile(old_path, new_path));
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileSystemAccessor::RenameDirectory(const char *old_path, const char *new_path) {
|
|
R_TRY(ValidatePath(this->name.str, old_path));
|
|
R_TRY(ValidatePath(this->name.str, new_path));
|
|
if (this->path_cache_attached) {
|
|
/* TODO: Path cache */
|
|
R_TRY(this->impl->RenameDirectory(old_path, new_path));
|
|
} else {
|
|
R_TRY(this->impl->RenameDirectory(old_path, new_path));
|
|
}
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileSystemAccessor::GetEntryType(DirectoryEntryType *out, const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->GetEntryType(out, path);
|
|
}
|
|
|
|
Result FileSystemAccessor::OpenFile(std::unique_ptr<FileAccessor> *out_file, const char *path, OpenMode mode) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
|
|
std::unique_ptr<fsa::IFile> file;
|
|
R_TRY(this->impl->OpenFile(std::addressof(file), path, mode));
|
|
|
|
auto accessor = new FileAccessor(std::move(file), this, mode);
|
|
R_UNLESS(accessor != nullptr, fs::ResultAllocationFailureInFileSystemAccessorA());
|
|
|
|
{
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
this->open_file_list.push_back(*accessor);
|
|
}
|
|
|
|
if (this->path_cache_attached) {
|
|
if (mode & OpenMode_Append) {
|
|
/* TODO: Append Path cache */
|
|
} else {
|
|
/* TODO: Non-append path cache */
|
|
}
|
|
}
|
|
|
|
out_file->reset(accessor);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileSystemAccessor::OpenDirectory(std::unique_ptr<DirectoryAccessor> *out_dir, const char *path, OpenDirectoryMode mode) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
|
|
std::unique_ptr<fsa::IDirectory> dir;
|
|
R_TRY(this->impl->OpenDirectory(std::addressof(dir), path, mode));
|
|
|
|
auto accessor = new DirectoryAccessor(std::move(dir), *this);
|
|
R_UNLESS(accessor != nullptr, fs::ResultAllocationFailureInFileSystemAccessorB());
|
|
|
|
{
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
this->open_dir_list.push_back(*accessor);
|
|
}
|
|
|
|
out_dir->reset(accessor);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileSystemAccessor::Commit() {
|
|
{
|
|
std::scoped_lock lk(this->open_list_lock);
|
|
R_ABORT_UNLESS(ValidateNoOpenWriteModeFiles(this->open_file_list));
|
|
}
|
|
return this->impl->Commit();
|
|
}
|
|
|
|
Result FileSystemAccessor::GetFreeSpaceSize(s64 *out, const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->GetFreeSpaceSize(out, path);
|
|
}
|
|
|
|
Result FileSystemAccessor::GetTotalSpaceSize(s64 *out, const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->GetTotalSpaceSize(out, path);
|
|
}
|
|
|
|
Result FileSystemAccessor::CleanDirectoryRecursively(const char *path) {
|
|
R_TRY(ValidatePath(this->name.str, path));
|
|
return this->impl->CleanDirectoryRecursively(path);
|
|
}
|
|
|
|
Result FileSystemAccessor::GetFileTimeStampRaw(FileTimeStampRaw *out, const char *path) {
|
|
return this->impl->GetFileTimeStampRaw(out, path);
|
|
}
|
|
|
|
Result FileSystemAccessor::QueryEntry(char *dst, size_t dst_size, const char *src, size_t src_size, fsa::QueryId query, const char *path) {
|
|
return this->impl->QueryEntry(dst, dst_size, src, src_size, query, path);
|
|
}
|
|
|
|
|
|
}
|