diff options
| author | midipix <writeonce@midipix.org> | 2021-04-03 20:07:59 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-04-03 20:12:42 +0000 |
| commit | d4c3e3af3e27781da414714e63ef52c9c711e1b6 (patch) | |
| tree | 6c2cb063231de6fe0dddef535b801b672de62cfa /src/driver/slbt_driver_ctx.c | |
| parent | 0a81a1d1581dc298ac913e6e706a3ded57b77da9 (diff) | |
| download | slibtool-d4c3e3af3e27781da414714e63ef52c9c711e1b6.tar.bz2 slibtool-d4c3e3af3e27781da414714e63ef52c9c711e1b6.tar.xz | |
driver: always respect the NO_COLOR envvar & SLBT_DRIVER_ANNOTATE_NEVER flag.
Diffstat (limited to 'src/driver/slbt_driver_ctx.c')
| -rw-r--r-- | src/driver/slbt_driver_ctx.c | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index 7e170d2..7ce2c92 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -122,16 +122,15 @@ struct slbt_driver_ctx_alloc { uint64_t guard; }; -static void slbt_output_raw_vector(int fderr, char ** argv, char ** envp) +static void slbt_output_raw_vector(int fderr, char ** argv, char ** envp, bool fcolor) { char ** parg; char * dot; const char * color; - bool fcolor; (void)envp; - if ((fcolor = isatty(fderr))) + if (fcolor) slbt_dprintf(fderr,"%s%s",aclr_bold,aclr_red); slbt_dprintf(fderr,"\n\n\n%s",argv[0]); @@ -192,7 +191,8 @@ static int slbt_driver_usage( const char * arg, const struct argv_option ** optv, struct argv_meta * meta, - struct slbt_split_vector * sargv) + struct slbt_split_vector * sargv, + int noclr) { char header[512]; @@ -200,7 +200,16 @@ static int slbt_driver_usage( "Usage: %s [options] <file>...\n" "Options:\n", program); - argv_usage(fdout,header,optv,arg); + switch (noclr) { + case 0: + argv_usage(fdout,header,optv,arg); + break; + + default: + argv_usage_plain(fdout,header,optv,arg); + break; + } + argv_free(meta); slbt_free_argv_buffer(sargv); @@ -296,7 +305,8 @@ static int slbt_split_argv( if (!argv[1] && (flags & SLBT_DRIVER_VERBOSITY_USAGE)) return slbt_driver_usage( fderr,program, - 0,optv,0,sargv); + 0,optv,0,sargv, + !!getenv("NO_COLOR")); /* initial argv scan: ... --mode=xxx ... <compiler> ... */ argv_scan(argv,optv,&ctx,0); @@ -1244,8 +1254,11 @@ static int slbt_driver_fail_incompatible_args( { int fcolor; + fcolor = (drvflags & SLBT_DRIVER_ANNOTATE_NEVER) + ? 0 : isatty(fderr); + if (drvflags & SLBT_DRIVER_VERBOSITY_ERRORS){ - if ((fcolor = isatty(fderr))) + if (fcolor) slbt_dprintf( fderr,"%s%s", aclr_bold,aclr_red); @@ -1314,7 +1327,8 @@ int slbt_get_driver_ctx( cctx.drvflags = flags | SLBT_DRIVER_SHARED | SLBT_DRIVER_STATIC; /* full annotation when annotation is on; */ - cctx.drvflags |= SLBT_DRIVER_ANNOTATE_FULL; + if (!(cctx.drvflags & SLBT_DRIVER_ANNOTATE_NEVER)) + cctx.drvflags |= SLBT_DRIVER_ANNOTATE_FULL; /* track incompatible command-line arguments */ cmdstatic = 0; @@ -1332,7 +1346,8 @@ int slbt_get_driver_ctx( ? slbt_driver_usage( fdctx->fdout,program, entry->arg,optv, - meta,&sargv) + meta,&sargv, + (cctx.drvflags & SLBT_DRIVER_ANNOTATE_NEVER)) : SLBT_USAGE; case TAG_VERSION: @@ -1661,7 +1676,10 @@ int slbt_get_driver_ctx( /* debug: raw argument vector */ if (cctx.drvflags & SLBT_DRIVER_DEBUG) - slbt_output_raw_vector(fdctx->fderr,argv,envp); + slbt_output_raw_vector( + fdctx->fderr,argv,envp, + (cctx.drvflags & SLBT_DRIVER_ANNOTATE_NEVER) + ? 0 : isatty(fdctx->fderr)); /* -o in install mode means USER */ if ((cctx.mode == SLBT_MODE_INSTALL) && cctx.output) { |