chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort fixme for v11 todo list
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index c1ee936aaf97d7166d26bc9dcb863d5243f8abc2..0939ea9456bde70eaf193a65002ffe8d0665774c 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-602,7
+602,7
@@
int parse_env_file(
const char *fname,
const char *seperator, ...) {
const char *fname,
const char *seperator, ...) {
- int r;
+ int r
= 0
;
char *contents, *p;
assert(fname);
char *contents, *p;
assert(fname);
@@
-657,6
+657,8
@@
int parse_env_file(
*value = v;
p += n;
*value = v;
p += n;
+
+ r ++;
break;
}
va_end(ap);
break;
}
va_end(ap);
@@
-666,8
+668,6
@@
int parse_env_file(
p += strcspn(p, seperator);
}
p += strcspn(p, seperator);
}
- r = 0;
-
fail:
free(contents);
return r;
fail:
free(contents);
return r;
@@
-2009,23
+2009,29
@@
int read_one_char(FILE *f, char *ret, bool *need_nl) {
}
int ask(char *ret, const char *replies, const char *text, ...) {
}
int ask(char *ret, const char *replies, const char *text, ...) {
+ bool on_tty;
+
assert(ret);
assert(replies);
assert(text);
assert(ret);
assert(replies);
assert(text);
+ on_tty = isatty(STDOUT_FILENO);
+
for (;;) {
va_list ap;
char c;
int r;
bool need_nl = true;
for (;;) {
va_list ap;
char c;
int r;
bool need_nl = true;
- fputs("\x1B[1m", stdout);
+ if (on_tty)
+ fputs("\x1B[1m", stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
- fputs("\x1B[0m", stdout);
+ if (on_tty)
+ fputs("\x1B[0m", stdout);
fflush(stdout);
fflush(stdout);