~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another signal-handling refinement from RJK: the SIGCHLD handler
[sgt/putty]
/
rlogin.c
diff --git
a/rlogin.c
b/rlogin.c
index
61f4afb
..
942a07e
100644
(file)
--- a/
rlogin.c
+++ b/
rlogin.c
@@
-1,4
+1,3
@@
-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@
-42,7
+41,7
@@
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. */
- logevent(error_msg);
+ logevent(
rlogin->frontend,
error_msg);
connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
@@
-124,7
+123,7
@@
static char *rlogin_init(void *frontend_handle, void **backend_handle,
{
char buf[200];
sprintf(buf, "Looking up host \"%.170s\"", host);
{
char buf[200];
sprintf(buf, "Looking up host \"%.170s\"", host);
- logevent(buf);
+ logevent(
rlogin->frontend,
buf);
}
addr = sk_namelookup(host, realhost);
if ((err = sk_addr_error(addr)))
}
addr = sk_namelookup(host, realhost);
if ((err = sk_addr_error(addr)))
@@
-140,7
+139,7
@@
static char *rlogin_init(void *frontend_handle, void **backend_handle,
char buf[200], addrbuf[100];
sk_getaddr(addr, addrbuf, 100);
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
char buf[200], addrbuf[100];
sk_getaddr(addr, addrbuf, 100);
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
- logevent(buf);
+ logevent(
rlogin->frontend,
buf);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
nodelay, (Plug) rlogin);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
nodelay, (Plug) rlogin);
@@
-234,7
+233,7
@@
static Socket rlogin_socket(void *handle)
static int rlogin_sendok(void *handle)
{
static int rlogin_sendok(void *handle)
{
- Rlogin rlogin = (Rlogin) handle;
+ /* Rlogin rlogin = (Rlogin) handle; */
return 1;
}
return 1;
}
@@
-246,7
+245,7
@@
static void rlogin_unthrottle(void *handle, int backlog)
static int rlogin_ldisc(void *handle, int option)
{
static int rlogin_ldisc(void *handle, int option)
{
- Rlogin rlogin = (Rlogin) handle;
+ /* Rlogin rlogin = (Rlogin) handle; */
return 0;
}
return 0;
}
@@
-255,9
+254,14
@@
static void rlogin_provide_ldisc(void *handle, void *ldisc)
/* This is a stub. */
}
/* This is a stub. */
}
+static void rlogin_provide_logctx(void *handle, void *logctx)
+{
+ /* This is a stub. */
+}
+
static int rlogin_exitcode(void *handle)
{
static int rlogin_exitcode(void *handle)
{
- Rlogin rlogin = (Rlogin) handle;
+ /* Rlogin rlogin = (Rlogin) handle; */
/* If we ever implement RSH, we'll probably need to do this properly */
return 0;
}
/* If we ever implement RSH, we'll probably need to do this properly */
return 0;
}
@@
-273,6
+277,7
@@
Backend rlogin_backend = {
rlogin_sendok,
rlogin_ldisc,
rlogin_provide_ldisc,
rlogin_sendok,
rlogin_ldisc,
rlogin_provide_ldisc,
+ rlogin_provide_logctx,
rlogin_unthrottle,
1
};
rlogin_unthrottle,
1
};