about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2021-04-01 17:51:46 +0200
committerptitSeb <sebastien.chev@gmail.com>2021-04-01 17:51:46 +0200
commit3b2e75055fa21c3466a73aa9252e082359e0d9c9 (patch)
treef78b65041a000ece12b22ccc486229850bceba10 /src
parent9f5e12992af8ef876a49b2519601c10c41779438 (diff)
downloadbox64-3b2e75055fa21c3466a73aa9252e082359e0d9c9.tar.gz
box64-3b2e75055fa21c3466a73aa9252e082359e0d9c9.zip
Added wrapped glob64 and freeglob64 functions
Diffstat (limited to 'src')
-rwxr-xr-xsrc/wrapped/wrappedlibc.c4
-rwxr-xr-xsrc/wrapped/wrappedlibc_private.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 5807bb37..756a8ee8 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -211,7 +211,6 @@ static void* findnftw64Fct(void* fct)
     printf_log(LOG_NONE, "Warning, no more slot for libc nftw64 callback\n");
     return NULL;
 }
-#if 0
 // globerr
 #define GO(A)   \
 static uintptr_t my_globerr_fct_##A = 0;                                        \
@@ -235,6 +234,7 @@ static void* findgloberrFct(void* fct)
     printf_log(LOG_NONE, "Warning, no more slot for libc globerr callback\n");
     return NULL;
 }
+#if 0
 #undef dirent
 // filter_dir
 #define GO(A)   \
@@ -1450,11 +1450,11 @@ EXPORT int32_t my_glob(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, vo
     return f(pat, flags, findgloberrFct(errfnc), pglob);
 }
 
+#endif
 EXPORT int32_t my_glob64(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, void* pglob)
 {
     return glob64(pat, flags, findgloberrFct(errfnc), pglob);
 }
-#endif
 EXPORT int my_scandir64(x64emu_t *emu, void* dir, void* namelist, void* sel, void* comp)
 {
     return scandir64(dir, namelist, findfilter64Fct(sel), findcompare64Fct(comp));
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index fe3922b2..24e9703f 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -642,11 +642,9 @@ GOW(getwc, uFp)
 //GO(__getwd_chk, 
 //GO(getxattr, 
 //GO(glob, 
-//GO(glob, 
-//GO(glob64, 
-//GO(glob64, 
+GO(glob64, iFEpipp)
 //GO(globfree, 
-//GOW(globfree64, 
+GOW(globfree64, vFp)
 //GOW(glob_pattern_p, 
 GO(gmtime, pFp)
 GO(__gmtime_r, pFpp)