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_amain.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_amain.c')
| -rw-r--r-- | src/driver/slbt_amain.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/driver/slbt_amain.c b/src/driver/slbt_amain.c index 0e6456e..78a0973 100644 --- a/src/driver/slbt_amain.c +++ b/src/driver/slbt_amain.c @@ -5,9 +5,11 @@ /*******************************************************************/ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <errno.h> +#include <stdbool.h> #include <slibtool/slibtool.h> #include "slibtool_driver_impl.h" #include "slibtool_dprintf_impl.h" @@ -43,6 +45,9 @@ static ssize_t slbt_version(struct slbt_driver_ctx * dctx, int fdout) verclr = isatty(fdout) ? slbt_ver_color : slbt_ver_plain; gitver = strcmp(verinfo->commit,"unknown"); + if (dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER) + verclr = slbt_ver_plain; + return slbt_dprintf(fdout,vermsg, verclr[0],dctx->program,verclr[1], verclr[2],verinfo->major,verinfo->minor, @@ -89,6 +94,7 @@ int slbt_main(char ** argv, char ** envp, const struct slbt_fd_ctx * fdctx) const char * harg; int fdout; uint64_t flags; + uint64_t noclr; struct slbt_driver_ctx * dctx; char * program; char * dash; @@ -96,6 +102,7 @@ int slbt_main(char ** argv, char ** envp, const struct slbt_fd_ctx * fdctx) flags = SLBT_DRIVER_FLAGS; fdout = fdctx ? fdctx->fdout : STDOUT_FILENO; + noclr = getenv("NO_COLOR") ? SLBT_DRIVER_ANNOTATE_NEVER : 0; /* harg */ harg = (!argv || !argv[0] || !argv[1] || argv[2]) @@ -112,7 +119,7 @@ int slbt_main(char ** argv, char ** envp, const struct slbt_fd_ctx * fdctx) sargv[3] = "<compiler>"; sargv[4] = 0; - return (slbt_get_driver_ctx(sargv,envp,flags,fdctx,&dctx)) + return (slbt_get_driver_ctx(sargv,envp,flags|noclr,fdctx,&dctx)) ? SLBT_ERROR : (slbt_version(dctx,fdout) < 0) ? slbt_exit(dctx,SLBT_ERROR) : slbt_exit(dctx,SLBT_OK); @@ -175,7 +182,7 @@ int slbt_main(char ** argv, char ** envp, const struct slbt_fd_ctx * fdctx) | SLBT_DRIVER_LEGABITS); /* driver context */ - if ((ret = slbt_get_driver_ctx(argv,envp,flags,fdctx,&dctx))) + if ((ret = slbt_get_driver_ctx(argv,envp,flags|noclr,fdctx,&dctx))) return (ret == SLBT_USAGE) ? !argv || !argv[0] || !argv[1] || !argv[2] : SLBT_ERROR; |