Find location of libcycript at runtime with dladdr.

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index c629939610469954275a80094e52b64bbc226fe6..840dc63f89f392957e1930c2aaf57f9a5389b177 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -35,8 +35,12 @@
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 

+extern "C" void CYHandleServer(pid_t);
+

 void InjectLibrary(pid_t pid) {
 void InjectLibrary(pid_t pid) {

-    const char *library(CY_LIBRARY);
+    Dl_info addr;
+    _assert(dladdr(reinterpret_cast<void *>(&CYHandleServer), &addr) != 0);
+    const char *library(addr.dli_fname);

 
     mach_port_t self(mach_task_self()), task;
     _krncall(task_for_pid(self, pid, &task));
 
     mach_port_t self(mach_task_self()), task;
     _krncall(task_for_pid(self, pid, &task));

diff --git a/Makefile.am b/Makefile.am
index f0ed2c2b0709bd25e057efd6bdd25a8098e55b3e..29221b10293f3a7272165fd39b8271bd1a51762d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@ if CY_MACH
 libcycript_la_SOURCES += Handler.mm
 cycript_SOURCES += Mach/Inject.cpp
 
 libcycript_la_SOURCES += Handler.mm
 cycript_SOURCES += Mach/Inject.cpp
 

-AM_CPPFLAGS += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(SO)"'
+AM_CPPFLAGS += -DCY_ATTACH

 
 Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 
 
 Mach/Inject.$(OBJEXT): Trampoline.t.hpp
 

diff --git a/Makefile.in b/Makefile.in
index 610d417b1607e385f829f9886c2595e2f8af4613..8575d201e7708d503131f7450da5bb9f6a0fe8d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ bin_PROGRAMS = cycript$(EXEEXT)
 @CY_OBJECTIVEC_TRUE@am__append_6 = ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 @CY_MACH_TRUE@am__append_7 = Handler.mm
 @CY_MACH_TRUE@am__append_8 = Mach/Inject.cpp
 @CY_OBJECTIVEC_TRUE@am__append_6 = ObjectiveC/Output.mm ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 @CY_MACH_TRUE@am__append_7 = Handler.mm
 @CY_MACH_TRUE@am__append_8 = Mach/Inject.cpp

-@CY_MACH_TRUE@am__append_9 = -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(SO)"'
+@CY_MACH_TRUE@am__append_9 = -DCY_ATTACH

 @CY_MACH_TRUE@am__append_10 = Trampoline.t.lo libTrampoline.t.la \
 @CY_MACH_TRUE@ Trampoline.t.hpp
 subdir = .
 @CY_MACH_TRUE@am__append_10 = Trampoline.t.lo libTrampoline.t.la \
 @CY_MACH_TRUE@ Trampoline.t.hpp
 subdir = .