projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When writing session data to stdout or stderr, switch the relevant file
[u/mdw/putty]
/
unix
/
uxplink.c
diff --git
a/unix/uxplink.c
b/unix/uxplink.c
index
13369b1
..
9d5f001
100644
(file)
--- a/
unix/uxplink.c
+++ b/
unix/uxplink.c
@@
-27,14
+27,19
@@
void *logctx;
void *logctx;
+static struct termios orig_termios;
+
void fatalbox(char *p, ...)
{
void fatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
if (logctx) {
log_free(logctx);
logctx = NULL;
if (logctx) {
log_free(logctx);
logctx = NULL;
@@
-43,12
+48,15
@@
void fatalbox(char *p, ...)
}
void modalfatalbox(char *p, ...)
{
}
void modalfatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
if (logctx) {
log_free(logctx);
logctx = NULL;
if (logctx) {
log_free(logctx);
logctx = NULL;
@@
-57,12
+65,15
@@
void modalfatalbox(char *p, ...)
}
void connection_fatal(void *frontend, char *p, ...)
{
}
void connection_fatal(void *frontend, char *p, ...)
{
+ struct termios cf;
va_list ap;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
if (logctx) {
log_free(logctx);
logctx = NULL;
if (logctx) {
log_free(logctx);
logctx = NULL;
@@
-71,17
+82,19
@@
void connection_fatal(void *frontend, char *p, ...)
}
void cmdline_error(char *p, ...)
{
}
void cmdline_error(char *p, ...)
{
+ struct termios cf;
va_list ap;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "plink: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
fprintf(stderr, "plink: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
exit(1);
}
static int local_tty = FALSE; /* do we have a local tty? */
exit(1);
}
static int local_tty = FALSE; /* do we have a local tty? */
-static struct termios orig_termios;
static Backend *back;
static void *backhandle;
static Backend *back;
static void *backhandle;
@@
-376,16
+389,21
@@
void try_output(int is_stderr)
bufchain *chain = (is_stderr ? &stderr_data : &stdout_data);
int fd = (is_stderr ? STDERR_FILENO : STDOUT_FILENO);
void *senddata;
bufchain *chain = (is_stderr ? &stderr_data : &stdout_data);
int fd = (is_stderr ? STDERR_FILENO : STDOUT_FILENO);
void *senddata;
- int sendlen, ret;
+ int sendlen, ret
, fl
;
if (bufchain_size(chain) == 0)
return;
bufchain_prefix(chain, &senddata, &sendlen);
if (bufchain_size(chain) == 0)
return;
bufchain_prefix(chain, &senddata, &sendlen);
+ fl = fcntl(fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl | O_NONBLOCK);
ret = write(fd, senddata, sendlen);
ret = write(fd, senddata, sendlen);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl);
if (ret > 0)
bufchain_consume(chain, ret);
if (ret > 0)
bufchain_consume(chain, ret);
- else if (ret < 0) {
+ else if (ret < 0
&& errno != EAGAIN
) {
perror(is_stderr ? "stderr: write" : "stdout: write");
exit(1);
}
perror(is_stderr ? "stderr: write" : "stdout: write");
exit(1);
}
@@
-582,7
+600,9
@@
int main(int argc, char **argv)
default_protocol = PROT_SSH;
default_port = 22;
default_protocol = PROT_SSH;
default_port = 22;
- flags = FLAG_STDERR;
+ flags = FLAG_STDERR | FLAG_STDERR_TTY;
+
+ stderr_tty_init();
/*
* Process the command line.
*/
/*
* Process the command line.
*/