include fixes

src/devhelper.c

@@ -34,7 +34,7 @@
 #include <libtvcontrol.h>
 #endif
 
-#include "common.h"
+#include <common.h>
 
 irecv_device_event_context_t irecvctx = NULL;
 

src/dfuhelper.c

@@ -24,8 +24,8 @@
 #include <libirecovery.h>
 #include <usbmuxd.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
 
 #define FORMAT_KEY_VALUE 1
 #define FORMAT_XML 2

src/exec_checkra1n.c

@@ -17,8 +17,8 @@
 
 extern char **environ;
 
-#include "common.h"
-#include "xxd-embedded.h"
+#include <common.h>
+#include <xxd-embedded.h>
 char* pongo_path = NULL;
 
 void exec_checkra1n() {

src/kerninfo.h

@@ -1,114 +0,0 @@
-/*
- * pongoOS - https://checkra.in
- *
- * Copyright (C) 2019-2022 checkra1n team
- *
- * This file is part of pongoOS.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-#ifndef _KERNINFO_H
-#define _KERNINFO_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#define MAX_BOOTARGS_LEN 256
-
-#define checkrain_option_none               0x00000000
-#define checkrain_option_all                0x7fffffff
-#define checkrain_option_failure            0x80000000
-
-// Host options
-#define checkrain_option_verbose_logging    (1 << 0)
-#define checkrain_option_demote             (1 << 1)
-#define checkrain_option_early_exit         (1 << 2)
-#define checkrain_option_quick_mode         (1 << 3)
-#define checkrain_option_pongo_shell        (1 << 4)
-#define checkrain_option_pongo_full         (1 << 5)
-
-// KPF options
-#define checkrain_option_verbose_boot       (1 << 0)
-
-// Global options
-#define checkrain_option_safemode           (1 << 0)
-#define checkrain_option_bind_mount         (1 << 1)
-#define checkrain_option_overlay            (1 << 2)
-#define checkrain_option_force_revert       (1 << 7) /* keep this at 7 */
-
-// palera1n option
-#define palerain_option_rootful              (1 << 0) /* rootful jailbreak */
-#define palerain_option_jbinit_log_to_file   (1 << 1) /* log to /cores/jbinit.log */
-#define palerain_option_setup_rootful        (1 << 2) /* create fakefs */
-#define palerain_option_setup_rootful_forced (1 << 3) /* create fakefs over an existing one */
-
-#define PALEINFO_MAGIC 'PLSH'
-#define PALEINFO_CIGAM 'HSLP'
-
-typedef uint32_t checkrain_option_t, *checkrain_option_p;
-
-typedef enum {
-    jailbreak_capability_tfp0               = 1 << 0,
-    jailbreak_capability_userspace_reboot   = 1 << 1,
-    jailbreak_capability_dyld_ignore_os     = 1 << 2, // TODO: This needs a better name
-} jailbreak_capability_t, *jailbreak_capability_p;
-
-#define DEFAULT_CAPABILITIES (jailbreak_capability_tfp0|jailbreak_capability_userspace_reboot)
-struct kerninfo {
-    uint64_t size;
-    uint64_t base;
-    uint64_t slide;
-    checkrain_option_t flags;
-};
-struct paleinfo {
-    uint32_t magic; // 'PLSH' / 0x504c5348
-    uint32_t version; // 1
-    checkrain_option_t flags;
-    char rootdev[0x10];
-};
-struct kpfinfo {
-    struct kerninfo k;
-    checkrain_option_t kpf_flags;
-    char bootargs[MAX_BOOTARGS_LEN];
-};
-
-#define checkrain_set_option(options, option, enabled) do { \
-    if (enabled)                                            \
-        options = (checkrain_option_t)(options | option);   \
-    else                                                    \
-        options = (checkrain_option_t)(options & ~option);  \
-} while (0);
-
-static inline bool checkrain_option_enabled(checkrain_option_t flags, checkrain_option_t opt)
-{
-    if(flags == checkrain_option_failure)
-    {
-        switch(opt)
-        {
-            case checkrain_option_safemode:
-                return true;
-            default:
-                return false;
-        }
-    }
-    return (flags & opt) != 0;
-}
-
-#endif

src/log.c

@@ -5,8 +5,8 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
 
 int p1_log(log_level_t loglevel, const char *fname, int lineno, const char *fxname, char *__restrict format, ...)
 {

src/main.c

@@ -24,10 +24,10 @@
 
 #include <libimobiledevice/libimobiledevice.h>
 
-#include "ANSI-color-codes.h"
-#include "common.h"
-#include "xxd-embedded.h"
-#include "kerninfo.h"
+#include <ANSI-color-codes.h>
+#include <common.h>
+#include <xxd-embedded.h>
+#include <kerninfo.h>
 
 #define CMD_LEN_MAX 512
 #define OVERRIDE_MAGIC 0xd803b376

src/optparse.c

@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <errno.h>
-#include "common.h"
+#include <common.h>
 
 
 static struct option longopts[] = {

src/override_file.c

@@ -11,7 +11,8 @@
 #include <getopt.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include "common.h"
+
+#include <common.h>
 
 int override_file(override_file_t *finfo, niarelap_file_t** orig, unsigned int *orig_len, char *filename) {
 	int ret = 0;

src/pongo_helper.c

@@ -10,7 +10,7 @@
 #include <sys/mman.h>           // mmap, munmap
 #include <sys/stat.h>           // fstst
 
-#include "common.h"
+#include <common.h>
 
 int found_pongo = 0; 
 

src/pongo_usb.c

@@ -37,7 +37,8 @@
 #include <unistd.h>             // close
 #include <sys/mman.h>           // mmap, munmap
 #include <sys/stat.h>           // fstst
-#include "common.h"
+
+#include <common.h>
 #define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)
 
 // Keep in sync with Pongo

src/window.c

@@ -11,8 +11,8 @@
 #include <locale.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "tui.h"
+#include <common.h>
+#include <tui.h>
 
 #define MSG_COLOR 1
 #define ICON_COLOR 2