turn recovery into a C++ binary (10e418d3) · Commits · e / tools / etwrp

Android.mk

+7 −7

Original line number	Diff line number	Diff line
		@@ -4,12 +4,12 @@ include $(CLEAR_VARS)
		commands_recovery_local_path := $(LOCAL_PATH)

		LOCAL_SRC_FILES := \
		recovery.c \
		bootloader.c \
		install.c \
		roots.c \
		ui.c \
		verifier.c
		recovery.cpp \
		bootloader.cpp \
		install.cpp \
		roots.cpp \
		ui.cpp \
		verifier.cpp

		LOCAL_MODULE := recovery

		@@ -50,7 +50,7 @@ include $(BUILD_EXECUTABLE)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := verifier_test.c verifier.c
		LOCAL_SRC_FILES := verifier_test.cpp verifier.cpp

		LOCAL_MODULE := verifier_test

bootloader.c→bootloader.cpp

+0 −0

File moved.

View file

bootloader.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,10 @@
		#ifndef _RECOVERY_BOOTLOADER_H
		#define _RECOVERY_BOOTLOADER_H

		#ifdef __cplusplus
		extern "C" {
		#endif

		/* Bootloader Message
		*
		* This structure describes the content of a block in flash
		@@ -47,4 +51,8 @@ struct bootloader_message {
		int get_bootloader_message(struct bootloader_message *out);
		int set_bootloader_message(const struct bootloader_message *in);

		#ifdef __cplusplus
		}
		#endif

		#endif

common.h

+10 −55

Original line number	Diff line number	Diff line
		@@ -19,61 +19,12 @@

		#include <stdio.h>

		// Initialize the graphics system.
		void ui_init();

		// Use KEY_* codes from <linux/input.h> or KEY_DREAM_* from "minui/minui.h".
		int ui_wait_key(); // waits for a key/button press, returns the code
		int ui_key_pressed(int key); // returns >0 if the code is currently pressed
		int ui_text_visible(); // returns >0 if text log is currently visible
		int ui_text_ever_visible(); // returns >0 if text log was ever visible
		void ui_show_text(int visible);
		void ui_clear_key_queue();

		// Write a message to the on-screen log shown with Alt-L (also to stderr).
		// The screen is small, and users may need to report these messages to support,
		// so keep the output short and not too cryptic.
		void ui_print(const char *fmt, ...) __attribute__((format(printf, 1, 2)));

		// Display some header text followed by a menu of items, which appears
		// at the top of the screen (in place of any scrolling ui_print()
		// output, if necessary).
		void ui_start_menu(char headers, char items, int initial_selection);
		// Set the menu highlight to the given index, and return it (capped to
		// the range [0..numitems).
		int ui_menu_select(int sel);
		// End menu mode, resetting the text overlay so that ui_print()
		// statements will be displayed.
		void ui_end_menu();

		// Set the icon (normally the only thing visible besides the progress bar).
		enum {
		BACKGROUND_ICON_NONE,
		BACKGROUND_ICON_INSTALLING,
		BACKGROUND_ICON_ERROR,
		NUM_BACKGROUND_ICONS
		};
		void ui_set_background(int icon);

		// Show a progress bar and define the scope of the next operation:
		// portion - fraction of the progress bar the next operation will use
		// seconds - expected time interval (progress bar moves at this minimum rate)
		void ui_show_progress(float portion, int seconds);
		void ui_set_progress(float fraction); // 0.0 - 1.0 within the defined scope

		// Default allocation of progress bar segments to operations
		static const int VERIFICATION_PROGRESS_TIME = 60;
		static const float VERIFICATION_PROGRESS_FRACTION = 0.25;
		static const float DEFAULT_FILES_PROGRESS_FRACTION = 0.4;
		static const float DEFAULT_IMAGE_PROGRESS_FRACTION = 0.1;

		// Show a rotating "barberpole" for ongoing operations. Updates automatically.
		void ui_show_indeterminate_progress();

		// Hide and reset the progress bar.
		void ui_reset_progress();

		#define LOGE(...) ui_print("E:" __VA_ARGS__)
		#ifdef __cplusplus
		extern "C" {
		#endif

		// TODO: restore ui_print for LOGE
		#define LOGE(...) fprintf(stdout, "E:" __VA_ARGS__)
		#define LOGW(...) fprintf(stdout, "W:" __VA_ARGS__)
		#define LOGI(...) fprintf(stdout, "I:" __VA_ARGS__)

		@@ -129,4 +80,8 @@ typedef struct {
		// fopen a file, mounting volumes and making parent dirs as necessary.
		FILE* fopen_path(const char path, const char mode);

		#ifdef __cplusplus
		}
		#endif

		#endif // RECOVERY_COMMON_H

install.c→install.cpp

+33 −29

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include "mtdutils/mtdutils.h"
		#include "roots.h"
		#include "verifier.h"
		#include "ui.h"

		#define ASSUMED_UPDATE_BINARY_NAME "META-INF/com/google/android/update-binary"
		#define PUBLIC_KEYS_FILE "/res/keys"
		@@ -46,7 +47,7 @@ try_update_binary(const char path, ZipArchive zip, int* wipe_cache) {
		return INSTALL_CORRUPT;
		}

		char* binary = "/tmp/update_binary";
		const char* binary = "/tmp/update_binary";
		unlink(binary);
		int fd = creat(binary, 0755);
		if (fd < 0) {
		@@ -100,18 +101,19 @@ try_update_binary(const char path, ZipArchive zip, int* wipe_cache) {
		// - the name of the package zip file.
		//

		char** args = malloc(sizeof(char) 5);
		const char args = (const char)malloc(sizeof(char) 5);
		args[0] = binary;
		args[1] = EXPAND(RECOVERY_API_VERSION); // defined in Android.mk
		args[2] = malloc(10);
		sprintf(args[2], "%d", pipefd[1]);
		char* temp = (char*)malloc(10);
		sprintf(temp, "%d", pipefd[1]);
		args[2] = temp;
		args[3] = (char*)path;
		args[4] = NULL;

		pid_t pid = fork();
		if (pid == 0) {
		close(pipefd[0]);
		execv(binary, args);
		execv(binary, (char* const*)args);
		fprintf(stdout, "E:Can't run %s (%s)\n", binary, strerror(errno));
		_exit(-1);
		}
		@@ -188,11 +190,12 @@ load_keys(const char* filename, int* numKeys) {
		goto exit;
		}

		{
		int i;
		bool done = false;
		while (!done) {
		++*numKeys;
		out = realloc(out, numKeys sizeof(RSAPublicKey));
		out = (RSAPublicKey)realloc(out, numKeys * sizeof(RSAPublicKey));
		RSAPublicKey* key = out + (*numKeys - 1);
		if (fscanf(f, " { %i , 0x%x , { %u",
		&(key->len), &(key->n0inv), &(key->n[0])) != 3) {
		@@ -226,6 +229,7 @@ load_keys(const char* filename, int* numKeys) {
		goto exit;
		}
		}
		}

		fclose(f);
		return out;