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

Commit f0136424 authored by Tao Bao's avatar Tao Bao
Browse files

Print with newline for ui_print. 

Currently the ui_print command between the recovery and updater doesn't
append newline. Updater has to send an extra "ui_print" command without
any argument to get the line break. This looks unnecessary. And not all
the callers (including the ones in bootable/recovery) are following this
protocol when sending the ui_print command.

This CL simplifies the protocol to always print with a newline for
ui_print command. When updating from an old recovery with the new
updater, all the ui_print'd strings would appear in one line as a side
effect. But a) it would only affect the text-mode UI, which won't be
shown to users; b) log files won't be affected.

Bug: 32305035
Test: Apply an update with the new updater on top of an old and new
      recovery image respectively.
Change-Id: I305a0ffc6f180daf60919cf99d24d1495d68749b
parent e78ca376

install.cpp

+1 −5
Original line number Diff line number Diff line
@@ -420,11 +420,7 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_ 
        LOG(ERROR) << "invalid \"set_progress\" parameters: " << line;

      }

    } else if (command == "ui_print") {

      if (!args.empty()) {

        ui->PrintOnScreenOnly("%s", args.c_str());

      } else {

        ui->PrintOnScreenOnly("\n");

      }

      ui->PrintOnScreenOnly("%s\n", args.c_str());

      fflush(stdout);

    } else if (command == "wipe_cache") {

      *wipe_cache = true;

updater/install.cpp

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static void uiPrint(State* state, const std::string& buffer) { 
  for (auto& line : lines) {

    if (!line.empty()) {

      fprintf(ui->cmd_pipe, "ui_print %s\n", line.c_str());

      fprintf(ui->cmd_pipe, "ui_print\n");

    }

  }

updater/updater.cpp

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ int main(int argc, char** argv) { 
        }

        fprintf(cmd_pipe, "ui_print %s\n", line.c_str());

      }

      fprintf(cmd_pipe, "ui_print\n");

    }



    if (state.error_code != kNoError) {