version 0.0.3

RootHide · RootHide · commit dd1f707effca · 2023-09-30T00:23:38.000+08:00
diff --git a/Makefile b/Makefile
@@ -18,8 +18,8 @@ libroothide.dylib: roothideinit.dylib jbroot.c jbroot.cpp jbroot.m cache.c commo
 libvroot.h: vroot.h
 	$(CPP) $< > $@
 
-libvroot.dylib: libroothide.dylib vroot.c vroot_mktemp.c vroot.cpp vroot_rootfs.c vroot_exec.c vroot_dlfcn.c common.c
-	$(CC) -arch arm64 -arch arm64e $(CFLAGS) $(LDFLAGS) -lstdc++ -lroothide -dynamiclib -install_name @loader_path/.jbroot/usr/lib/libvroot.dylib -o $@ $^
+libvroot.dylib: libroothide.dylib vroot.c vroot_mktemp.c vroot.cpp vroot_rootfs.c vroot_exec.c vroot_dlfcn.c common.c debug.m
+	$(CC) -fobjc-arc  -arch arm64 -arch arm64e $(CFLAGS) $(LDFLAGS) -lstdc++ -lroothide -dynamiclib -install_name @loader_path/.jbroot/usr/lib/libvroot.dylib -o $@ $^
 	xcrun tapi stubify $@
 
 libvrootapi.dylib: libvroot.dylib vrootapi.c
diff --git a/common.h b/common.h
@@ -20,3 +20,4 @@ extern const char* __roothideinit_JBROOT;
 
 #define VROOT_LOG(...) {if(getenv("VROOTLOG")&&atoi(getenv("VROOTLOG"))) {printf(__VA_ARGS__);fflush(stdout);}}
 
+char* backtrace();
diff --git a/debug.m b/debug.m
@@ -0,0 +1,8 @@
+#include <Foundation/Foundation.h>
+
+
+char* backtrace()
+{
+    NSArray *csss = [NSThread callStackSymbols];
+    return strdup([NSString stringWithFormat:@"%@", csss].UTF8String);
+}
diff --git a/vroot.c b/vroot.c
@@ -26,6 +26,7 @@
 #include <fts.h>
 #include <glob.h>
 #include <mach-o/dyld.h>
+#include <libgen.h>
 
 #include "roothide.h"
 #include "common.h"
@@ -194,11 +195,25 @@ int VROOT_API_NAME(symlink)(const char *name1, const char *name2)
 {
 VROOT_LOG("@%s\n",__FUNCTION__);
 
-    const char* newname1 = jbroot_alloc(name1);
+    int ret = 0;
     const char* newname2 = jbroot_alloc(name2);
-    int ret = symlink(newname1, newname2);
-    if(newname1) free((void*)newname1);
+
+    char dname[PATH_MAX];
+    int dfd = open(dirname_r(newname2, dname), O_RDONLY);
+    if(dfd >= 0)
+    {
+        const char* newname1 = jbrootat_alloc(dfd, name1, 0);
+        ret = symlink(newname1, newname2);
+        if(newname1) free((void*)newname1);
+
+        close(dfd);
+
+    } else {
+        ret = -1;
+    }
+
     if(newname2) free((void*)newname2);
+
     return ret;
 }
 
@@ -229,12 +244,24 @@ VROOT_LOG("@%s\n",__FUNCTION__);
 
 int VROOTAT_API_NAME(symlinkat)(const char *name1, int fd, const char *name2)
 {
-VROOT_LOG("@%s\n",__FUNCTION__);
+VROOT_LOG("@%s %s %d %s\n",__FUNCTION__, name1, fd, name2);
 
-    const char* newname1 = jbroot_alloc(name1);
+    int ret = 0;
     const char* newname2 = jbrootat_alloc(fd, name2, 0); //***********
-    int ret = symlinkat(newname1, fd, newname2);
-    if(newname1) free((void*)newname1);
+
+    char dname[PATH_MAX];
+    int dfd = openat(fd, dirname_r(newname2, dname), O_RDONLY);
+    if(dfd >= 0)
+    {
+        const char* newname1 = jbrootat_alloc(dfd, name1, 0);
+        int ret = symlinkat(newname1, fd, newname2);
+        if(newname1) free((void*)newname1);
+        
+        close(dfd);
+    } else {
+        ret = -1;
+    }
+
     if(newname2) free((void*)newname2);
     return ret;
 }
@@ -366,7 +393,7 @@ VROOT_LOG("@%s\n",__FUNCTION__);
 
 char* VROOT_API_NAME(realpath$DARWIN_EXTSN)(const char * path, char *resolved_path)
 {
-VROOT_LOG("@%s\n",__FUNCTION__);
+VROOT_LOG("@%s %s\n",__FUNCTION__, path);
 
     char pathbuf[PATH_MAX]={0};
     const char* newpath = jbroot_alloc(path);

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@ extern const char* __roothideinit_JBROOT;`
`20`	`20`
`21`	`21`	`#define VROOT_LOG(...) {if(getenv("VROOTLOG")&&atoi(getenv("VROOTLOG"))) {printf(__VA_ARGS__);fflush(stdout);}}`
`22`	`22`
	`23`	`+char* backtrace();`