mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement NextLoadPath for loader env

Browse Source
This commit is contained in:
plutoo 2018-01-20 19:31:29 +01:00
parent af0e9eea7d
commit 97141448e9
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/result.h
View File

@ -19,6 +19,7 @@
((((module)&0x1FF)) | ((description)&0x1FFF)<<9) ((((module)&0x1FF)) | ((description)&0x1FFF)<<9)
#define MODULE_LIBNX 345 #define MODULE_LIBNX 345
enum { enum {
LIBNX_BADRELOC=1, LIBNX_BADRELOC=1,
LIBNX_OUTOFMEM, LIBNX_OUTOFMEM,

2
nx/include/switch/runtime/env.h
View File

@ -45,3 +45,5 @@ bool envIsSyscallHinted(u8 svc);
Handle envGetOwnProcessHandle(void); Handle envGetOwnProcessHandle(void);
LoaderReturnFn envGetExitFuncPtr(void); LoaderReturnFn envGetExitFuncPtr(void);
Result envSetNextLoad(const char* path, const char* argv);

23
nx/source/runtime/env.c
View File

@ -10,6 +10,8 @@ static u64 g_overrideArgc = 0;
static void* g_overrideArgv = NULL; static void* g_overrideArgv = NULL;
static u64 g_syscallHints[2]; static u64 g_syscallHints[2];
static Handle g_processHandle = INVALID_HANDLE; static Handle g_processHandle = INVALID_HANDLE;
static char* g_nextLoadPath = NULL;
static char* g_nextLoadArgv = NULL;
extern __attribute__((weak)) u32 __nx_applet_type; extern __attribute__((weak)) u32 __nx_applet_type;
@ -48,7 +50,8 @@ void envParse(void* ctx, Handle main_thread, LoaderReturnFn saved_lr)
break; break;
case EntryType_NextLoadPath: case EntryType_NextLoadPath:
// TODO g_nextLoadPath = (char*) ent->Value[0];
g_nextLoadArgv = (char*) ent->Value[1];
break; break;
case EntryType_OverrideHeap: case EntryType_OverrideHeap:
@ -140,3 +143,21 @@ Handle envGetOwnProcessHandle(void) {
LoaderReturnFn envGetExitFuncPtr(void) { LoaderReturnFn envGetExitFuncPtr(void) {
return g_loaderRetAddr; return g_loaderRetAddr;
} }
Result envSetNextLoad(const char* path, const char* argv)
{
if (g_nextLoadPath == NULL)
return MAKERESULT(MODULE_LIBNX, LIBNX_NOTINITIALIZED);
strcpy(g_nextLoadPath, path);
if (g_nextLoadArgv != NULL)
{
if (argv == NULL)
g_nextLoadArgv[0] = '\0';
else
strcpy(g_nextLoadArgv, argv);
}
return 0;
}