Removing a repository was just kind of locking up.

[cydia.git] / cydo.cpp

diff --git a/cydo.cpp b/cydo.cpp
index 6fcde151cb6438afd3d61c716733077d4dfccbdc..d6e6f7583c79f45acbab1f220371fb6cd89a9560 100644 (file)
--- a/cydo.cpp
+++ b/cydo.cpp
@@ -28,6 +28,8 @@
 
 #include <launch.h>
 
+#include <sys/stat.h>
+
 #include <Menes/Function.h>
 
 typedef Function<void, const char *, launch_data_t> LaunchDataIterator;
@@ -39,12 +41,6 @@ void launch_data_dict_iterate(launch_data_t data, LaunchDataIterator code) {
 }
 
 int main(int argc, char *argv[]) {
-    auto log(fopen("/tmp/cydia.log", "a+"));
-    fprintf(log, "cydo:");
-    for (int arg(1); arg < argc; ++arg)
-        fprintf(log, " %s", argv[arg]);
-    fprintf(log, "\n");
-
     auto request(launch_data_new_string(LAUNCH_KEY_GETJOBS));
     auto response(launch_msg(request));
     launch_data_free(request);
@@ -56,8 +52,14 @@ int main(int argc, char *argv[]) {
 
     auto cydia(false);
 
+    struct stat correct;
+    if (lstat("/Applications/Cydia.app/Cydia", &correct) == -1) {
+        fprintf(stderr, "you have no arms left");
+        return EX_NOPERM;
+    }
+
     launch_data_dict_iterate(response, [=, &cydia](const char *name, launch_data_t value) {
-        if (launch_data_get_type(response) != LAUNCH_DATA_DICTIONARY)
+        if (launch_data_get_type(value) != LAUNCH_DATA_DICTIONARY)
             return;
 
         auto integer(launch_data_dict_lookup(value, LAUNCH_JOBKEY_PID));
@@ -68,6 +70,19 @@ int main(int argc, char *argv[]) {
         if (pid != parent)
             return;
 
+        auto variables(launch_data_dict_lookup(value, LAUNCH_JOBKEY_ENVIRONMENTVARIABLES));
+        if (variables != NULL && launch_data_get_type(variables) == LAUNCH_DATA_DICTIONARY) {
+            auto dyld(false);
+
+            launch_data_dict_iterate(variables, [&dyld](const char *name, launch_data_t value) {
+                if (strncmp(name, "DYLD_", 5) == 0)
+                    dyld = true;
+            });
+
+            if (dyld)
+                return;
+        }
+
         auto string(launch_data_dict_lookup(value, LAUNCH_JOBKEY_PROGRAM));
         if (string == NULL || launch_data_get_type(string) != LAUNCH_DATA_STRING) {
             auto array(launch_data_dict_lookup(value, LAUNCH_JOBKEY_PROGRAMARGUMENTS));
@@ -85,19 +100,19 @@ int main(int argc, char *argv[]) {
         if (program == NULL)
             return;
 
-        fprintf(log, "%lld %s\n", pid, program);
-        if (strcmp(program, "/Applications/Cydia.app/Cydia") == 0)
+        struct stat check;
+        if (lstat(program, &check) == -1)
+            return;
+
+        if (correct.st_dev == check.st_dev && correct.st_ino == check.st_ino)
             cydia = true;
     });
 
     if (!cydia) {
-        fprintf(stderr, "thou shalt not pass\n");
+        fprintf(stderr, "none shall pass\n");
         return EX_NOPERM;
     }
 
-    fflush(log);
-    fclose(log);
-
     setuid(0);
     setgid(0);