projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PSFTP now needs wildcard.o, and was only getting it by luck. Make it explicit.
[u/mdw/putty]
/
unix
/
uxplink.c
diff --git
a/unix/uxplink.c
b/unix/uxplink.c
index
fdc0f66
..
42d6966
100644
(file)
--- a/
unix/uxplink.c
+++ b/
unix/uxplink.c
@@
-13,6
+13,7
@@
#include <termios.h>
#include <pwd.h>
#include <sys/ioctl.h>
#include <termios.h>
#include <pwd.h>
#include <sys/ioctl.h>
+#include <sys/select.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
@@
-128,10
+129,13
@@
void ldisc_update(void *frontend, int echo, int edit)
else
mode.c_lflag &= ~ECHO;
else
mode.c_lflag &= ~ECHO;
- if (edit)
+ if (edit) {
+ mode.c_iflag |= ICRNL;
mode.c_lflag |= ISIG | ICANON;
mode.c_lflag |= ISIG | ICANON;
- else
+ } else {
+ mode.c_iflag &= ~ICRNL;
mode.c_lflag &= ~(ISIG | ICANON);
mode.c_lflag &= ~(ISIG | ICANON);
+ }
tcsetattr(0, TCSANOW, &mode);
}
tcsetattr(0, TCSANOW, &mode);
}
@@
-410,8
+414,6
@@
int main(int argc, char **argv)
cfg.port = default_port;
} else {
cfg = cfg2;
cfg.port = default_port;
} else {
cfg = cfg2;
- /* Ick: patch up internal pointer after copy */
- cfg.remote_cmd_ptr = cfg.remote_cmd;
}
}
}
}
@@
-514,7
+516,7
@@
int main(int argc, char **argv)
cfg.host[p1] = '\0';
}
cfg.host[p1] = '\0';
}
- if (!
*cfg.remote_cmd_ptr
)
+ if (!
cfg.remote_cmd_ptr && !*cfg.remote_cmd
)
flags |= FLAG_INTERACTIVE;
/*
flags |= FLAG_INTERACTIVE;
/*