chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e32303
)
tree-wide: check colors_enabled() before outputting ANSI color strings
author
Lennart Poettering
<lennart@poettering.net>
Mon, 30 May 2016 16:23:08 +0000
(18:23 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 16 Jun 2017 08:12:59 +0000
(10:12 +0200)
src/basic/terminal-util.c
patch
|
blob
|
history
diff --git
a/src/basic/terminal-util.c
b/src/basic/terminal-util.c
index 8f46c9267b1a091c1137199d81bf8692d5a88e9c..fa4f60826c9821b3f26f87ac2c6a355fde8ade02 100644
(file)
--- a/
src/basic/terminal-util.c
+++ b/
src/basic/terminal-util.c
@@
-156,14
+156,14
@@
int ask_char(char *ret, const char *replies, const char *text, ...) {
char c;
bool need_nl = true;
char c;
bool need_nl = true;
- if (
on_tty
())
+ if (
colors_enabled
())
fputs(ANSI_HIGHLIGHT, stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
fputs(ANSI_HIGHLIGHT, stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
- if (
on_tty
())
+ if (
colors_enabled
())
fputs(ANSI_NORMAL, stdout);
fflush(stdout);
fputs(ANSI_NORMAL, stdout);
fflush(stdout);
@@
-200,14
+200,14
@@
int ask_string(char **ret, const char *text, ...) {
char line[LINE_MAX];
va_list ap;
char line[LINE_MAX];
va_list ap;
- if (
on_tty
())
+ if (
colors_enabled
())
fputs(ANSI_HIGHLIGHT, stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
fputs(ANSI_HIGHLIGHT, stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
- if (
on_tty
())
+ if (
colors_enabled
())
fputs(ANSI_NORMAL, stdout);
fflush(stdout);
fputs(ANSI_NORMAL, stdout);
fflush(stdout);