~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure SIGINT and SIGQUIT haven't been nobbled in our child
[sgt/putty]
/
raw.c
diff --git
a/raw.c
b/raw.c
index
e3fcbc0
..
20732dd
100644
(file)
--- a/
raw.c
+++ b/
raw.c
@@
-33,7
+33,8
@@
static int raw_closing(Plug plug, char *error_msg, int error_code,
}
if (error_msg) {
/* A socket error has occurred. */
}
if (error_msg) {
/* A socket error has occurred. */
- connection_fatal(error_msg);
+ logevent(error_msg);
+ connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
@@
-92,7
+93,7
@@
static char *raw_init(char *host, int port, char **realhost, int nodelay)
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
logevent(buf);
}
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
logevent(buf);
}
- s =
sk_new(addr
, port, 0, 1, nodelay, &fn_table_ptr);
+ s =
new_connection(addr, *realhost
, port, 0, 1, nodelay, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
if ((err = sk_socket_error(s)))
return err;
@@
-162,6
+163,12
@@
static int raw_ldisc(int option)
return 0;
}
return 0;
}
+static int raw_exitcode(void)
+{
+ /* Exit codes are a meaningless concept in the Raw protocol */
+ return 0;
+}
+
Backend raw_backend = {
raw_init,
raw_send,
Backend raw_backend = {
raw_init,
raw_send,
@@
-169,6
+176,7
@@
Backend raw_backend = {
raw_size,
raw_special,
raw_socket,
raw_size,
raw_special,
raw_socket,
+ raw_exitcode,
raw_sendok,
raw_ldisc,
raw_unthrottle,
raw_sendok,
raw_ldisc,
raw_unthrottle,