Added a few more libc wrapped function, and fixed glob64 wrapping

2 files changed, 7 insertions, 17 deletions

diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index e9298f06..09b52edd 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -1437,23 +1437,13 @@ EXPORT int32_t my_epoll_wait(x64emu_t* emu, int32_t epfd, void* events, int32_t
 }
 #endif
 
-EXPORT int32_t my_glob(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, void* pglob)
-{
-    static iFpipp_t f = NULL;
-    if(!f) {
-        library_t* lib = my_lib;
-        if(!lib) return 0;
-        f = (iFpipp_t)dlsym(lib->priv.w.lib, "glob");
-    }
-
-    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);
 }
+EXPORT int32_t my_glob(x64emu_t *emu, void* pat, int32_t flags, void* errfnc, void* pglob) __attribute__((alias("my_glob64")));
+
 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 632f75a8..6ee6c86f 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -596,9 +596,9 @@ GOW(getrusage, iFip)
 //GOW(gets, 
 //GO(__gets_chk, 
 //GO(getsecretkey, 
-//GO(getservbyname, 
+GO(getservbyname, pFpp)
 //GO(getservbyname_r, 
-//GO(getservbyport, 
+GO(getservbyport, pFip)
 //GO(getservbyport_r, 
 //GO(getservent, 
 //GO(getservent_r, 
@@ -641,9 +641,9 @@ GOW(getwc, uFp)
 //GO(getwd, 
 //GO(__getwd_chk, 
 //GO(getxattr, 
-//GO(glob, 
-GO(glob64, iFEpipp)
-//GO(globfree, 
+GOM(glob, iFEpipp)
+GOM(glob64, iFEpipp)
+GO(globfree, vFp)
 GOW(globfree64, vFp)
 //GOW(glob_pattern_p, 
 GO(gmtime, pFp)