diff options
| author | midipix <writeonce@midipix.org> | 2016-10-25 21:12:31 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-11-11 00:22:51 -0500 |
| commit | 7d3ce75856fd7adc7cd6a23f9ea39858a59bb6a2 (patch) | |
| tree | f232049dbecbfd1cc59406b1cb8b062224f9c2ff /src | |
| parent | f72b5d8dd5779375a7c32f5148f67f69700984b9 (diff) | |
| download | mdso-7d3ce75856fd7adc7cd6a23f9ea39858a59bb6a2.tar.bz2 mdso-7d3ce75856fd7adc7cd6a23f9ea39858a59bb6a2.tar.xz | |
output: msdo_output_error_record(): output unit information.
Diffstat (limited to 'src')
| -rw-r--r-- | src/output/mdso_output_error.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/src/output/mdso_output_error.c b/src/output/mdso_output_error.c index 243a64e..b2f7676 100644 --- a/src/output/mdso_output_error.c +++ b/src/output/mdso_output_error.c @@ -13,6 +13,7 @@ static const char aclr_reset[] = "\x1b[0m"; static const char aclr_bold[] = "\x1b[1m"; +static const char aclr_red[] = "\x1b[31m"; static const char aclr_green[] = "\x1b[32m"; static const char aclr_blue[] = "\x1b[34m"; static const char aclr_magenta[] = "\x1b[35m"; @@ -42,6 +43,18 @@ static const char * mdso_output_error_header(const struct mdso_error_info * erri return "distorted state"; } +static const char * mdso_output_unit_header(const struct mdso_error_info * erri) +{ + if (!(erri->eflags & MDSO_ERROR_CUSTOM)) + return "while opening"; + + else if (erri->elibcode == MDSO_ERR_SOURCE_SIZE_ZERO) + return "while mapping"; + + else + return "while parsing"; +} + static const char * mdso_output_strerror(const struct mdso_error_info * erri) { if (erri->eflags & MDSO_ERROR_CUSTOM) @@ -66,8 +79,20 @@ static int mdso_output_error_record_plain( const struct mdso_driver_ctx * dctx, const struct mdso_error_info * erri) { + const char * epath; const char * errdesc = mdso_output_strerror(erri); + epath = erri->euctx + ? *erri->euctx->path + : erri->eunit; + + if (epath && !(erri->eflags & MDSO_ERROR_NESTED)) + if (fprintf(stderr,"%s: [%s] '%s':\n", + dctx->program, + mdso_output_unit_header(erri), + epath) < 0) + return -1; + if (fprintf(stderr,"%s: %s %s(), line %d%s%s.\n", dctx->program, mdso_output_error_header(erri), @@ -84,8 +109,31 @@ static int mdso_output_error_record_annotated( const struct mdso_driver_ctx * dctx, const struct mdso_error_info * erri) { + const char * epath; const char * errdesc = mdso_output_strerror(erri); + epath = erri->euctx + ? *erri->euctx->path + : erri->eunit; + + if (epath && !(erri->eflags & MDSO_ERROR_NESTED)) + if (fprintf( + stderr, + "%s%s%s:%s %s[%s]%s %s%s'%s'%s:\n", + + aclr_bold,aclr_magenta, + dctx->program, + aclr_reset, + + aclr_bold, + mdso_output_unit_header(erri), + aclr_reset, + + aclr_bold,aclr_red, + epath, + aclr_reset) < 0) + return -1; + if (fprintf( stderr, "%s%s%s:%s %s%s%s %s%s%s()%s, %s%sline %d%s%s%s%s%s.\n", |