Merge branch 'issue9'

Author: tux-mind

dSploit/jni/dSploitd/handler.c

@@ -69,14 +69,34 @@ int load_handlers() {
   DIR *d;
   struct dirent *de;
   handler *h,*tmp;
-  char *path;
+  char *path, *cwd;
   void *handle;
   size_t len;
 
+  len = 50;
+  cwd = malloc(len);
+  
+  while(cwd && len < PATH_MAX) {
+    if(getcwd(cwd, len)) break;
+    if(errno != ERANGE) {
+      print( ERROR, "getcwd: %s", strerror(errno));
+      free(cwd);
+      return -1;
+    }
+    len += 50;
+    cwd = realloc(cwd, len);
+  }
+  
+  if(!cwd) {
+    print( ERROR, "malloc(%d): %s", len, strerror(errno));
+    return -1;
+  }
+  
   d = opendir(HANDLERS_DIR);
 
   if(!d) {
     print( ERROR, "opendir: %s", strerror(errno) );
+    free(cwd);
     return -1;
   }
 
@@ -90,7 +110,7 @@ int load_handlers() {
     if(strncmp(de->d_name + (len - 3), ".so", 3))
       continue;
 
-    if(asprintf(&path, HANDLERS_DIR "/%s", de->d_name) == -1) {
+    if(asprintf(&path, "%s/" HANDLERS_DIR "/%s", cwd, de->d_name) == -1) {
       print( ERROR, "asprintf: %s", strerror(errno) );
       continue;
     }
@@ -127,6 +147,8 @@ int load_handlers() {
 
   closedir(d);
 
+  free(cwd);
+  
   if(!handlers.head) {
     print( ERROR, "no handlers found" );
     return -1;