From 5bb09b65871362f60b7facd6193638caeba31a49 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 21 Feb 2008 10:08:35 +0000 Subject: ewarn now goes to stderr to match portage behaviour. --- man/einfo.3 | 4 +++- src/libeinfo/libeinfo.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/man/einfo.3 b/man/einfo.3 index 631036a..07eb065 100644 --- a/man/einfo.3 +++ b/man/einfo.3 @@ -86,7 +86,9 @@ being green, .Fn ewarn being yellow and .Fn eerror -being red. The number of real characters printed is returned. +being red. +einfo goes to stdout and the others go to stderr. +The number of real characters printed is returned. .Fn ebegin is identical to .Fn einfo diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c index e141438..ee5b8a6 100644 --- a/src/libeinfo/libeinfo.c +++ b/src/libeinfo/libeinfo.c @@ -601,7 +601,7 @@ static int _ewarnvn (const char *__EINFO_RESTRICT fmt, va_list ap) { int retval = 0; - EINFOVN (stdout, ECOLOR_WARN); + EINFOVN (stderr, ECOLOR_WARN); return (retval); } @@ -694,7 +694,7 @@ int ewarn (const char *__EINFO_RESTRICT fmt, ...) va_start (ap, fmt); elogv (LOG_WARNING, fmt, ap); retval = _ewarnvn (fmt, ap); - retval += printf ("\n"); + retval += fprintf (stderr, "\n"); va_end (ap); LASTCMD ("ewarn"); @@ -713,7 +713,7 @@ void ewarnx (const char *__EINFO_RESTRICT fmt, ...) elogv (LOG_WARNING, fmt, ap); retval = _ewarnvn (fmt, ap); va_end (ap); - retval += printf ("\n"); + retval += fprintf (stderr, "\n"); } exit (EXIT_FAILURE); } @@ -818,14 +818,12 @@ static int _do_eend (const char *cmd, int retval, const char *__EINFO_RESTRICT f va_list apc; if (fmt && *fmt != '\0' && retval != 0) { + fp = stderr; va_copy (apc, ap); - if (strcmp (cmd, "ewend") == 0) { + if (strcmp (cmd, "ewend") == 0) col = _ewarnvn (fmt, apc); - fp = stdout; - } else { + else col = _eerrorvn (fmt, apc); - fp = stderr; - } col += fprintf (fp, "\n"); va_end (apc); } -- cgit v1.2.3