Separate libutils and libsystemproperties

native/jni/utils/include/list.h

@@ -0,0 +1,43 @@
+/* list.h - Double link list implementation
+ */
+
+#ifndef _LIST_H_
+#define _LIST_H_
+
+#include <stddef.h>
+
+struct list_head {
+	struct list_head *next;
+	struct list_head *prev;
+};
+
+void init_list_head(struct list_head *head);
+void list_insert(struct list_head *pos, struct list_head *node);
+void list_insert_end(struct list_head *head, struct list_head *node);
+struct list_head *list_pop(struct list_head *pos);
+struct list_head *list_pop_end(struct list_head *head);
+
+#define list_entry(pos, type, member) ({ \
+	const typeof( ((type *)0)->member ) *__mptr = (pos); \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+#define list_for_each(ptr, head, type, member) \
+	ptr = list_entry((head)->next, type, member); \
+	for (struct list_head *__ = (head)->next; __ != (head); __ = __->next, ptr = list_entry(__, type, member))
+
+#define list_for_each_r(ptr, head, type, member) \
+	ptr = list_entry((head)->prev, type, member); \
+	for (struct list_head *__ = (head)->prev; __ != (head); __ = __->prev, ptr = list_entry(__, type, member))
+
+#define list_destory(head, type, member, func) ({ \
+	struct list_head *node = head->next; \
+	while(node != head) { \
+		node = node->next; \
+		if (func) func(list_entry(node->prev, line_list, pos)); \
+		free(list_entry(node->prev, line_list, pos)); \
+	} \
+	head->next = head; \
+	head->prev = head; \
+})
+
+#endif

native/jni/utils/include/logging.h

@@ -0,0 +1,44 @@
+/* logging.h - Error handling and logging
+ */
+
+#pragma once
+
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+
+#define str(a) #a
+#define xstr(a) str(a)
+
+typedef enum {
+	L_DEBUG,
+	L_INFO,
+	L_WARN,
+	L_ERR
+} log_type;
+
+struct log_callback {
+	int (*d)(const char* fmt, va_list ap);
+	int (*i)(const char* fmt, va_list ap);
+	int (*w)(const char* fmt, va_list ap);
+	int (*e)(const char* fmt, va_list ap);
+	void (*ex)(int code);
+};
+
+extern struct log_callback log_cb;
+
+#define LOGD(...) log_handler(L_DEBUG, __VA_ARGS__)
+#define LOGI(...) log_handler(L_INFO, __VA_ARGS__)
+#define LOGW(...) log_handler(L_WARN, __VA_ARGS__)
+#define LOGE(...) log_handler(L_ERR, __VA_ARGS__)
+#define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
+
+int nop_log(const char *fmt, va_list ap);
+void nop_ex(int i);
+
+void no_logging();
+void android_logging();
+void cmdline_logging();
+
+int log_handler(log_type t, const char *fmt, ...);
+

native/jni/utils/include/selinux.h

@@ -0,0 +1,12 @@
+
+#pragma once
+
+extern void (*freecon)(char * con);
+extern int (*setcon)(const char * con);
+extern int (*getfilecon)(const char *path, char ** con);
+extern int (*lgetfilecon)(const char *path, char ** con);
+extern int (*setfilecon)(const char *path, const char * con);
+extern int (*lsetfilecon)(const char *path, const char * con);
+
+void setup_selinux();
+void restorecon();

native/jni/utils/include/utils.h

