Implement the NCM sysmodule (closes #91)

* 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 commit d6ff261fcc. * 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 commit 168447d80e. * 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 commit d6ff261fcc. * 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 commit 168447d80e. * 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>
2020-03-08 19:06:23 +11:00
parent f9403201f0
commit c7026b9094
254 changed files with 16876 additions and 1274 deletions
--- a/libraries/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp
+++ b/libraries/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp
@@ -180,11 +180,9 @@ namespace ams::kvdb {

    Result FileKeyValueStore::InitializeWithCache(const char *dir, void *cache_buffer, size_t cache_buffer_size, size_t cache_capacity) {
        /* Ensure that the passed path is a directory. */
-        {
-            struct stat st;
-            R_UNLESS(stat(dir, &st) == 0,   fs::ResultPathNotFound());
-            R_UNLESS((S_ISDIR(st.st_mode)), fs::ResultPathNotFound());
-        }
+        fs::DirectoryEntryType entry_type;
+        R_TRY(fs::GetEntryType(std::addressof(entry_type), dir));
+        R_UNLESS(entry_type == fs::DirectoryEntryType_Directory, fs::ResultPathNotFound());

        /* Set path. */
        this->dir_path.Set(dir);
@@ -210,24 +208,22 @@ namespace ams::kvdb {
        }

        /* Open the value file. */
-        FILE *fp = fopen(this->GetPath(key, key_size), "rb");
-        if (fp == nullptr) {
-            R_TRY_CATCH(fsdevGetLastResult()) {
-                R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound())
-            } R_END_TRY_CATCH;
-        }
-        ON_SCOPE_EXIT { fclose(fp); };
+        fs::FileHandle file;
+        R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
+            R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound());
+        } R_END_TRY_CATCH;
+        ON_SCOPE_EXIT { fs::CloseFile(file); };

        /* Get the value size. */
-        fseek(fp, 0, SEEK_END);
-        const size_t value_size = ftell(fp);
-        fseek(fp, 0, SEEK_SET);
+        s64 file_size;
+        R_TRY(fs::GetFileSize(std::addressof(file_size), file));

        /* Ensure there's enough space for the value. */
-        R_UNLESS(value_size <= max_out_size, ResultBufferInsufficient());
+        R_UNLESS(file_size <= static_cast<s64>(max_out_size), ResultBufferInsufficient());

        /* Read the value. */
-        R_UNLESS(fread(out_value, value_size, 1, fp) == 1, fsdevGetLastResult());
+        const size_t value_size = static_cast<size_t>(value_size);
+        R_TRY(fs::ReadFile(file, 0, out_value, value_size));
        *out_size = value_size;

        /* Cache the newly read value. */
@@ -251,17 +247,17 @@ namespace ams::kvdb {
        }

        /* Open the value file. */
-        FILE *fp = fopen(this->GetPath(key, key_size), "rb");
-        if (fp == nullptr) {
-            R_TRY_CATCH(fsdevGetLastResult()) {
-                R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound())
-            } R_END_TRY_CATCH;
-        }
-        ON_SCOPE_EXIT { fclose(fp); };
+        fs::FileHandle file;
+        R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
+            R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound());
+        } R_END_TRY_CATCH;
+        ON_SCOPE_EXIT { fs::CloseFile(file); };

        /* Get the value size. */
-        fseek(fp, 0, SEEK_END);
-        *out_size = ftell(fp);
+        s64 file_size;
+        R_TRY(fs::GetFileSize(std::addressof(file_size), file));
+
+        *out_size = static_cast<size_t>(file_size);
        return ResultSuccess();
    }

@@ -278,18 +274,18 @@ namespace ams::kvdb {

        /* Delete the file, if it exists. Don't check result, since it's okay if it's already deleted. */
        auto key_path = this->GetPath(key, key_size);
-        std::remove(key_path);
+        fs::DeleteFile(key_path);
+
+        /* Create the new value file. */
+        R_TRY(fs::CreateFile(key_path, value_size));

        /* Open the value file. */
-        FILE *fp = fopen(key_path, "wb");
-        R_UNLESS(fp != nullptr, fsdevGetLastResult());
-        ON_SCOPE_EXIT { fclose(fp); };
+        fs::FileHandle file;
+        R_TRY(fs::OpenFile(std::addressof(file), key_path, fs::OpenMode_Write));
+        ON_SCOPE_EXIT { fs::CloseFile(file); };

-        /* Write the value file. */
-        R_UNLESS(fwrite(value, value_size, 1, fp) == 1, fsdevGetLastResult());
-
-        /* Flush the value file. */
-        fflush(fp);
+        /* Write the value file and flush. */
+        R_TRY(fs::WriteFile(file, 0, value, value_size, fs::WriteOption::Flush));

        return ResultSuccess();
    }
@@ -306,11 +302,9 @@ namespace ams::kvdb {
        }

        /* Remove the file. */
-        if (std::remove(this->GetPath(key, key_size)) != 0) {
-            R_TRY_CATCH(fsdevGetLastResult()) {
-                R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound())
-            } R_END_TRY_CATCH;
-        }
+        R_TRY_CATCH(fs::DeleteFile(this->GetPath(key, key_size))) {
+            R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound())
+        } R_END_TRY_CATCH;

        return ResultSuccess();
    }