isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only write a carriage return if output is to a tty.

Browse Source
This commit is contained in:
Todd C. Miller
2019-11-08 19:40:49 -07:00
parent b4878c95e7
commit f6a3dc6d27
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/util/fatal.c
View File

@@ -36,6 +36,7 @@
#else #else
# include "compat/stdbool.h" # include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */ #endif /* HAVE_STDBOOL_H */
#include <unistd.h>
#define DEFAULT_TEXT_DOMAIN "sudo" #define DEFAULT_TEXT_DOMAIN "sudo"
#include "sudo_gettext.h" /* must be included before sudo_compat.h */ #include "sudo_gettext.h" /* must be included before sudo_compat.h */
@@ -227,7 +228,7 @@ warning(const char *errstr, const char *fmt, va_list ap)
msgs[nmsgs++].msg = errstr; msgs[nmsgs++].msg = errstr;
} }
msgs[nmsgs].msg_type = SUDO_CONV_ERROR_MSG; msgs[nmsgs].msg_type = SUDO_CONV_ERROR_MSG;
msgs[nmsgs++].msg = "\r\n"; msgs[nmsgs++].msg = "\n";
sudo_warn_conversation(nmsgs, msgs, NULL, NULL); sudo_warn_conversation(nmsgs, msgs, NULL, NULL);
if (buf != static_buf) if (buf != static_buf)
free(buf); free(buf);
@@ -242,7 +243,9 @@ warning(const char *errstr, const char *fmt, va_list ap)
fputs(": ", stderr); fputs(": ", stderr);
fputs(errstr, stderr); fputs(errstr, stderr);
} }
fputs("\r\n", stderr); if (isatty(fileno(stderr)))
putc('\r', stderr);
putc('\n', stderr);
} }
/* Restore old locale as needed. */ /* Restore old locale as needed. */