From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Sun, 1 Nov 2009 02:18:00 +0000 (+0000)
Subject: Removed all dependencies from Mac version.
X-Git-Tag: v0.9.432~208
X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/da858962dd542d5872e9482296125d7b7e31ee29

Removed all dependencies from Mac version.
---

diff --git a/Console.cpp b/Console.cpp
index 77e9759..e43fab3 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -66,6 +66,8 @@
 
 #include <apr_getopt.h>
 
+#include <dlfcn.h>
+
 static volatile enum {
     Working,
     Parsing,
@@ -174,6 +176,8 @@ void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false)
     Run(client, code.c_str(), code.size(), fout, expand);
 }
 
+int (*append_history$)(int, const char *);
+
 static void Console(apr_pool_t *pool, int client) {
     passwd *passwd;
     if (const char *username = getenv("LOGNAME"))
@@ -330,8 +334,12 @@ static void Console(apr_pool_t *pool, int client) {
         Run(client, code, fout, expand);
     }
 
-    _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
-    append_history(histlines, histfile);
+    if (append_history$ != NULL) {
+        _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
+        (*append_history$)(histlines, histfile);
+    } else {
+        write_history(histfile);
+    }
 
     fputs("\n", fout);
     fflush(fout);
@@ -360,6 +368,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 
+    append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
+
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));
 #endif
@@ -605,6 +615,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
 int main(int argc, char const * const argv[], char const * const envp[]) {
     apr_status_t status(apr_app_initialize(&argc, &argv, &envp));
+
     if (status != APR_SUCCESS) {
         fprintf(stderr, "apr_app_initialize() != APR_SUCCESS\n");
         return 1;
diff --git a/makefile b/makefile
index 69ec15e..06047f1 100644
--- a/makefile
+++ b/makefile
@@ -35,7 +35,7 @@ filters := C #E4X
 ldid := true
 entitle := $(ldid)
 dll := so
-apr := $(shell apr-1-config --link-ld)
+apr := -lapr-1
 library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=