From 8584fcf677dd45b30121bd0490b06297e6be1871 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 27 Oct 2016 03:08:08 +0000 Subject: Revert "Some cleanups to recovery." This reverts commit c0319b60f56d445c2d1c74f551e01f069b028fe6. Reason for revert: Broke builds. Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972 --- common.h | 5 ++- install.cpp | 2 ++ install.h | 3 +- print_sha1.h | 4 +-- recovery.cpp | 110 +++++++++++++++++++++++++++++++---------------------------- roots.h | 2 +- verifier.cpp | 7 ++-- 7 files changed, 70 insertions(+), 63 deletions(-) diff --git a/common.h b/common.h index f10fe6735..a948fb1a0 100644 --- a/common.h +++ b/common.h @@ -17,16 +17,15 @@ #ifndef RECOVERY_COMMON_H #define RECOVERY_COMMON_H +#include #include #include #define STRINGIFY(x) #x #define EXPAND(x) STRINGIFY(x) -class RecoveryUI; - -extern RecoveryUI* ui; extern bool modified_flash; +typedef struct fstab_rec Volume; // fopen a file, mounting volumes and making parent dirs as necessary. FILE* fopen_path(const char *path, const char *mode); diff --git a/install.cpp b/install.cpp index 3871271f7..0f9088a7a 100644 --- a/install.cpp +++ b/install.cpp @@ -43,6 +43,8 @@ #include "ui.h" #include "verifier.h" +extern RecoveryUI* ui; + #define ASSUMED_UPDATE_BINARY_NAME "META-INF/com/google/android/update-binary" #define PUBLIC_KEYS_FILE "/res/keys" static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata"; diff --git a/install.h b/install.h index 1ec01e817..7f66a51ca 100644 --- a/install.h +++ b/install.h @@ -20,9 +20,10 @@ #include #include +#include "common.h" + enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE, INSTALL_SKIPPED, INSTALL_RETRY }; - // Install the package specified by root_path. If INSTALL_SUCCESS is // returned and *wipe_cache is true on exit, caller should wipe the // cache partition. diff --git a/print_sha1.h b/print_sha1.h index 1f8589519..c7c1f3651 100644 --- a/print_sha1.h +++ b/print_sha1.h @@ -20,7 +20,7 @@ #include #include -#include +#include "openssl/sha.h" static std::string print_sha1(const uint8_t* sha1, size_t len) { const char* hex = "0123456789abcdef"; @@ -41,7 +41,7 @@ static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_LENGTH]) { } static std::string print_hex(const uint8_t* bytes, size_t len) { - return print_sha1(bytes, len); + return print_sha1(bytes, len); } #endif // RECOVERY_PRINT_SHA1_H diff --git a/recovery.cpp b/recovery.cpp index 4079927e7..4d1ad1df2 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -69,6 +69,8 @@ #include "ui.h" #include "screen_ui.h" +struct selabel_handle *sehandle; + static const struct option OPTIONS[] = { { "update_package", required_argument, NULL, 'u' }, { "retry_count", required_argument, NULL, 'n' }, @@ -117,17 +119,14 @@ static const int BATTERY_READ_TIMEOUT_IN_SEC = 10; // So we should check battery with a slightly lower limitation. static const int BATTERY_OK_PERCENTAGE = 20; static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15; -static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe"; -static constexpr const char* DEFAULT_LOCALE = "en_US"; - -static std::string locale; -static const char* stage = nullptr; -static const char* reason = nullptr; -static bool has_cache = false; +constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe"; -RecoveryUI* ui = nullptr; +RecoveryUI* ui = NULL; +static const char* locale = "en_US"; +char* stage = NULL; +char* reason = NULL; bool modified_flash = false; -struct selabel_handle* sehandle; +static bool has_cache = false; /* * The recovery tool communicates with the main system through /cache files. @@ -207,9 +206,6 @@ FILE* fopen_path(const char *path, const char *mode) { // close a file, log an error if the error indicator is set static void check_and_fclose(FILE *fp, const char *name) { fflush(fp); - if (fsync(fileno(fp)) == -1) { - PLOG(ERROR) << "Failed to fsync " << name; - } if (ferror(fp)) { PLOG(ERROR) << "Error in " << name; } @@ -519,18 +515,24 @@ static void copy_logs() { // clear the recovery command and prepare to boot a (hopefully working) system, // copy our log file to cache as well (for the system to read). This function is // idempotent: call it as many times as you like. -static void finish_recovery() { +static void +finish_recovery() { // Save the locale to cache, so if recovery is next started up // without a --locale argument (eg, directly from the bootloader) // it will use the last-known locale. - if (!locale.empty() && has_cache) { - LOG(INFO) << "Saving locale \"" << locale << "\""; - - FILE* fp = fopen_path(LOCALE_FILE, "w"); - if (!android::base::WriteStringToFd(locale, fileno(fp))) { - PLOG(ERROR) << "Failed to save locale to " << LOCALE_FILE; + if (locale != NULL) { + size_t len = strlen(locale); + __pmsg_write(LOCALE_FILE, locale, len); + if (has_cache) { + LOG(INFO) << "Saving locale \"" << locale << "\""; + FILE* fp = fopen_path(LOCALE_FILE, "w"); + if (fp != NULL) { + fwrite(locale, 1, len, fp); + fflush(fp); + fsync(fileno(fp)); + check_and_fclose(fp, LOCALE_FILE); + } } - check_and_fclose(fp, LOCALE_FILE); } copy_logs(); @@ -1280,32 +1282,40 @@ print_property(const char *key, const char *name, void *cookie) { printf("%s=%s\n", key, name); } -static std::string load_locale_from_cache() { - if (ensure_path_mounted(LOCALE_FILE) != 0) { - LOG(ERROR) << "Can't mount " << LOCALE_FILE; - return ""; +static void +load_locale_from_cache() { + FILE* fp = fopen_path(LOCALE_FILE, "r"); + char buffer[80]; + if (fp != NULL) { + fgets(buffer, sizeof(buffer), fp); + int j = 0; + unsigned int i; + for (i = 0; i < sizeof(buffer) && buffer[i]; ++i) { + if (!isspace(buffer[i])) { + buffer[j++] = buffer[i]; + } + } + buffer[j] = 0; + locale = strdup(buffer); + check_and_fclose(fp, LOCALE_FILE); } +} - std::string content; - if (!android::base::ReadFileToString(LOCALE_FILE, &content)) { - PLOG(ERROR) << "Can't read " << LOCALE_FILE; - return ""; - } +static RecoveryUI* gCurrentUI = NULL; - return android::base::Trim(content); -} +void +ui_print(const char* format, ...) { + char buffer[256]; -void ui_print(const char* format, ...) { - std::string buffer; va_list ap; va_start(ap, format); - android::base::StringAppendV(&buffer, format, ap); + vsnprintf(buffer, sizeof(buffer), format, ap); va_end(ap); - if (ui != nullptr) { - ui->Print("%s", buffer.c_str()); + if (gCurrentUI != NULL) { + gCurrentUI->Print("%s", buffer); } else { - fputs(buffer.c_str(), stdout); + fputs(buffer, stdout); } } @@ -1314,8 +1324,8 @@ static constexpr char log_characters[] = "VDIWEF"; void UiLogger(android::base::LogId id, android::base::LogSeverity severity, const char* tag, const char* file, unsigned int line, const char* message) { - if (severity >= android::base::ERROR && ui != nullptr) { - ui->Print("E:%s\n", message); + if (severity >= android::base::ERROR && gCurrentUI != NULL) { + gCurrentUI->Print("E:%s\n", message); } else { fprintf(stdout, "%c:%s\n", log_characters[severity], message); } @@ -1411,7 +1421,7 @@ static void log_failure_code(ErrorCode code, const char *update_package) { }; std::string log_content = android::base::Join(log_buffer, "\n"); if (!android::base::WriteStringToFile(log_content, TEMPORARY_INSTALL_FILE)) { - PLOG(ERROR) << "failed to write " << TEMPORARY_INSTALL_FILE; + PLOG(ERROR) << "failed to write " << TEMPORARY_INSTALL_FILE; } // Also write the info into last_log. @@ -1563,24 +1573,18 @@ int main(int argc, char **argv) { } } - if (locale.empty()) { - if (has_cache) { - locale = load_locale_from_cache(); - } - - if (locale.empty()) { - locale = DEFAULT_LOCALE; - } + if (locale == nullptr && has_cache) { + load_locale_from_cache(); } - - printf("locale is [%s]\n", locale.c_str()); + printf("locale is [%s]\n", locale); printf("stage is [%s]\n", stage); printf("reason is [%s]\n", reason); Device* device = make_device(); ui = device->GetUI(); + gCurrentUI = ui; - ui->SetLocale(locale.c_str()); + ui->SetLocale(locale); ui->Init(); // Set background string to "installing security update" for security update, // otherwise set it to "installing system update". @@ -1595,7 +1599,7 @@ int main(int argc, char **argv) { if (show_text) ui->ShowText(true); struct selinux_opt seopts[] = { - { SELABEL_OPT_PATH, "/file_contexts" } + { SELABEL_OPT_PATH, "/file_contexts" } }; sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1); @@ -1767,7 +1771,7 @@ int main(int argc, char **argv) { break; } while (true) { - pause(); + pause(); } // Should be unreachable. return EXIT_SUCCESS; diff --git a/roots.h b/roots.h index 542f03b9c..a14b7d971 100644 --- a/roots.h +++ b/roots.h @@ -17,7 +17,7 @@ #ifndef RECOVERY_ROOTS_H_ #define RECOVERY_ROOTS_H_ -typedef struct fstab_rec Volume; +#include "common.h" // Load and parse volume data from /etc/recovery.fstab. void load_volume_table(); diff --git a/verifier.cpp b/verifier.cpp index 44098f70e..82cdd3bc7 100644 --- a/verifier.cpp +++ b/verifier.cpp @@ -14,11 +14,9 @@ * limitations under the License. */ -#include "verifier.h" - #include +#include #include -#include #include #include @@ -33,6 +31,9 @@ #include "common.h" #include "print_sha1.h" #include "ui.h" +#include "verifier.h" + +extern RecoveryUI* ui; static constexpr size_t MiB = 1024 * 1024; -- cgit v1.2.3