emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As ecolor does not take a tty, try and guess a valid one.

Browse Source
This commit is contained in:
Roy Marples 2007-12-03 16:16:08 +00:00
parent 82f7dae3e8
commit 52b6cd1c9b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libeinfo.c
View File

@ -286,7 +286,7 @@ static const char *_ecolor (FILE *f, einfo_color_t color)
if (! colour_terminal (f)) if (! colour_terminal (f))
return (""); return ("");
switch (color) { switch (color) {
case ECOLOR_GOOD: case ECOLOR_GOOD:
if (! (col = getenv ("ECOLOR_GOOD"))) if (! (col = getenv ("ECOLOR_GOOD")))
@ -319,7 +319,19 @@ hidden_def(ecolor)
const char *ecolor (einfo_color_t color) const char *ecolor (einfo_color_t color)
{ {
return (_ecolor (stdout, color)); FILE *f = stdout;
/* Try and guess a valid tty */
if (! isatty (fileno (f))) {
f = stderr;
if (! isatty (fileno (f))) {
f = stdin;
if (! isatty (fileno (f)))
f = NULL;
}
}
return (_ecolor (f, color));
} }
#define EINFOVN(_file, _color) \ #define EINFOVN(_file, _color) \