Separate pattern logic

core/jni/include/cpio.h

@@ -42,8 +42,10 @@ typedef struct cpio_newc_header {
 } cpio_newc_header;
 
 // Basic cpio functions
+int cpio_cmp(const void *a, const void *b);
 void parse_cpio(struct vector *v, const char *filename);
 void dump_cpio(struct vector *v, const char *filename);
+void cpio_vec_insert(struct vector *v, cpio_entry *n);
 void cpio_vec_destroy(struct vector *v);
 void cpio_rm(struct vector *v, int recursive, const char *entry);
 void cpio_mkdir(struct vector *v, mode_t mode, const char *entry);
@@ -53,10 +55,4 @@ int cpio_mv(struct vector *v, const char *from, const char *to);
 int cpio_extract(struct vector *v, const char *entry, const char *filename);
 void cpio_extract_all(struct vector *v);
 
-// Magisk specific
-int cpio_test(struct vector *v);
-struct vector *cpio_backup(struct vector *v, const char *orig, const char *sha1);
-void cpio_restore(struct vector *v);
-char *cpio_stocksha1(struct vector *v);
-
 #endif

core/jni/include/logging.h

@@ -15,7 +15,9 @@
  * No logging *
  **************/
 
+#define LOGD(...)
 #define LOGI(...)
+#define LOGW(...)
 #define LOGE(...)
 #define PLOGE(...)
 
@@ -26,6 +28,7 @@
 #ifdef IS_DAEMON
 
 #undef LOGI
+#undef LOGW
 #undef LOGE
 #undef PLOGE
 
@@ -35,14 +38,12 @@
 #define LOG_TAG    "Magisk"
 
 #ifdef MAGISK_DEBUG
+#undef LOGD
 #define LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#else
-#define LOGD(...)
 #endif
 #define LOGI(...)  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 #define LOGW(...)  __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
 #define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-
 #define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
 
 enum {
@@ -65,13 +66,11 @@ void start_debug_log();
 
 #ifdef XWRAP_EXIT
 
-#undef LOGI
 #undef LOGE
 #undef PLOGE
 
 #include <stdio.h>
 
-#define LOGI(...)
 #define LOGE(...) { fprintf(stderr, __VA_ARGS__); exit(1); }
 #define PLOGE(fmt, args...) { fprintf(stderr, fmt " failed with %d: %s\n\n", ##args, errno, strerror(errno)); exit(1); }
 

core/jni/include/utils.h

@@ -70,7 +70,7 @@ pid_t xfork();
 
 // misc.c
 
-extern int quit_signals[];
+#define quit_signals ((int []) { SIGALRM, SIGABRT, SIGHUP, SIGPIPE, SIGQUIT, SIGTERM, SIGINT, 0 })
 
 unsigned get_shell_uid();
 unsigned get_system_uid();
@@ -119,7 +119,8 @@ void clone_attr(const char *source, const char *target);
 void restorecon(int dirfd, int force);
 int mmap_ro(const char *filename, void **buf, size_t *size);
 int mmap_rw(const char *filename, void **buf, size_t *size);
-void full_read(int fd, void **buf, size_t *size);
+void full_read(const char *filename, void **buf, size_t *size);
+void stream_full_read(int fd, void **buf, size_t *size);
 void write_zero(int fd, size_t size);
 void mem_align(size_t *pos, size_t align);
 void file_align(int fd, size_t align, int out);
@@ -138,4 +139,10 @@ void umount_image(const char *target, const char *device);
 int merge_img(const char *source, const char *target);
 void trim_img(const char *img);
 
+// pattern.c
+
+void patch_init_rc(void **buf, size_t *size);
+int patch_verity(char **buf, uint32_t *size, int patch);
+void patch_encryption(char **buf, uint32_t *size);
+
 #endif