From b1903a3f3ef36280dd86ab127c2d5fde7e1fb6a2 Mon Sep 17 00:00:00 2001 From: Pavel <68122101+red-prig@users.noreply.github.com> Date: Thu, 2 Feb 2023 11:22:47 +0300 Subject: [PATCH] strncmp, getenv --- kernel/ps4_libkernel.pas | 14 +++--- src/libcinternal/ps4_libscelibcinternal.pas | 56 +++++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/kernel/ps4_libkernel.pas b/kernel/ps4_libkernel.pas index c6086d5..8154336 100644 --- a/kernel/ps4_libkernel.pas +++ b/kernel/ps4_libkernel.pas @@ -43,6 +43,14 @@ function ps4_sceKernelGetModuleInfoFromAddr(Addr:Pointer;flags:DWORD;info:pSceK function ps4___elf_phdr_match_addr(phdr_info:pSceKernelModuleInfoEx;addr:Pointer):Integer; SysV_ABI_CDecl; procedure ps4___pthread_cxa_finalize(phdr_info:pSceKernelModuleInfoEx); SysV_ABI_CDecl; +const + __progname:PChar='eboot.bin'; //argv[0] + + g_argv:array[0..1] of PChar=('eboot.bin',nil); + + _env:array[0..2] of PChar=('HOME=/','PWD=/',nil); + environ:PPchar=@_env; + implementation uses @@ -908,9 +916,6 @@ begin Result:=1; end; -const - g_argv:array[0..1] of PChar=('eboot.bin',nil); - function ps4_getargv:PPChar; SysV_ABI_CDecl; begin Result:=@g_argv; @@ -1043,9 +1048,6 @@ begin Result:=0; end; -const - __progname:PChar='eboot.bin'; //argv[0] - function Load_libSceSysmodule(Const name:RawByteString):TElf_node; var lib:PLIBRARY; diff --git a/src/libcinternal/ps4_libscelibcinternal.pas b/src/libcinternal/ps4_libscelibcinternal.pas index 748bd66..8bb4c1a 100644 --- a/src/libcinternal/ps4_libscelibcinternal.pas +++ b/src/libcinternal/ps4_libscelibcinternal.pas @@ -21,6 +21,7 @@ uses ps4_atexit_internal, ps4_guard_internal, ps4_mtx_internal, + ps4_libkernel, sys_kernel, sys_signal; @@ -95,6 +96,11 @@ begin Result:=StrComp(a,b); end; +function ps4_strncmp(a,b:PChar;n:ptrint):Integer; SysV_ABI_CDecl; +begin + Result:=StrLComp(a,b,n); +end; + function ps4_strstr(str,sub:PChar):PChar; SysV_ABI_CDecl; begin Result:=StrPos(str,sub); @@ -117,6 +123,53 @@ begin FillChar(s^,n,0); end; +function ps4_getenv(name:PChar):PChar; SysV_ABI_CDecl; +label + _err; +var + n:PChar; + _environ:PPchar; + nlen:ptrint; + r:Integer; +begin + if (name=nil) then goto _err; + + nlen:=0; + n:=name; + While (n^<>#0) do + begin + if (n^='=') then goto _err; + Inc(n); + Inc(nlen); + end; + + if (nlen=0) then goto _err; + + if (environ=nil) then Exit(nil); + + _environ:=environ; + n:=_environ^; + if (n=nil) then Exit(nil); + + repeat + r:=StrLComp(n,name,nlen); + + if (r=0) and (n[nlen]='=') then Break; + + Inc(_environ); + n:=_environ^; + + if (n=nil) then Exit(nil); + + until false; + + Exit(@n[nlen+1]); + + _err: + _set_errno(EINVAL); + Result:=nil; +end; + procedure ps4__init_env; SysV_ABI_CDecl; begin // @@ -263,11 +316,14 @@ begin lib^.set_proc($EAC256896491BAA9,@ps4_strncpy); lib^.set_proc($E576B600234409DA,@ps4_strcpy_s); lib^.set_proc($3AF6F675224E02E1,@ps4_strcmp); + lib^.set_proc($69EB328EB1D55B2E,@ps4_strncmp); lib^.set_proc($BE28B014C68D6A60,@ps4_strstr); lib^.set_proc($437541C425E1507B,@ps4_memcpy); lib^.set_proc($F8FE854461F82DF0,@ps4_memmove); lib^.set_proc($F68897D64C9E79D0,@ps4_bzero); + lib^.set_proc($B266D0BA47F16093,@ps4_getenv); + lib^.set_proc($6F3404C72D7CF592,@ps4__init_env); lib^.set_proc($E8D08EAABDDC0FBE,@ps4__init_tls);