mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-11-14 07:56:45 +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>
231 lines
11 KiB
C++
231 lines
11 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/>.
|
|
*/
|
|
#pragma once
|
|
#include <stratosphere/fs/fs_common.hpp>
|
|
#include <stratosphere/fs/impl/fs_newable.hpp>
|
|
#include <stratosphere/fs/fsa/fs_ifile.hpp>
|
|
#include <stratosphere/fs/fsa/fs_idirectory.hpp>
|
|
#include <stratosphere/fs/fsa/fs_ifilesystem.hpp>
|
|
#include <stratosphere/fs/fs_query_range.hpp>
|
|
#include <stratosphere/fs/fs_path_tool.hpp>
|
|
#include <stratosphere/fs/fs_path_utils.hpp>
|
|
|
|
namespace ams::fs {
|
|
|
|
class RemoteFile : public fsa::IFile, public impl::Newable {
|
|
private:
|
|
::FsFile base_file;
|
|
public:
|
|
RemoteFile(const ::FsFile &f) : base_file(f) { /* ... */ }
|
|
|
|
virtual ~RemoteFile() { fsFileClose(std::addressof(this->base_file)); }
|
|
public:
|
|
virtual Result ReadImpl(size_t *out, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) override final {
|
|
return fsFileRead(std::addressof(this->base_file), offset, buffer, size, option.value, out);
|
|
}
|
|
|
|
virtual Result GetSizeImpl(s64 *out) override final {
|
|
return fsFileGetSize(std::addressof(this->base_file), out);
|
|
}
|
|
|
|
virtual Result FlushImpl() override final {
|
|
return fsFileFlush(std::addressof(this->base_file));
|
|
}
|
|
|
|
virtual Result WriteImpl(s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) override final {
|
|
return fsFileWrite(std::addressof(this->base_file), offset, buffer, size, option.value);
|
|
}
|
|
|
|
virtual Result SetSizeImpl(s64 size) override final {
|
|
return fsFileSetSize(std::addressof(this->base_file), size);
|
|
}
|
|
|
|
virtual Result OperateRangeImpl(void *dst, size_t dst_size, fs::OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) override final {
|
|
R_UNLESS(op_id == OperationId::QueryRange, fs::ResultUnsupportedOperationInFileServiceObjectAdapterA());
|
|
R_UNLESS(dst_size == sizeof(FileQueryRangeInfo), fs::ResultInvalidSize());
|
|
|
|
return fsFileOperateRange(std::addressof(this->base_file), static_cast<::FsOperationId>(op_id), offset, size, reinterpret_cast<::FsRangeInfo *>(dst));
|
|
}
|
|
public:
|
|
virtual sf::cmif::DomainObjectId GetDomainObjectId() const override {
|
|
return sf::cmif::DomainObjectId{serviceGetObjectId(const_cast<::Service *>(std::addressof(this->base_file.s)))};
|
|
}
|
|
};
|
|
|
|
class RemoteDirectory : public fsa::IDirectory, public impl::Newable {
|
|
private:
|
|
::FsDir base_dir;
|
|
public:
|
|
RemoteDirectory(const ::FsDir &d) : base_dir(d) { /* ... */ }
|
|
|
|
virtual ~RemoteDirectory() { fsDirClose(std::addressof(this->base_dir)); }
|
|
public:
|
|
virtual Result ReadImpl(s64 *out_count, DirectoryEntry *out_entries, s64 max_entries) override final {
|
|
return fsDirRead(std::addressof(this->base_dir), out_count, max_entries, out_entries);
|
|
}
|
|
|
|
virtual Result GetEntryCountImpl(s64 *out) override final {
|
|
return fsDirGetEntryCount(std::addressof(this->base_dir), out);
|
|
}
|
|
public:
|
|
virtual sf::cmif::DomainObjectId GetDomainObjectId() const override {
|
|
return sf::cmif::DomainObjectId{serviceGetObjectId(const_cast<::Service *>(std::addressof(this->base_dir.s)))};
|
|
}
|
|
};
|
|
|
|
class RemoteFileSystem : public fsa::IFileSystem, public impl::Newable {
|
|
private:
|
|
::FsFileSystem base_fs;
|
|
public:
|
|
RemoteFileSystem(const ::FsFileSystem &fs) : base_fs(fs) { /* ... */ }
|
|
|
|
virtual ~RemoteFileSystem() { fsFsClose(std::addressof(this->base_fs)); }
|
|
private:
|
|
Result GetPathForServiceObject(fssrv::sf::Path *out_path, const char *path) {
|
|
/* Copy and null terminate. */
|
|
std::strncpy(out_path->str, path, sizeof(out_path->str) - 1);
|
|
out_path->str[sizeof(out_path->str) - 1] = '\x00';
|
|
|
|
/* Replace directory separators. */
|
|
Replace(out_path->str, sizeof(out_path->str) - 1, StringTraits::AlternateDirectorySeparator, StringTraits::DirectorySeparator);
|
|
|
|
/* Get lengths. */
|
|
const auto mount_name_len = PathTool::IsWindowsAbsolutePath(path) ? 2 : 0;
|
|
const auto rel_path = out_path->str + mount_name_len;
|
|
const auto max_len = fs::EntryNameLengthMax - mount_name_len;
|
|
return VerifyPath(rel_path, max_len, max_len);
|
|
}
|
|
public:
|
|
virtual Result CreateFileImpl(const char *path, s64 size, int flags) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsCreateFile(std::addressof(this->base_fs), sf_path.str, size, flags);
|
|
}
|
|
|
|
virtual Result DeleteFileImpl(const char *path) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsDeleteFile(std::addressof(this->base_fs), sf_path.str);
|
|
}
|
|
|
|
virtual Result CreateDirectoryImpl(const char *path) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsCreateDirectory(std::addressof(this->base_fs), sf_path.str);
|
|
}
|
|
|
|
virtual Result DeleteDirectoryImpl(const char *path) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsDeleteDirectory(std::addressof(this->base_fs), sf_path.str);
|
|
}
|
|
|
|
virtual Result DeleteDirectoryRecursivelyImpl(const char *path) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsDeleteDirectoryRecursively(std::addressof(this->base_fs), sf_path.str);
|
|
}
|
|
|
|
virtual Result RenameFileImpl(const char *old_path, const char *new_path) override final {
|
|
fssrv::sf::Path old_sf_path;
|
|
fssrv::sf::Path new_sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(old_sf_path), old_path));
|
|
R_TRY(GetPathForServiceObject(std::addressof(new_sf_path), new_path));
|
|
return fsFsRenameFile(std::addressof(this->base_fs), old_sf_path.str, new_sf_path.str);
|
|
}
|
|
|
|
virtual Result RenameDirectoryImpl(const char *old_path, const char *new_path) override final {
|
|
fssrv::sf::Path old_sf_path;
|
|
fssrv::sf::Path new_sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(old_sf_path), old_path));
|
|
R_TRY(GetPathForServiceObject(std::addressof(new_sf_path), new_path));
|
|
return fsFsRenameDirectory(std::addressof(this->base_fs), old_sf_path.str, new_sf_path.str);
|
|
}
|
|
|
|
virtual Result GetEntryTypeImpl(DirectoryEntryType *out, const char *path) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
|
|
static_assert(sizeof(::FsDirEntryType) == sizeof(DirectoryEntryType));
|
|
return fsFsGetEntryType(std::addressof(this->base_fs), sf_path.str, reinterpret_cast<::FsDirEntryType *>(out));
|
|
}
|
|
|
|
virtual Result OpenFileImpl(std::unique_ptr<fsa::IFile> *out_file, const char *path, OpenMode mode) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
|
|
FsFile f;
|
|
R_TRY(fsFsOpenFile(std::addressof(this->base_fs), sf_path.str, mode, &f));
|
|
|
|
auto file = std::make_unique<RemoteFile>(f);
|
|
R_UNLESS(file != nullptr, fs::ResultAllocationFailureInNew());
|
|
|
|
*out_file = std::move(file);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
virtual Result OpenDirectoryImpl(std::unique_ptr<fsa::IDirectory> *out_dir, const char *path, OpenDirectoryMode mode) override final {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
|
|
FsDir d;
|
|
R_TRY(fsFsOpenDirectory(std::addressof(this->base_fs), sf_path.str, mode, &d));
|
|
|
|
auto dir = std::make_unique<RemoteDirectory>(d);
|
|
R_UNLESS(dir != nullptr, fs::ResultAllocationFailureInNew());
|
|
|
|
*out_dir = std::move(dir);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
virtual Result CommitImpl() override final {
|
|
return fsFsCommit(std::addressof(this->base_fs));
|
|
}
|
|
|
|
|
|
virtual Result GetFreeSpaceSizeImpl(s64 *out, const char *path) {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsGetFreeSpace(std::addressof(this->base_fs), sf_path.str, out);
|
|
}
|
|
|
|
virtual Result GetTotalSpaceSizeImpl(s64 *out, const char *path) {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsGetTotalSpace(std::addressof(this->base_fs), sf_path.str, out);
|
|
}
|
|
|
|
virtual Result CleanDirectoryRecursivelyImpl(const char *path) {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsCleanDirectoryRecursively(std::addressof(this->base_fs), sf_path.str);
|
|
}
|
|
|
|
virtual Result GetFileTimeStampRawImpl(FileTimeStampRaw *out, const char *path) {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
static_assert(sizeof(FileTimeStampRaw) == sizeof(::FsTimeStampRaw));
|
|
return fsFsGetFileTimeStampRaw(std::addressof(this->base_fs), sf_path.str, reinterpret_cast<::FsTimeStampRaw *>(out));
|
|
}
|
|
|
|
virtual Result QueryEntryImpl(char *dst, size_t dst_size, const char *src, size_t src_size, fsa::QueryId query, const char *path) {
|
|
fssrv::sf::Path sf_path;
|
|
R_TRY(GetPathForServiceObject(std::addressof(sf_path), path));
|
|
return fsFsQueryEntry(std::addressof(this->base_fs), dst, dst_size, src, src_size, sf_path.str, static_cast<FsFileSystemQueryId>(query));
|
|
}
|
|
};
|
|
|
|
}
|