@@ -0,0 +1,156 @@
+/* util.h - Header for all utility functions
+ */
+
+#ifndef _UTILS_H_
+#define _UTILS_H_
+
+#include <stdio.h>
+#include <dirent.h>
+#include <pthread.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include "vector.h"
+
+#define UID_SHELL  (get_shell_uid())
+#define UID_ROOT   0
+#define UID_SYSTEM (get_system_uid())
+#define UID_RADIO  (get_radio_uid())
+
+// xwrap.c
+
+#ifndef SOCK_CLOEXEC
+#define SOCK_CLOEXEC O_CLOEXEC
+#endif
+#ifndef SOCK_NONBLOCK
+#define SOCK_NONBLOCK O_NONBLOCK
+#endif
+
+FILE *xfopen(const char *pathname, const char *mode);
+FILE *xfdopen(int fd, const char *mode);
+#define GET_MACRO(_1, _2, _3, NAME, ...) NAME
+#define xopen(...) GET_MACRO(__VA_ARGS__, xopen3, xopen2)(__VA_ARGS__)
+int xopen2(const char *pathname, int flags);
+int xopen3(const char *pathname, int flags, mode_t mode);
+int xopenat(int dirfd, const char *pathname, int flags);
+ssize_t xwrite(int fd, const void *buf, size_t count);
+ssize_t xread(int fd, void *buf, size_t count);
+ssize_t xxread(int fd, void *buf, size_t count);
+int xpipe2(int pipefd[2], int flags);
+int xsetns(int fd, int nstype);
+int xunshare(int flags);
+DIR *xopendir(const char *name);
+DIR *xfdopendir(int fd);
+struct dirent *xreaddir(DIR *dirp);
+pid_t xsetsid();
+int xsocket(int domain, int type, int protocol);
+int xbind(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int xconnect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int xlisten(int sockfd, int backlog);
+int xaccept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
+void *xmalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
+void *xrealloc(void *ptr, size_t size);
+ssize_t xsendmsg(int sockfd, const struct msghdr *msg, int flags);
+ssize_t xrecvmsg(int sockfd, struct msghdr *msg, int flags);
+int xpthread_create(pthread_t *thread, const pthread_attr_t *attr,
+	void *(*start_routine) (void *), void *arg);
+int xsocketpair(int domain, int type, int protocol, int sv[2]);
+int xstat(const char *pathname, struct stat *buf);
+int xlstat(const char *pathname, struct stat *buf);
+int xdup2(int oldfd, int newfd);
+int xdup3(int oldfd, int newfd, int flags);
+ssize_t xreadlink(const char *pathname, char *buf, size_t bufsiz);
+ssize_t xreadlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
+int xsymlink(const char *target, const char *linkpath);
+int xsymlinkat(const char *target, int newdirfd, const char *linkpath);
+int xlinkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags);
+int xmount(const char *source, const char *target,
+	const char *filesystemtype, unsigned long mountflags,
+	const void *data);
+int xumount(const char *target);
+int xumount2(const char *target, int flags);
+int xrename(const char *oldpath, const char *newpath);
+int xmkdir(const char *pathname, mode_t mode);
+int xmkdirs(const char *pathname, mode_t mode);
+int xmkdirat(int dirfd, const char *pathname, mode_t mode);
+void *xmmap(void *addr, size_t length, int prot, int flags,
+	int fd, off_t offset);
+ssize_t xsendfile(int out_fd, int in_fd, off_t *offset, size_t count);
+pid_t xfork();
+
+// misc.c
+
+#define quit_signals ((int []) { SIGALRM, SIGABRT, SIGHUP, SIGPIPE, SIGQUIT, SIGTERM, SIGINT, 0 })
+
+unsigned get_shell_uid();
+unsigned get_system_uid();
+unsigned get_radio_uid();
+int check_data();
+int file_to_vector(const char* filename, struct vector *v);
+int vector_to_file(const char* filename, struct vector *v);
+ssize_t fdgets(char *buf, size_t size, int fd);
+void ps(void (*func)(int));
+int check_proc_name(int pid, const char *filter);
+void unlock_blocks();
+void setup_sighandlers(void (*handler)(int));
+int exec_array(int err, int *fd, void (*setenv)(struct vector *), char *const *argv);
+int exec_command(int err, int *fd, void (*setenv)(struct vector*), const char *argv0, ...);
+int exec_command_sync(char *const argv0, ...);
+int bind_mount(const char *from, const char *to);
+void get_client_cred(int fd, struct ucred *cred);
+int switch_mnt_ns(int pid);
+int fork_dont_care();
+void wait_till_exists(const char *target);
+void gen_rand_str(char *buf, int len);
+int strend(const char *s1, const char *s2);
+
+#define getline __getline
+#define getdelim __getdelim
+#define fsetxattr __fsetxattr
+
+ssize_t __getline(char **lineptr, size_t *n, FILE *stream);
+ssize_t __getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
+int __fsetxattr(int fd, const char *name, const void *value, size_t size, int flags);
+
+// file.c
+
+#define align(p, a)     (((p) + (a) - 1) / (a) * (a))
+#define align_off(p, a) (align(p, a) - (p))
+
+extern char **excl_list;
+
+struct file_attr {
+	struct stat st;
+	char con[128];
+};
+
+int fd_getpath(int fd, char *path, size_t size);
+int fd_getpathat(int dirfd, const char *name, char *path, size_t size);
+int mkdirs(const char *pathname, mode_t mode);
+void in_order_walk(int dirfd, void (*callback)(int, struct dirent*));
+void rm_rf(const char *path);
+void frm_rf(int dirfd);
+void mv_f(const char *source, const char *destination);
+void mv_dir(int src, int dest);
+void cp_afc(const char *source, const char *destination);
+void link_dir(int src, int dest);
+void clone_dir(int src, int dest);
+int getattr(const char *path, struct file_attr *a);
+int getattrat(int dirfd, const char *pathname, struct file_attr *a);
+int fgetattr(int fd, struct file_attr *a);
+int setattr(const char *path, struct file_attr *a);
+int setattrat(int dirfd, const char *pathname, struct file_attr *a);
+int fsetattr(int fd, struct file_attr *a);
+void fclone_attr(const int sourcefd, const int targetfd);
+void clone_attr(const char *source, const char *target);
+
+void mmap_ro(const char *filename, void **buf, size_t *size);
+void mmap_rw(const char *filename, void **buf, size_t *size);
+void fd_full_read(int fd, void **buf, size_t *size);
+void full_read(const char *filename, void **buf, size_t *size);
+void full_read_at(int dirfd, 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);
+
+#endif

native/jni/utils/include/vector.h

@@ -0,0 +1,38 @@
+/* vector.h - A simple vector implementation in c
+ */
+
+#ifndef _VECTOR_H_
+#define _VECTOR_H_
+
+#include <sys/types.h>
+
+struct vector {
+	unsigned size;
+	unsigned cap;
+	void **data;
+};
+
+void vec_init(struct vector *v);
+void vec_push_back(struct vector *v, void *p);
+void vec_push_back_all(struct vector *v, void *p, ...);
+void *vec_pop_back(struct vector *v);
+void vec_sort(struct vector *v, int (*compar)(const void *, const void *));
+void vec_destroy(struct vector *v);
+void vec_deep_destroy(struct vector *v);
+void vec_dup(struct vector *v, struct vector *vv);
+
+#define vec_size(v) (v)->size
+#define vec_cap(v) (v)->cap
+#define vec_entry(v) (v)->data
+/* Usage: vec_for_each(vector *v, void *e) */
+#define vec_for_each(v, e) \
+	e = v ? (v)->data[0] : NULL; \
+	for (int _ = 0; v && _ < (v)->size; ++_, e = (v)->data[_])
+
+#define vec_for_each_r(v, e) \
+	e = (v && (v)->size > 0) ? (v)->data[(v)->size - 1] : NULL; \
+	for (int _ = ((int) (v)->size) - 1; v && _ >= 0; --_, e = (v)->data[_])
+
+#define vec_cur(v) vec_entry(v)[_]
+
+#endif