void *logctx;
+static struct termios orig_termios;
+
void fatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
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;
}
void modalfatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
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;
}
void connection_fatal(void *frontend, char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
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;
}
void cmdline_error(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
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 = 0; /* do we have a local tty? */
-static struct termios orig_termios;
+static int local_tty = FALSE; /* do we have a local tty? */
static Backend *back;
static void *backhandle;
{
if (!strcmp(name, "TermType"))
return dupstr(getenv("TERM"));
- if (!strcmp(name, "UserName"))
- return get_username();
+ if (!strcmp(name, "UserName"))
+ return get_username();
if (!strcmp(name, "SerialLine"))
return dupstr("/dev/ttyS0");
return NULL;
if (!strcmp(name, "TermWidth") ||
!strcmp(name, "TermHeight")) {
struct winsize size;
- if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, (void *)&size) >= 0)
return (!strcmp(name, "TermWidth") ? size.ws_col : size.ws_row);
}
return def;
*/
mode.c_iflag = (mode.c_iflag | INPCK | PARMRK) & ~IGNPAR;
- tcsetattr(0, TCSANOW, &mode);
+ tcsetattr(STDIN_FILENO, TCSANOW, &mode);
}
/* Helper function to extract a special character from a termios. */
void cleanup_termios(void)
{
if (local_tty)
- tcsetattr(0, TCSANOW, &orig_termios);
+ tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
}
bufchain stdout_data, stderr_data;
-void try_output(int is_stderr)
+int try_output(int is_stderr)
{
bufchain *chain = (is_stderr ? &stderr_data : &stdout_data);
- int fd = (is_stderr ? 2 : 1);
+ 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);
- ret = write(fd, senddata, sendlen);
- if (ret > 0)
- bufchain_consume(chain, ret);
- else if (ret < 0 && errno != EWOULDBLOCK) {
+ return bufchain_size(&stdout_data) + bufchain_size(&stderr_data);
+
+ fl = fcntl(fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl | O_NONBLOCK);
+ do {
+ bufchain_prefix(chain, &senddata, &sendlen);
+ ret = write(fd, senddata, sendlen);
+ if (ret > 0)
+ bufchain_consume(chain, ret);
+ } while (ret == sendlen && bufchain_size(chain) != 0);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl);
+ if (ret < 0 && errno != EAGAIN) {
perror(is_stderr ? "stderr: write" : "stdout: write");
exit(1);
}
+ return bufchain_size(&stdout_data) + bufchain_size(&stderr_data);
}
int from_backend(void *frontend_handle, int is_stderr,
const char *data, int len)
{
- int osize, esize;
-
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
- try_output(1);
+ return try_output(TRUE);
} else {
bufchain_add(&stdout_data, data, len);
- try_output(0);
+ return try_output(FALSE);
}
-
- osize = bufchain_size(&stdout_data);
- esize = bufchain_size(&stderr_data);
-
- return osize + esize;
}
int from_backend_untrusted(void *frontend_handle, const char *data, int len)
default_protocol = PROT_SSH;
default_port = 22;
- flags = FLAG_STDERR;
+ flags = FLAG_STDERR | FLAG_STDERR_TTY;
+
+ stderr_tty_init();
/*
* Process the command line.
*/
uxsel_init();
/*
+ * Unix Plink doesn't provide any way to add forwardings after the
+ * connection is set up, so if there are none now, we can safely set
+ * the "simple" flag.
+ */
+ if (cfg.protocol == PROT_SSH && !cfg.x11_forward && !cfg.agentfwd &&
+ cfg.portfwd[0] == '\0' && cfg.portfwd[1] == '\0')
+ cfg.ssh_simple = TRUE;
+ /*
* Start up the connection.
*/
logctx = log_init(NULL, &cfg);
* fails, because we know we aren't necessarily running in a
* console.
*/
- local_tty = (tcgetattr(0, &orig_termios) == 0);
+ local_tty = (tcgetattr(STDIN_FILENO, &orig_termios) == 0);
atexit(cleanup_termios);
ldisc_update(NULL, 1, 1);
-
- {
- int fl;
- /*
- * Make sure that stdout/err are non-blocking.
- */
- if ((fl = fcntl(1, F_GETFL)) == -1 ||
- fcntl(1, F_SETFL, fl | O_NONBLOCK) == -1) {
- perror("stdout");
- exit(1);
- }
- if ((fl = fcntl(2, F_GETFL)) == -1 ||
- fcntl(2, F_SETFL, fl | O_NONBLOCK) == -1) {
- perror("stderr");
- exit(1);
- }
- }
sending = FALSE;
now = GETTICKCOUNT();
back->sendok(backhandle) &&
back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
/* If we're OK to send, then try to read from stdin. */
- FD_SET_MAX(0, maxfd, rset);
+ FD_SET_MAX(STDIN_FILENO, maxfd, rset);
}
if (bufchain_size(&stdout_data) > 0) {
/* If we have data for stdout, try to write to stdout. */
- FD_SET_MAX(1, maxfd, wset);
+ FD_SET_MAX(STDOUT_FILENO, maxfd, wset);
}
if (bufchain_size(&stderr_data) > 0) {
/* If we have data for stderr, try to write to stderr. */
- FD_SET_MAX(2, maxfd, wset);
+ FD_SET_MAX(STDERR_FILENO, maxfd, wset);
}
/* Count the currently active fds. */
back->size(backhandle, size.ws_col, size.ws_row);
}
- if (FD_ISSET(0, &rset)) {
+ if (FD_ISSET(STDIN_FILENO, &rset)) {
char buf[4096];
int ret;
if (connopen && back->connected(backhandle)) {
- ret = read(0, buf, sizeof(buf));
+ ret = read(STDIN_FILENO, buf, sizeof(buf));
if (ret < 0) {
perror("stdin: read");
exit(1);
}
}
- if (FD_ISSET(1, &wset)) {
- try_output(0);
+ if (FD_ISSET(STDOUT_FILENO, &wset)) {
+ back->unthrottle(backhandle, try_output(FALSE));
}
- if (FD_ISSET(2, &wset)) {
- try_output(1);
+ if (FD_ISSET(STDERR_FILENO, &wset)) {
+ back->unthrottle(backhandle, try_output(TRUE));
}
if ((!connopen || !back->connected(backhandle)) &&
projects / u / mdw / putty / blobdiff