diff options
Diffstat (limited to 'src/conversation.c')
| -rw-r--r-- | src/conversation.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/conversation.c b/src/conversation.c index 53943b14a..620bb5caf 100644 --- a/src/conversation.c +++ b/src/conversation.c @@ -91,11 +91,16 @@ sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[], const char *crnl = NULL; bool written = false; int ttyfd = -1; + bool raw_tty = false; if (ISSET(msg->msg_type, SUDO_CONV_PREFER_TTY) && - !ISSET(tgetpass_flags, TGP_STDIN)) + !ISSET(tgetpass_flags, TGP_STDIN)) { ttyfd = open(_PATH_TTY, O_WRONLY); - if (len != 0 && (ttyfd != -1 || isatty(fileno(fp)))) { + raw_tty = sudo_term_is_raw(ttyfd); + } else { + raw_tty = sudo_term_is_raw(fileno(fp)); + } + if (len != 0 && raw_tty) { /* Convert nl -> cr nl in case tty is in raw mode. */ if (msg->msg[len - 1] == '\n') { if (len == 1 || msg->msg[len - 2] != '\r') { @@ -177,12 +182,14 @@ sudo_conversation_printf(int msg_type, const char *fmt, ...) case SUDO_CONV_INFO_MSG: /* Convert nl -> cr nl in case tty is in raw mode. */ len = strlen(fmt); - if (len < ssizeof(fmt2) && len > 0 && fmt[len - 1] == '\n') { - if (len == 1 || fmt[len - 2] != '\r') { - memcpy(fmt2, fmt, len - 1); - fmt2[len - 1] = '\0'; - fmt = fmt2; - crnl = "\r\n"; + if (sudo_term_is_raw(fileno(ttyfp ? ttyfp : fp))) { + if (len < ssizeof(fmt2) && len > 0 && fmt[len - 1] == '\n') { + if (len == 1 || fmt[len - 2] != '\r') { + memcpy(fmt2, fmt, len - 1); + fmt2[len - 1] = '\0'; + fmt = fmt2; + crnl = "\r\n"; + } } } va_start(ap, fmt); |