paleinfo v2

src/dfuhelper.c

@@ -37,7 +37,7 @@ int dfuhelper_thr_running = false;
 void step(int time, int time2, char *text, bool (*cond)(uint64_t), uint64_t cond_arg) {
     for (int i = time2; i < time; i++) {
 		printf(
-			checkrain_options_enabled(host_flags, host_option_no_colors) 
+			(palerain_flags & palerain_option_no_colors) 
 			? "\r\033[K%s (%d)" 
 			: BCYN "\r\033[K%s (%d)" CRESET, text, time - i + time2
 		);
@@ -46,7 +46,7 @@ void step(int time, int time2, char *text, bool (*cond)(uint64_t), uint64_t cond
 		if (cond != NULL && cond(cond_arg)) pthread_exit(NULL);
     }
     printf(
-		checkrain_options_enabled(host_flags, host_option_no_colors)
+		(palerain_flags & palerain_option_no_colors)
 		? "\r%s (%d)" 
 		: CYN "\r%s (%d)" CRESET, text, time2
 	);
@@ -68,7 +68,7 @@ int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 		return -1;
 	}
 	if (!strncmp(dev.productType, "iPhone10,", strlen("iPhone10,"))) {
-		if (!checkrain_options_enabled(host_flags, host_option_device_info))
+		if (!(palerain_flags & palerain_option_device_info))
 			LOG(LOG_VERBOSE2, "Product %s requires passcode to be disabled", dev.productType);
 		unsigned char passcode_state = 0;
 		ret = passstat_cmd(&passcode_state, usbmuxd_device->udid);
@@ -79,14 +79,14 @@ int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 		}
 		if (passcode_state) {
 			LOG(LOG_ERROR, "Passcode must be disabled on this device");
-			if (!checkrain_options_enabled(host_flags, host_option_device_info))
+			if (!(palerain_flags & palerain_option_device_info))
 				LOG(LOG_ERROR, "Additionally, passcode must never be set since a restore on iOS 16+");
 			devinfo_free(&dev);
 			return -1;
 		}
 	}
 
