*/
char *platform_default_s(const char *name)
{
- if (!strcmp(name, "X11Display"))
- return dupstr(getenv("DISPLAY"));
if (!strcmp(name, "TermType"))
return dupstr(getenv("TERM"));
if (!strcmp(name, "UserName"))
printf(" -C enable compression\n");
printf(" -i key private key file for authentication\n");
printf(" -s remote command is an SSH subsystem (SSH-2 only)\n");
+ printf(" -N don't start a shell/command (SSH-2 only)\n");
exit(1);
}
int errors;
int use_subsystem = 0;
void *ldisc, *logctx;
+ long now;
ssh_get_line = console_get_line;
/* See if host is of the form user@host */
if (cfg.host[0] != '\0') {
- char *atsign = strchr(cfg.host, '@');
+ char *atsign = strrchr(cfg.host, '@');
/* Make sure we're not overflowing the user field */
if (atsign) {
if (atsign - cfg.host < sizeof cfg.username) {
atexit(cleanup_termios);
ldisc_update(NULL, 1, 1);
sending = FALSE;
+ now = GETTICKCOUNT();
while (1) {
fd_set rset, wset, xset;
}
do {
- ret = select(maxfd, &rset, &wset, &xset, NULL);
+ long next, ticks;
+ struct timeval tv, *ptv;
+
+ if (run_timers(now, &next)) {
+ ticks = next - GETTICKCOUNT();
+ if (ticks < 0) ticks = 0; /* just in case */
+ tv.tv_sec = ticks / 1000;
+ tv.tv_usec = ticks % 1000 * 1000;
+ ptv = &tv;
+ } else {
+ ptv = NULL;
+ }
+ ret = select(maxfd, &rset, &wset, &xset, ptv);
+ if (ret == 0)
+ now = next;
+ else
+ now = GETTICKCOUNT();
} while (ret < 0 && errno == EINTR);
if (ret < 0) {