Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a7fd80d authored by Tao Bao's avatar Tao Bao
Browse files

recovery: Remove redirect_stdio() when calling ShowFile(). 

When calling ScreenRecoveryUI::ShowFile(), the only thing that gets
inadequately logged is the progress bar. Replace the call to
ScreenRecoveryUI::Print() with ScreenRecoveryUI::PrintOnScreenOnly() for
the progress bar, so we can avoid calling redirect_stdio().

Change-Id: I4d7c5d5b39bebe0d5880a99d7a72cee4f0b8f325
parent 7a677807

recovery.cpp

+0 −3
Original line number Diff line number Diff line
@@ -745,10 +745,7 @@ static void choose_recovery_file(Device* device) { 
        int chosen_item = get_menu_selection(headers, entries, 1, 0, device);

        if (strcmp(entries[chosen_item], "Back") == 0) break;



        // TODO: do we need to redirect? ShowFile could just avoid writing to stdio.

        redirect_stdio("/dev/null");

        ui->ShowFile(entries[chosen_item]);

        redirect_stdio(TEMPORARY_LOG_FILE);

    }



    for (size_t i = 0; i < (sizeof(entries) / sizeof(*entries)); i++) {

screen_ui.cpp

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) { 
    bool show_prompt = false;

    while (true) {

        if (show_prompt) {

            Print("--(%d%% of %d bytes)--",

            PrintOnScreenOnly("--(%d%% of %d bytes)--",

                  static_cast<int>(100 * (double(ftell(fp)) / double(sb.st_size))),

                  static_cast<int>(sb.st_size));

            Redraw();