~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now that we use real gss_buffer_ts, there's no need to muck about with
[sgt/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
cc01a67
..
ca7e98a
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-360,8
+360,10
@@
static void pty_open_master(Pty pty)
/*
* Set the pty master into non-blocking mode.
*/
/*
* Set the pty master into non-blocking mode.
*/
- int i = 1;
- ioctl(pty->master_fd, FIONBIO, &i);
+ int fl;
+ fl = fcntl(pty->master_fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
}
if (!ptys_by_fd)
}
if (!ptys_by_fd)
@@
-414,6
+416,8
@@
void pty_pre_init(void)
perror("pterm: pipe");
exit(1);
}
perror("pterm: pipe");
exit(1);
}
+ cloexec(pipefd[0]);
+ cloexec(pipefd[1]);
pid = fork();
if (pid < 0) {
perror("pterm: fork");
pid = fork();
if (pid < 0) {
perror("pterm: fork");
@@
-755,7
+759,6
@@
static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
}
if (pid == 0) {
}
if (pid == 0) {
- int i;
/*
* We are the child.
*/
/*
* We are the child.
*/
@@
-771,18
+774,16
@@
static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
dup2(slavefd, 0);
dup2(slavefd, 1);
dup2(slavefd, 2);
dup2(slavefd, 0);
dup2(slavefd, 1);
dup2(slavefd, 2);
+ close(slavefd);
setsid();
#ifdef TIOCSCTTY
setsid();
#ifdef TIOCSCTTY
- ioctl(
slavefd
, TIOCSCTTY, 1);
+ ioctl(
0
, TIOCSCTTY, 1);
#endif
pgrp = getpid();
#endif
pgrp = getpid();
- tcsetpgrp(
slavefd
, pgrp);
+ tcsetpgrp(
0
, pgrp);
setpgid(pgrp, pgrp);
close(open(pty->name, O_WRONLY, 0));
setpgid(pgrp, pgrp);
setpgid(pgrp, pgrp);
close(open(pty->name, O_WRONLY, 0));
setpgid(pgrp, pgrp);
- /* Close everything _else_, for tidiness. */
- for (i = 3; i < 1024; i++)
- close(i);
{
char *term_env_var = dupprintf("TERM=%s", cfg->termtype);
putenv(term_env_var);
{
char *term_env_var = dupprintf("TERM=%s", cfg->termtype);
putenv(term_env_var);
@@
-863,9
+864,13
@@
static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
add234(ptys_by_pid, pty);
}
add234(ptys_by_pid, pty);
}
- if (pty_signal_pipe[0] < 0 && pipe(pty_signal_pipe) < 0) {
- perror("pipe");
- exit(1);
+ if (pty_signal_pipe[0] < 0) {
+ if (pipe(pty_signal_pipe) < 0) {
+ perror("pipe");
+ exit(1);
+ }
+ cloexec(pty_signal_pipe[0]);
+ cloexec(pty_signal_pipe[1]);
}
pty_uxsel_setup(pty);
}
pty_uxsel_setup(pty);
@@
-1082,5
+1087,7
@@
Backend pty_backend = {
pty_provide_logctx,
pty_unthrottle,
pty_cfg_info,
pty_provide_logctx,
pty_unthrottle,
pty_cfg_info,
- 1
+ "pty",
+ -1,
+ 0
};
};