~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make -ut work the right way round! :-)
[sgt/putty]
/
rlogin.c
diff --git
a/rlogin.c
b/rlogin.c
index
97699ae
..
2ef2d71
100644
(file)
--- a/
rlogin.c
+++ b/
rlogin.c
@@
-34,7
+34,8
@@
static int rlogin_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;
}
@@
-68,7
+69,8
@@
static int rlogin_receive(Plug plug, int urgent, char *data, int len)
}
firstbyte = 0;
}
}
firstbyte = 0;
}
- c_write(data, len);
+ if (len > 0)
+ c_write(data, len);
}
return 1;
}
}
return 1;
}
@@
-121,7
+123,7
@@
static char *rlogin_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, 1, 0, nodelay, &fn_table_ptr);
+ s =
new_connection(addr, *realhost
, port, 1, 0, nodelay, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
if ((err = sk_socket_error(s)))
return err;
@@
-217,6
+219,12
@@
static int rlogin_ldisc(int option)
return 0;
}
return 0;
}
+static int rlogin_exitcode(void)
+{
+ /* If we ever implement RSH, we'll probably need to do this properly */
+ return 0;
+}
+
Backend rlogin_backend = {
rlogin_init,
rlogin_send,
Backend rlogin_backend = {
rlogin_init,
rlogin_send,
@@
-224,6
+232,7
@@
Backend rlogin_backend = {
rlogin_size,
rlogin_special,
rlogin_socket,
rlogin_size,
rlogin_special,
rlogin_socket,
+ rlogin_exitcode,
rlogin_sendok,
rlogin_ldisc,
rlogin_unthrottle,
rlogin_sendok,
rlogin_ldisc,
rlogin_unthrottle,