-	if (checkrain_options_enabled(host_flags, host_option_device_info)) {
+	if ((palerain_flags & palerain_option_device_info)) {
 		printf("Mode: normal\n");
 		printf("ProductType: %s\n", dev.productType);
 		printf("Architecture: %s\n", dev.CPUArchitecture);
@@ -101,7 +101,7 @@ int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 	LOG(LOG_INFO, "Telling device with udid %s to enter recovery mode immediately", usbmuxd_device->udid);
 	enter_recovery_cmd(usbmuxd_device->udid);
 	devinfo_free(&dev);
-	if (checkrain_options_enabled(host_flags, host_option_enter_recovery)) {
+	if ((palerain_flags & palerain_option_enter_recovery)) {
 		device_has_booted = true;
 		set_spin(0);
 		unsubscribe_cmd();
@@ -181,9 +181,9 @@ void device_event_cb(const usbmuxd_event_t *event, void* userdata) {
 	switch (event->event) {
 	case UE_DEVICE_ADD:
 		LOG(LOG_VERBOSE, "Normal mode device connected");
-		if (checkrain_options_enabled(host_flags, host_option_exit_recovery)) {
+		if ((palerain_flags & palerain_option_exit_recovery)) {
 			break;
-		} else if (checkrain_options_enabled(host_flags, host_option_reboot_device)) {
+		} else if ((palerain_flags & palerain_option_reboot_device)) {
 			int ret = reboot_cmd(event->device.udid);
 			if (!ret) {
 				LOG(LOG_INFO, "Restarted device");
@@ -211,9 +211,9 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
 				event->mode == IRECV_K_RECOVERY_MODE_2 || 
 				event->mode == IRECV_K_RECOVERY_MODE_3 || 
 				event->mode == IRECV_K_RECOVERY_MODE_4) {
-				if (!checkrain_options_enabled(host_flags, host_option_device_info))
+				if (!(palerain_flags & palerain_option_device_info))
 					LOG(LOG_VERBOSE, "Recovery mode device %ld connected", event->device_info->ecid);
-				if (checkrain_options_enabled(host_flags, host_option_exit_recovery)) {
+				if ((palerain_flags & palerain_option_exit_recovery)) {
 					ret = exitrecv_cmd(event->device_info->ecid);
 					if (!ret) {
 						LOG(LOG_INFO, "Exited recovery mode");
@@ -228,7 +228,7 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
 					break;
 				}
 
-				if (checkrain_options_enabled(host_flags, host_option_device_info)) {
+				if ((palerain_flags & palerain_option_device_info)) {
 					recvinfo_t info;
 					ret = recvinfo_cmd(&info, event->device_info->ecid);
 					if (ret) {
@@ -247,14 +247,14 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
 					break;
 				}
 
-				if (checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
-					checkrain_options_enabled(host_flags, host_option_reboot_device)) return;
+				if ((palerain_flags & palerain_option_enter_recovery) ||
+					(palerain_flags & palerain_option_reboot_device)) return;
 				pthread_create(&recovery_thread, NULL, (pthread_start_t)connected_recovery_mode, event->device_info);
 			} else if (event->mode == IRECV_K_DFU_MODE) {
-				if (!checkrain_options_enabled(host_flags, host_option_device_info))
+				if (!(palerain_flags & palerain_option_device_info))
 					LOG(LOG_VERBOSE, "DFU mode device %ld connected", event->device_info->ecid);
 
-				if (checkrain_options_enabled(host_flags, host_option_device_info)) {
+				if ((palerain_flags & palerain_option_device_info)) {
 					recvinfo_t info;
 					ret = recvinfo_cmd(&info, event->device_info->ecid);
 					if (ret) {
@@ -274,9 +274,9 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) {
 				}
 
 				if (
-					checkrain_options_enabled(host_flags, host_option_exit_recovery) ||
-					checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
-					checkrain_options_enabled(host_flags, host_option_reboot_device)) {
+					(palerain_flags & palerain_option_exit_recovery) ||
+					(palerain_flags & palerain_option_enter_recovery) ||
+					(palerain_flags & palerain_option_reboot_device)) {
 						break;
 				}
 				pthread_create(&dfu_thread, NULL, (pthread_start_t)connected_dfu_mode, event->device_info);

src/exec_checkra1n.c

@@ -126,11 +126,11 @@ int exec_checkra1n(void) {
 #endif
 checkra1n_exec: {};
 	char args[0x10] = "-E";
-	if (checkrain_options_enabled(host_flags, host_option_demote)) strncat(args, "d", 0xf);
-	if (!checkrain_options_enabled(host_flags, palerain_option_checkrain_is_clone)) {
+	if ((palerain_flags & palerain_option_demote)) strncat(args, "d", 0xf);
+	if (!(palerain_flags & palerain_option_checkrain_is_clone)) {
 		strncat(args, "p", 0xf);
 		if (verbose >= 2) strncat(args, "v", 0xf);
-		if (checkrain_options_enabled(host_flags, host_option_no_colors)) strncat(args, "n", 0xf);
+		if ((palerain_flags & palerain_option_no_colors)) strncat(args, "n", 0xf);
 	} else {
 		strncat(args, "R", 0xf);
 	}

src/lock_vars.c

@@ -27,7 +27,7 @@
 #include <ANSI-color-codes.h>
 #include <palerain.h>
 #include <xxd-embedded.h>
-#include <kerninfo.h>
+#include <paleinfo.h>
 
 pthread_mutex_t spin_mutex, found_pongo_mutex, ecid_dfu_wait_mutex;
 #ifdef TUI

src/log.c

@@ -12,7 +12,7 @@ int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxna
 {
     if (verbose >= 5 
 #ifdef TUI
-	&& !checkrain_options_enabled(host_flags, host_option_tui)
+	&& !(palerain_flags & palerain_option_tui)
 #endif
 	) fprintf(stderr, "p1_log: loglevel %d from %s:%d:%s()\n", loglevel, fname, lineno, fxname);
 	int ret = 0;
@@ -57,12 +57,12 @@ int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxna
 		snprintf(colour_bold, 0x10, "%s", BWHT);
 		break;
 	}
-	if (checkrain_options_enabled(host_flags, host_option_no_colors)) {
+	if ((palerain_flags & palerain_option_no_colors)) {
 		colour[0] = '\0';
 		colour_bold[0] = '\0';
 	}
 #ifdef TUI
-	if (checkrain_options_enabled(host_flags, host_option_tui) && tui_started) {
+	if ((palerain_flags & palerain_option_tui) && tui_started) {
 		newtComponent co = get_tui_log();
 		if (co == NULL) {
 			return 0; /* 0 bytes printed */
@@ -79,26 +79,26 @@ int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxna
 		time_t curtime;
 		time(&curtime);
 		struct tm* timeinfo = localtime(&curtime);
-		if (!checkrain_options_enabled(host_flags, host_option_no_colors))
+		if (!(palerain_flags & palerain_option_no_colors))
 			snprintf(timestring, 0x80, "%s[%s%02d/%02d/%d %02d:%02d:%02d%s]", CRESET, HBLK, timeinfo->tm_mon + 1, timeinfo->tm_mday, timeinfo->tm_year - 100, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, CRESET);
 		else
 			snprintf(timestring, 0x80, "[%02d/%02d/%d %02d:%02d:%02d]", timeinfo->tm_mon + 1, timeinfo->tm_mday, timeinfo->tm_year - 100, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-		if (verbose >= 2 && !checkrain_options_enabled(host_flags, host_option_no_colors)) {
+		if (verbose >= 2 && !(palerain_flags & palerain_option_no_colors)) {
 			printf("%s| - %s%s <%s> " CRESET "%s" HBLU "%s" CRESET ":" BLU "%d" CRESET ":" BMAG "%s()" CRESET ": \n%s| ----> ", colour_bold, timestring, colour_bold, type, WHT, fname, lineno, fxname, colour_bold);
-		} else if (!checkrain_options_enabled(host_flags, host_option_no_colors)) {
+		} else if (!(palerain_flags & palerain_option_no_colors)) {
 			printf(" - %s %s<%s>%s: ", timestring, colour_bold, type, CRESET);
-		} else if (verbose >= 2 && checkrain_options_enabled(host_flags, host_option_no_colors)) {
+		} else if (verbose >= 2 && (palerain_flags & palerain_option_no_colors)) {
 			printf("%s| - %s%s <%s> %s:%d:%s(): \n%s| ----> ", colour_bold, timestring, colour_bold, type, fname, lineno, fxname, colour_bold);
-		} else if (checkrain_options_enabled(host_flags, host_option_no_colors)) {
+		} else if ((palerain_flags & palerain_option_no_colors)) {
 			printf(" - %s %s<%s>: ", timestring, colour_bold, type);
 		}
 		printf("%s", colour);
 		ret = vprintf(format, args);
 		va_end(args);
 	
-		if (verbose < 2 && !checkrain_options_enabled(host_flags, host_option_no_colors))
+		if (verbose < 2 && !(palerain_flags & palerain_option_no_colors))
 			printf(CRESET "\n");
-		else if (!checkrain_options_enabled(host_flags, host_option_no_colors))
+		else if (!(palerain_flags & palerain_option_no_colors))
 			printf("\n%s-%s\n", colour, CRESET);
 		else if (verbose < 2) 
 			printf("\n");

src/main.c

@@ -27,14 +27,14 @@
 #include <ANSI-color-codes.h>
 #include <palerain.h>
 #include <xxd-embedded.h>
-#include <kerninfo.h>
+#include <paleinfo.h>
 
 #define CMD_LEN_MAX 512
 #define OVERRIDE_MAGIC 0xd803b376
 
 unsigned int verbose = 0;
-char xargs_cmd[0x270] = "xargs ", checkrain_flags_cmd[0x20] = "deadbeef", palerain_flags_cmd[0x20] = "deadbeef";
-char kpf_flags_cmd[0x20] = "deadbeef", dtpatch_cmd[0x20] = "deadbeef", rootfs_cmd[512] = "deadbeef";
+char xargs_cmd[0x270] = "xargs ", palerain_flags_cmd[0x20] = "deadbeef";
+char dtpatch_cmd[0x20] = "deadbeef", rootfs_cmd[512] = "deadbeef";
 extern char** environ;
 
 niarelap_file_t* kpf_to_upload_1 = &checkra1n_kpf_pongo;
@@ -47,7 +47,7 @@ niarelap_file_t** overlay_to_upload = &overlay_to_upload_1;
 
 override_file_t override_ramdisk, override_kpf, override_overlay;
 
-uint32_t checkrain_flags = 0, palerain_flags = 0, kpf_flags = 0;
+uint64_t palerain_flags = 0;
 
 pthread_mutex_t log_mutex;
 pthread_t dfuhelper_thread, pongo_thread;
@@ -73,7 +73,7 @@ int build_checks(void) {
 		LOG(LOG_FATAL, "checkra1n too small");
 	}
 	if (boyermoore_horspool_memmem(&checkra1n[0], checkra1n_len, (const unsigned char *)"[ra1npoc15-part] thanks to", strlen("[ra1npoc15-part] thanks to")) != NULL) {
-		host_flags |= palerain_option_checkrain_is_clone;
+		palerain_flags |= palerain_option_checkrain_is_clone;
 	}
 #endif
 #ifndef NO_KPF
@@ -111,9 +111,9 @@ int palera1n(int argc, char *argv[]) {
 	pthread_mutex_init(&ecid_dfu_wait_mutex, NULL);
 	if ((ret = build_checks())) return ret;
 	if ((ret = optparse(argc, argv))) goto cleanup;
-	if (!checkrain_options_enabled(host_flags, host_option_device_info) && checkrain_options_enabled(host_flags, host_option_palerain_version)) goto normal_exit;
+	if (!(palerain_flags & palerain_option_device_info) && (palerain_flags & palerain_option_palerain_version)) goto normal_exit;
 #ifdef TUI
-	if (checkrain_options_enabled(host_flags, host_option_tui)) {
+	if ((palerain_flags & palerain_option_tui)) {
 		ret = tui();
 		if (ret) goto cleanup;
 		else goto normal_exit;
@@ -133,7 +133,7 @@ int palera1n(int argc, char *argv[]) {
 	}
 #endif
 
-	if (!checkrain_options_enabled(host_flags, host_option_device_info))
+	if (!(palerain_flags & palerain_option_device_info))
 		LOG(LOG_INFO, "Waiting for devices");
 
 	if (access("/var/run/usbmuxd", F_OK) != 0) 
@@ -143,16 +143,16 @@ int palera1n(int argc, char *argv[]) {
 	pthread_create(&dfuhelper_thread, NULL, dfuhelper, NULL);
 	pthread_join(dfuhelper_thread, NULL);
 	set_spin(0);
-	if (checkrain_options_enabled(host_flags, host_option_dfuhelper_only | 
-											  host_option_reboot_device  | 
-											  host_option_exit_recovery  | 
-											  host_option_enter_recovery | 
-											  host_option_device_info
+	if ((palerain_flags & (palerain_option_dfuhelper_only | 
+											  palerain_option_reboot_device  | 
+											  palerain_option_exit_recovery  | 
+											  palerain_option_enter_recovery | 
+											  palerain_option_device_info)
 								 ) || device_has_booted)
 		goto normal_exit;
 	if (exec_checkra1n()) goto cleanup;
 
-	if (checkrain_options_enabled(host_flags, host_option_pongo_exit | host_option_demote))
+	if ((palerain_flags & (palerain_option_pongo_exit | palerain_option_demote)))
 		goto normal_exit;
 	set_spin(1);
 	sleep(2);

src/optparse.c

@@ -13,9 +13,9 @@
 #include <errno.h>
 #include <palerain.h>
 #include <sys/mman.h>
+#include <inttypes.h>
 
-checkrain_option_t host_flags = 0;
-checkrain_option_p host_flags_p = &host_flags;
+uint64_t* palerain_flags_p = &palerain_flags;
 static bool force_use_verbose_boot = false;
 
 static struct option longopts[] = {
@@ -31,7 +31,6 @@ static struct option longopts[] = {
 	{"boot-args", required_argument, NULL, 'e'},
 	{"fakefs", no_argument, NULL, 'f'},
 	{"rootless", no_argument, NULL, 'l'},
-	{"jbinit-log-to-file", no_argument, NULL, 'L'},
 	{"demote", no_argument, NULL, 'd'},
 	{"force-revert", no_argument, NULL, palerain_option_case_force_revert},
 	{"no-colors", no_argument, NULL, 'S'},
@@ -126,7 +125,7 @@ int optparse(int argc, char* argv[]) {
 	int opt;
 	int index;
 	while ((opt = getopt_long(argc, argv,
-	"DEhpvVldsSLtRnPIe:o:r:K:k:i:"
+	"DEhpvVlLdsStRnPIe:o:r:K:k:i:"
 #ifdef DEV_BUILD
 	"12"
 #endif
@@ -137,23 +136,23 @@ int optparse(int argc, char* argv[]) {
 		case 'B':
 			palerain_flags |= palerain_option_setup_partial_root;
 			palerain_flags |= palerain_option_setup_rootful;
-			kpf_flags |= checkrain_option_verbose_boot;
+			palerain_flags |= palerain_option_verbose_boot;
 			break;
 		case 'c':
 			palerain_flags |= palerain_option_setup_rootful;
-			kpf_flags |= checkrain_option_verbose_boot;
+			palerain_flags |= palerain_option_verbose_boot;
 			break;
 		case 'C':
 			palerain_flags |= palerain_option_clean_fakefs;
 			break;
 		case 'p':
-			host_flags |= host_option_pongo_exit;
+			palerain_flags |= palerain_option_pongo_exit;
 			break;
 		case 'P':
-			host_flags |= host_option_pongo_full;
+			palerain_flags |= palerain_option_pongo_full;
 			break;
 		case 'D':
-			host_flags |= host_option_dfuhelper_only;
+			palerain_flags |= palerain_option_dfuhelper_only;
 			break;
 		case 'h':
 			usage(0, argv[0]);
@@ -162,7 +161,7 @@ int optparse(int argc, char* argv[]) {
 			verbose++;
 			break;
 		case 'V':
-			kpf_flags |= checkrain_option_verbose_boot;
+			palerain_flags |= palerain_option_verbose_boot;
 			force_use_verbose_boot = true;
 			break;
 		case 'e':
@@ -187,13 +186,13 @@ int optparse(int argc, char* argv[]) {
 			palerain_flags |= palerain_option_jbinit_log_to_file;
 			break;
 		case 'd':
-			host_flags |= host_option_demote;
+			palerain_flags |= palerain_option_demote;
 			break;
 		case 'E':
-			host_flags |= host_option_enter_recovery;
+			palerain_flags |= palerain_option_enter_recovery;
 			break;
 		case 's':
-			checkrain_flags |= checkrain_option_safemode;
+			palerain_flags |= palerain_option_safemode;
 			break;
 		case 'k':
 			if (access(optarg, F_OK) != 0) {
@@ -254,12 +253,12 @@ int optparse(int argc, char* argv[]) {
 			}
 			if (boyermoore_horspool_memmem(addr, st.st_size, (const unsigned char*)"[ra1npoc15-part] thanks to", strlen("[ra1npoc15-part] thanks to")) != NULL) 
 				{
-					host_flags |= palerain_option_checkrain_is_clone;
+					palerain_flags |= palerain_option_checkrain_is_clone;
 					LOG(LOG_VERBOSE3, "%s is checkra1n clone", optarg);
 				}
 			else
 			{
-				host_flags &= ~palerain_option_checkrain_is_clone;
+				palerain_flags &= ~palerain_option_checkrain_is_clone;
 				LOG(LOG_VERBOSE3, "%s is checkra1n", optarg);
 			}
 			munmap(addr, st.st_size);
@@ -268,20 +267,20 @@ int optparse(int argc, char* argv[]) {
 			snprintf(ext_checkra1n, strlen(optarg) + 1, "%s", optarg);
 			break;
 		case 'R':
-			host_flags |= host_option_reboot_device;
+			palerain_flags |= palerain_option_reboot_device;
 			break;
 		case 'n':
-			host_flags |= host_option_exit_recovery;
+			palerain_flags |= palerain_option_exit_recovery;
 			break;
 		case 'I':
-			host_flags |= host_option_device_info;
+			palerain_flags |= palerain_option_device_info;
 			break;
 		case 'S':
-			host_flags |= host_option_no_colors;
+			palerain_flags |= palerain_option_no_colors;
 			break;
 #ifdef TUI
 		case 't':
-			host_flags |= host_option_tui;
+			palerain_flags |= palerain_option_tui;
 			break;
 #endif
 #ifdef DEV_BUILD
@@ -293,17 +292,17 @@ int optparse(int argc, char* argv[]) {
 			break;
 #endif
 		case palerain_option_case_force_revert:
-			checkrain_flags |= checkrain_option_force_revert;
+			palerain_flags |= palerain_option_force_revert;
 			break;
 		case palerain_option_case_version:
-			host_flags |= host_option_palerain_version;
+			palerain_flags |= palerain_option_palerain_version;
 			break;
 		default:
 			usage(1, argv[0]);
 			break;
 		}
 	}
-	if (checkrain_options_enabled(host_flags, host_option_palerain_version)) {
+	if ((palerain_flags & palerain_option_palerain_version)) {
 		printf(
 			"palera1n " PALERAIN_VERSION "\n"
 			BUILD_COMMIT " " BUILD_NUMBER " (" BUILD_BRANCH ")\n\n"
@@ -321,17 +320,12 @@ int optparse(int argc, char* argv[]) {
 		return 0;
 	}
 
-	if ((strstr(xargs_cmd, "serial=") != NULL) && !force_use_verbose_boot && checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
-		kpf_flags &= ~checkrain_option_verbose_boot;
+	if ((strstr(xargs_cmd, "serial=") != NULL) && !force_use_verbose_boot && (palerain_flags & palerain_option_setup_rootful)) {
+		palerain_flags &= ~palerain_option_verbose_boot;
 	}
     
-	snprintf(checkrain_flags_cmd, 0x20, "checkra1n_flags 0x%x", checkrain_flags);
-	snprintf(palerain_flags_cmd, 0x20, "palera1n_flags 0x%x", palerain_flags);
-	snprintf(kpf_flags_cmd, 0x20, "kpf_flags 0x%x", kpf_flags);
-	LOG(LOG_VERBOSE3, "checkrain_flags: %s", checkrain_flags_cmd);
+	snprintf(palerain_flags_cmd, 0x20, "palera1n_flags 0x%" PRIx64, palerain_flags);
 	LOG(LOG_VERBOSE3, "palerain_flags: %s", palerain_flags_cmd);
-	LOG(LOG_VERBOSE3, "kpf_flags: %s", kpf_flags_cmd);
-	LOG(LOG_VERBOSE3, "host_flags: 0x%x", host_flags);
 	if (override_kpf.magic == OVERRIDE_MAGIC) {
 		LOG(LOG_VERBOSE4, "kpf override length %u -> %u", override_kpf.orig_len, checkra1n_kpf_pongo_len);
 		LOG(LOG_VERBOSE4, "kpf override ptr %p -> %p", override_kpf.orig_ptr, **kpf_to_upload);
@@ -345,17 +339,17 @@ int optparse(int argc, char* argv[]) {
 		LOG(LOG_VERBOSE4, "overlay override ptr %p -> %p", override_overlay.orig_ptr, **overlay_to_upload);
 	}
 
-	if (!checkrain_options_enabled(palerain_flags, palerain_option_rootful)) {
-		if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful) || checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful_forced)) {
+	if (!(palerain_flags & palerain_option_rootful)) {
+		if ((palerain_flags & palerain_option_setup_rootful)) {
 			LOG(LOG_FATAL, "Cannot setup rootful when rootless is requested. Use -f to enable rootful mode.");
 			return -1;
 		}
 	}
 	if (!(
-			checkrain_options_enabled(host_flags, host_option_dfuhelper_only) ||
-			checkrain_options_enabled(host_flags, host_option_enter_recovery) ||
-			checkrain_options_enabled(host_flags, host_option_exit_recovery) ||
-			checkrain_options_enabled(host_flags, host_option_reboot_device)))
+			(palerain_flags & palerain_option_dfuhelper_only) ||
+			(palerain_flags & palerain_option_enter_recovery) ||
+			(palerain_flags & palerain_option_exit_recovery) ||
+			(palerain_flags & palerain_option_reboot_device)))
 	{
 #ifdef NO_CHECKRAIN
 		if (checkra1n_len == 0 && ext_checkra1n == NULL)
@@ -363,7 +357,7 @@ int optparse(int argc, char* argv[]) {
 			LOG(LOG_FATAL, "checkra1n omitted in build but no override specified");
 			return -1;
 		}
-		if (!(checkrain_options_enabled(host_flags, host_option_pongo_exit) || checkrain_options_enabled(host_flags, host_option_pongo_exit)))
+		if (!((palerain_flags & palerain_option_pongo_exit) || (palerain_flags & palerain_option_pongo_exit)))
 		{
 #ifdef NO_KPF
 			if (checkra1n_kpf_pongo_len == 0)

src/pongo_helper.c

@@ -33,7 +33,7 @@ void *pongo_usb_callback(stuff_t *arg) {
 	if (get_found_pongo())
 		return NULL;
 	set_found_pongo(1);
-	if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
+	if ((palerain_flags & palerain_option_setup_rootful)) {
 		strncat(xargs_cmd, " wdt=-1", 0x270 - strlen(xargs_cmd) - 1);	
 	}
 	LOG(LOG_INFO, "Found PongoOS USB Device");
@@ -43,10 +43,8 @@ void *pongo_usb_callback(stuff_t *arg) {
 	issue_pongo_command(handle, "sep auto");
 	upload_pongo_file(handle, **kpf_to_upload, checkra1n_kpf_pongo_len);
 	issue_pongo_command(handle, "modload");
-	issue_pongo_command(handle, kpf_flags_cmd);
-	issue_pongo_command(handle, checkrain_flags_cmd);
 	issue_pongo_command(handle, palerain_flags_cmd);
-	if (checkrain_options_enabled(palerain_flags, palerain_option_rootful))
+	if ((palerain_flags & palerain_option_rootful))
 	{
 		issue_pongo_command(handle, "rootfs");
 	}
@@ -66,13 +64,13 @@ void *pongo_usb_callback(stuff_t *arg) {
 		issue_pongo_command(handle, "overlay");
 	}
 	issue_pongo_command(handle, xargs_cmd);
-	if (checkrain_options_enabled(host_flags, host_option_pongo_full)) goto done;
+	if ((palerain_flags & palerain_option_pongo_full)) goto done;
 	issue_pongo_command(handle, "bootx");
 	LOG(LOG_INFO, "Booting Kernel...");
-	if (checkrain_options_enabled(palerain_flags, palerain_option_setup_partial_root)) {
+	if ((palerain_flags & palerain_option_setup_partial_root)) {
 		LOG(LOG_INFO, "Please wait up to 5 minutes for the bindfs to be created.");
 		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -B (Create BindFS) option to jailbreak.");
-	} else if (checkrain_options_enabled(palerain_flags, palerain_option_setup_rootful)) {
+	} else if ((palerain_flags & palerain_option_setup_rootful)) {
 		LOG(LOG_INFO, "Please wait up to 10 minutes for the fakefs to be created.");
 		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -c (Create FakeFS) option to jailbreak.");
 	}
@@ -163,7 +161,7 @@ int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, unsigned i
 		    if (verbose < 3 || verbose > 4) {
 				LOG(LOG_VERBOSE, "Uploaded %llu bytes to PongoOS", (unsigned long long)buf_len);
     		} else {
-				if (checkrain_options_enabled(host_flags, host_option_no_colors))
+				if ((palerain_flags & palerain_option_no_colors))
 				    printf("/send mem:%p:%p\nUploaded %llu bytes]\n", (void*)buf, (void*)(buf + buf_len), (unsigned long long)buf_len);
 				else
         			printf("/send mem:%p:%p\n" BCYN "[Uploaded %llu bytes]\n" CRESET, (void*)buf, (void*)(buf + buf_len), (unsigned long long)buf_len);

src/tui_screen_options.c

@@ -22,14 +22,14 @@ void bitfield_check_cb(newtComponent box, void* data) {
 
 
 tui_screen_t tui_screen_options() {
-    tui_bit_info_t verbose_info = { &kpf_flags, checkrain_option_verbose_boot };
+    tui_bit_info_t verbose_info = { &palerain_flags, palerain_option_verbose_boot };
     tui_bit_info_t rootful_info = { &palerain_flags, palerain_option_rootful };
     tui_bit_info_t setup_rootful_info = { &palerain_flags, palerain_option_setup_rootful };
-    tui_bit_info_t force_revert_info = { &checkrain_flags, checkrain_option_force_revert };
-    tui_bit_info_t safemode_info = { &checkrain_flags, checkrain_option_safemode };
+    tui_bit_info_t force_revert_info = { &palerain_flags, palerain_option_force_revert };
+    tui_bit_info_t safemode_info = { &palerain_flags, palerain_option_safemode };
 
-    static checkrain_option_t flower_flags = 0, flower_option_flower_chain = (1 << 0);
-    tui_bit_info_t flower_chain_info = { &flower_flags, flower_option_flower_chain };
+    static uint64_t palerain_flags = 0;
+    tui_bit_info_t flower_chain_info = { &palerain_flags, palerain_option_flower_chain };
     
     const char* bootargs_entered = NULL;
     int ret = MAIN_SCREEN;
@@ -41,11 +41,11 @@ tui_screen_t tui_screen_options() {
     newtTextboxSetText(optionsNotice, "You may set the following options. If you don't know what they mean you'll probably have no reason to set them.");
     // newtTextboxSetColors(optionsNotice, NEWT_COLORSET_LABEL, NEWT_COLORSET_LABEL);
 
-    newtComponent verboseBootBox = newtCheckbox(1, 3, "Verbose boot", CHECKBOX_STATE(kpf_flags, checkrain_option_verbose_boot), NULL, NULL);
+    newtComponent verboseBootBox = newtCheckbox(1, 3, "Verbose boot", CHECKBOX_STATE(palerain_flags, palerain_option_verbose_boot), NULL, NULL);
     newtComponent rootfulBox = newtCheckbox(1, 4, "Rootful", CHECKBOX_STATE(palerain_flags, palerain_option_rootful), NULL, NULL);
     newtComponent rootfulSetupBox = newtCheckbox(1, 5, "Setup fakefs", CHECKBOX_STATE(palerain_flags, palerain_option_setup_rootful), NULL, NULL);
-    newtComponent forceRevertBox = newtCheckbox(1, 6, "Restore system", CHECKBOX_STATE(checkrain_flags, checkrain_option_force_revert), NULL, NULL);
-    newtComponent safeModeBox = newtCheckbox(1, 7, "Safe mode", CHECKBOX_STATE(checkrain_flags, checkrain_option_safemode), NULL, NULL);
+    newtComponent forceRevertBox = newtCheckbox(1, 6, "Restore system", CHECKBOX_STATE(palerain_flags, palerain_option_force_revert), NULL, NULL);
+    newtComponent safeModeBox = newtCheckbox(1, 7, "Safe mode", CHECKBOX_STATE(palerain_flags, palerain_option_safemode), NULL, NULL);
 
     newtComponentAddCallback(verboseBootBox, bitfield_check_cb, &verbose_info);
     newtComponentAddCallback(rootfulBox, bitfield_check_cb, &rootful_info);
@@ -56,7 +56,7 @@ tui_screen_t tui_screen_options() {
     newtComponent bootCmdlineLabel = newtLabel(1, 8, "Kernel command line:");
     newtComponent bootCmdlineEntry = newtEntry(1, 9, &xargs_cmd[6], WIDTH - 2, &bootargs_entered, NEWT_ENTRY_SCROLL);
 
-    newtComponent flowerChainBox = newtCheckbox(1, 10, "Flower chain", CHECKBOX_STATE(flower_flags, flower_option_flower_chain), NULL, NULL);
+    newtComponent flowerChainBox = newtCheckbox(1, 10, "Flower chain", CHECKBOX_STATE(palerain_flags, palerain_option_flower_chain), NULL, NULL);
     newtComponentAddCallback(flowerChainBox, bitfield_check_cb, &flower_chain_info);