X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=config%2Fconf.c;h=cdbdb1129eeb3067b26451c0851d014d709a4ad2;hb=320cfce45cb7016f265df42c9512414fb8e5d1e1;hp=649ea82772335ebf8e159fc4bede8ef8cf8a39c4;hpb=bf9ab8c70df745eaf49ff47462a5eb1cd3bf1cc1;p=carl9170fw.git diff --git a/config/conf.c b/config/conf.c index 649ea82..cdbdb11 100644 --- a/config/conf.c +++ b/config/conf.c @@ -35,6 +35,7 @@ enum input_mode { } input_mode = oldaskconfig; static int indent = 1; +static int tty_stdio; static int valid_stdin = 1; static int conf_cnt; static char line[128]; @@ -105,6 +106,8 @@ static int conf_askvalue(struct symbol *sym, const char *def) case oldaskconfig: fflush(stdout); xfgets(line, 128, stdin); + if (!tty_stdio) + printf("\n"); return 1; default: break; @@ -482,6 +485,8 @@ int main(int ac, char **av) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + tty_stdio = isatty(0) && isatty(1) && isatty(2); + while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) { input_mode = (enum input_mode)opt; switch (opt) { @@ -583,7 +588,7 @@ int main(int ac, char **av) break; } - valid_stdin = isatty(0) && isatty(1) && isatty(2); + valid_stdin = tty_stdio; switch (input_mode) { case allnoconfig: