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

Commit fafc85b4 authored by Doug Zongker's avatar Doug Zongker
Browse files

recovery: move log output to stdout 

Recovery currently has a random mix of messages printed to stdout and
messages printed to stderr, which can make logs hard to read.  Move
everything to stdout.

Change-Id: Ie33bd4a9e1272e731302569cdec918e0534c48a6
parent 602c4ebd

edify/expr.c

+2 −2
Original line number Diff line number Diff line
@@ -287,13 +287,13 @@ Value* LessThanIntFn(const char* name, State* state, int argc, Expr* argv[]) { 


    long l_int = strtol(left, &end, 10);

    if (left[0] == '\0' || *end != '\0') {

        fprintf(stderr, "[%s] is not an int\n", left);

        printf("[%s] is not an int\n", left);

        goto done;

    }



    long r_int = strtol(right, &end, 10);

    if (right[0] == '\0' || *end != '\0') {

        fprintf(stderr, "[%s] is not an int\n", right);

        printf("[%s] is not an int\n", right);

        goto done;

    }

edify/main.c

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int expect(const char* expr_str, const char* expected, int* errors) { 
    int error_count = 0;

    error = yyparse(&e, &error_count);

    if (error > 0 || error_count > 0) {

        fprintf(stderr, "error parsing \"%s\" (%d errors)\n",

        printf("error parsing \"%s\" (%d errors)\n",

               expr_str, error_count);

        ++*errors;

        return 0;
@@ -49,7 +49,7 @@ int expect(const char* expr_str, const char* expected, int* errors) { 
    free(state.errmsg);

    free(state.script);

    if (result == NULL && expected != NULL) {

        fprintf(stderr, "error evaluating \"%s\"\n", expr_str);

        printf("error evaluating \"%s\"\n", expr_str);

        ++*errors;

        return 0;

    }
@@ -59,7 +59,7 @@ int expect(const char* expr_str, const char* expected, int* errors) { 
    }



    if (strcmp(result, expected) != 0) {

        fprintf(stderr, "evaluating \"%s\": expected \"%s\", got \"%s\"\n",

        printf("evaluating \"%s\": expected \"%s\", got \"%s\"\n",

               expr_str, expected, result);

        ++*errors;

        free(result);

install.cpp

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) { 
            } else {

                ui->Print("\n");

            }

            fflush(stdout);

        } else if (strcmp(command, "wipe_cache") == 0) {

            *wipe_cache = 1;

        } else if (strcmp(command, "clear_display") == 0) {

minui/graphics.c

+2 −2
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ int gr_init(void) 


    get_memory_surface(&gr_mem_surface);



    fprintf(stderr, "framebuffer: fd %d (%d x %d)\n",

    printf("framebuffer: fd %d (%d x %d)\n",

           gr_fb_fd, gr_framebuffer[0].width, gr_framebuffer[0].height);



        /* start with 0 as front (displayed) and 1 as back (drawing) */

mtdutils/mtdutils.c

+13 −13
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int read_block(const MtdPartition *partition, int fd, char *data) 
{

    struct mtd_ecc_stats before, after;

    if (ioctl(fd, ECCGETSTATS, &before)) {

        fprintf(stderr, "mtd: ECCGETSTATS error (%s)\n", strerror(errno));

        printf("mtd: ECCGETSTATS error (%s)\n", strerror(errno));

        return -1;

    }
@@ -300,13 +300,13 @@ static int read_block(const MtdPartition *partition, int fd, char *data) 


    while (pos + size <= (int) partition->size) {

        if (lseek64(fd, pos, SEEK_SET) != pos || read(fd, data, size) != size) {

            fprintf(stderr, "mtd: read error at 0x%08llx (%s)\n",

            printf("mtd: read error at 0x%08llx (%s)\n",

                    pos, strerror(errno));

        } else if (ioctl(fd, ECCGETSTATS, &after)) {

            fprintf(stderr, "mtd: ECCGETSTATS error (%s)\n", strerror(errno));

            printf("mtd: ECCGETSTATS error (%s)\n", strerror(errno));

            return -1;

        } else if (after.failed != before.failed) {

            fprintf(stderr, "mtd: ECC errors (%d soft, %d hard) at 0x%08llx\n",

            printf("mtd: ECC errors (%d soft, %d hard) at 0x%08llx\n",

                    after.corrected - before.corrected,

                    after.failed - before.failed, pos);

            // copy the comparison baseline for the next read.
@@ -431,39 +431,39 @@ static int write_block(MtdWriteContext *ctx, const char *data) 
        int retry;

        for (retry = 0; retry < 2; ++retry) {

            if (ioctl(fd, MEMERASE, &erase_info) < 0) {

                fprintf(stderr, "mtd: erase failure at 0x%08lx (%s)\n",

                printf("mtd: erase failure at 0x%08lx (%s)\n",

                        pos, strerror(errno));

                continue;

            }

            if (lseek(fd, pos, SEEK_SET) != pos ||

                write(fd, data, size) != size) {

                fprintf(stderr, "mtd: write error at 0x%08lx (%s)\n",

                printf("mtd: write error at 0x%08lx (%s)\n",

                        pos, strerror(errno));

            }



            char verify[size];

            if (lseek(fd, pos, SEEK_SET) != pos ||

                read(fd, verify, size) != size) {

                fprintf(stderr, "mtd: re-read error at 0x%08lx (%s)\n",

                printf("mtd: re-read error at 0x%08lx (%s)\n",

                        pos, strerror(errno));

                continue;

            }

            if (memcmp(data, verify, size) != 0) {

                fprintf(stderr, "mtd: verification error at 0x%08lx (%s)\n",

                printf("mtd: verification error at 0x%08lx (%s)\n",

                        pos, strerror(errno));

                continue;

            }



            if (retry > 0) {

                fprintf(stderr, "mtd: wrote block after %d retries\n", retry);

                printf("mtd: wrote block after %d retries\n", retry);

            }

            fprintf(stderr, "mtd: successfully wrote block at %lx\n", pos);

            printf("mtd: successfully wrote block at %lx\n", pos);

            return 0;  // Success!

        }



        // Try to erase it once more as we give up on this block

        add_bad_block_offset(ctx, pos);

        fprintf(stderr, "mtd: skipping write block at 0x%08lx\n", pos);

        printf("mtd: skipping write block at 0x%08lx\n", pos);

        ioctl(fd, MEMERASE, &erase_info);

        pos += partition->erase_size;

    }
@@ -526,7 +526,7 @@ off_t mtd_erase_blocks(MtdWriteContext *ctx, int blocks) 
    while (blocks-- > 0) {

        loff_t bpos = pos;

        if (ioctl(ctx->fd, MEMGETBADBLOCK, &bpos) > 0) {

            fprintf(stderr, "mtd: not erasing bad block at 0x%08lx\n", pos);

            printf("mtd: not erasing bad block at 0x%08lx\n", pos);

            pos += ctx->partition->erase_size;

            continue;  // Don't try to erase known factory-bad blocks.

        }
@@ -535,7 +535,7 @@ off_t mtd_erase_blocks(MtdWriteContext *ctx, int blocks) 
        erase_info.start = pos;

        erase_info.length = ctx->partition->erase_size;

        if (ioctl(ctx->fd, MEMERASE, &erase_info) < 0) {

            fprintf(stderr, "mtd: erase failure at 0x%08lx\n", pos);

            printf("mtd: erase failure at 0x%08lx\n", pos);

        }

        pos += ctx->partition->erase_size;

    }