From 3b4135826d3e50a943eeae2019a3b1717da4a148 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 20 Aug 2010 09:56:15 -0700
Subject: [PATCH] remove hijac

---
 Android.mk        |   1 -
 hijack/Android.mk |  14 -----
 hijack/hijack.c   | 140 ----------------------------------------------
 3 files changed, 155 deletions(-)
 delete mode 100644 hijack/Android.mk
 delete mode 100644 hijack/hijack.c

diff --git a/Android.mk b/Android.mk
index 349ef7b..f4b3b97 100644
--- a/Android.mk
+++ b/Android.mk
@@ -188,7 +188,6 @@ LOCAL_SRC_FILES := killrecovery.sh
 include $(BUILD_PREBUILT)
 
 include $(commands_recovery_local_path)/amend/Android.mk
-include $(commands_recovery_local_path)/hijack/Android.mk
 include $(commands_recovery_local_path)/minui/Android.mk
 include $(commands_recovery_local_path)/minzip/Android.mk
 include $(commands_recovery_local_path)/mtdutils/Android.mk
diff --git a/hijack/Android.mk b/hijack/Android.mk
deleted file mode 100644
index c08d200..0000000
--- a/hijack/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-ifdef BOARD_HIJACK_RECOVERY_PATH
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := hijack.c
-LOCAL_MODULE := hijack
-LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_LIBRARIES := libbusybox libclearsilverregex libm libcutils libc
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_CFLAGS += -DBOARD_HIJACK_RECOVERY_PATH=\"$(BOARD_HIJACK_RECOVERY_PATH)\"
-include $(BUILD_EXECUTABLE)
-
-endif
diff --git a/hijack/hijack.c b/hijack/hijack.c
deleted file mode 100644
index e7bc355..0000000
--- a/hijack/hijack.c
+++ /dev/null
@@ -1,140 +0,0 @@
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <limits.h>
-#include <linux/input.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/reboot.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <sys/wait.h>
-#include <sys/limits.h>
-#include <dirent.h>
-#include <sys/stat.h>
-
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <limits.h>
-
-#include <cutils/properties.h>
-
-#define RECOVERY_MODE_FILE "/data/.recovery_mode"
-#define UPDATE_BINARY BOARD_HIJACK_RECOVERY_PATH"/update-binary"
-#define UPDATE_PACKAGE BOARD_HIJACK_RECOVERY_PATH"/recovery.zip"
-
-int
-exec_and_wait(char** argp)
-{
-  pid_t pid;
-    sig_t intsave, quitsave;
-    sigset_t mask, omask;
-    int pstat;
-    
-    sigemptyset(&mask);
-    sigaddset(&mask, SIGCHLD);
-    sigprocmask(SIG_BLOCK, &mask, &omask);
-    switch (pid = vfork()) {
-    case -1:            /* error */
-        sigprocmask(SIG_SETMASK, &omask, NULL);
-        return(-1);
-    case 0:                /* child */
-        sigprocmask(SIG_SETMASK, &omask, NULL);
-        execve(argp[0], argp, environ);
-    _exit(127);
-  }
-
-    intsave = (sig_t)  bsd_signal(SIGINT, SIG_IGN);
-    quitsave = (sig_t) bsd_signal(SIGQUIT, SIG_IGN);
-    pid = waitpid(pid, (int *)&pstat, 0);
-    sigprocmask(SIG_SETMASK, &omask, NULL);
-    (void)bsd_signal(SIGINT, intsave);
-    (void)bsd_signal(SIGQUIT, quitsave);
-    return (pid == -1 ? -1 : pstat);
-}
-
-typedef char* string;
-
-int main(int argc, char** argv) {
-    char* hijacked_executable = argv[0];
-    struct stat info;
-    
-    if (NULL != strstr(hijacked_executable, "hijack")) {
-        // no op
-        if (argc >= 2) {
-            if (strcmp("sh", argv[1]) == 0) {
-                return ash_main(argc - 1, argv + 1);
-            }
-            if (strcmp("mount", argv[1]) == 0) {
-                printf("mount!\n");
-                return mount_main(argc - 1, argv + 1);
-            }
-            if (strcmp("umount", argv[1]) == 0) {
-                printf("umount!\n");
-                return umount_main(argc - 1, argv + 1);
-            }
-        }
-        printf("Hijack!\n");
-        return 0;
-    }
-
-    char cmd[PATH_MAX];
-    if (0 == stat(RECOVERY_MODE_FILE, &info)) {
-        remove(RECOVERY_MODE_FILE);
-        sprintf(cmd, "%s 2 0 %s", UPDATE_BINARY, UPDATE_PACKAGE);
-        
-        char* remount_root_args[] = { "/system/bin/hijack", "mount", "-orw,remount", "/", NULL };
-        //mount_main(3, remount_root_args);
-        //__system("/system/bin/hijack mount -orw,remount /");
-        exec_and_wait(remount_root_args);
-
-        mkdir("/preinstall", S_IRWXU);
-        mkdir("/tmp", S_IRWXU);
-        mkdir("/res", S_IRWXU);
-        mkdir("/res/images", S_IRWXU);
-        remove("/etc");
-        mkdir("/etc", S_IRWXU);
-        rename("/sbin/adbd", "/sbin/adbd.old");
-        property_set("ctl.stop", "runtime");
-        property_set("ctl.stop", "zygote");
-        property_set("persist.service.adb.enable", "1");
-
-        char* mount_preinstall_args[] = { "/system/bin/hijack", "mount", "/dev/block/preinstall", "/preinstall", NULL };
-        //mount_main(3, mount_preinstall_args);
-        //__system("/system/bin/hijack mount /dev/block/preinstall /preinstall");
-        exec_and_wait(mount_preinstall_args);
-
-        char* umount_args[] = { "/system/bin/hijack", "umount", "-l", "/system", NULL };
-        exec_and_wait(umount_args);
-
-        char* updater_args[] = { UPDATE_BINARY, "2", "0", UPDATE_PACKAGE, NULL };
-        return exec_and_wait(updater_args);
-    }
-    
-    char real_executable[PATH_MAX];
-    sprintf(real_executable, "%s.bin", hijacked_executable);
-    string* argp = (string*)malloc(sizeof(string) * (argc + 1));
-    int i;
-    for (i = 0; i < argc; i++) {
-        argp[i]=argv[i];
-    }
-    argp[argc] = NULL;
-    
-    argp[0] = real_executable;
-    
-    return exec_and_wait(argp);
-}