diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-09-16 12:35:04 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-09-16 12:35:04 +0000 |
commit | 5c60162e3c4f8ac9deede6c0fb5a21930d92e3b4 (patch) | |
tree | 16e91d61eed65cf74d3987cf9b7cd08ffea48288 /session.c | |
parent | a6dd9e8e7eb0d7734b0905a97f6e8b0087a2e09c (diff) |
Rather than constructing an entire termios struct from ttydefaults.h, just let
forkpty do it and then alter the bits that should be changed after fork. A
little neater and more portable.
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -139,7 +139,12 @@ session_create(const char *name, const char *cmd, const char *cwd, environ_init(&s->environ); if (env != NULL) environ_copy(env, &s->environ); - memcpy(&s->tio, tio, sizeof s->tio); + + s->tio = NULL; + if (tio != NULL) { + s->tio = xmalloc(sizeof *s->tio); + memcpy(s->tio, tio, sizeof *s->tio); + } s->sx = sx; s->sy = sy; @@ -182,6 +187,9 @@ session_destroy(struct session *s) while (!ARRAY_EMPTY(&sessions) && ARRAY_LAST(&sessions) == NULL) ARRAY_TRUNC(&sessions, 1); + if (s->tio != NULL) + xfree(s->tio); + session_alert_cancel(s, NULL); environ_free(&s->environ); options_free(&s->options); @@ -237,7 +245,7 @@ session_new(struct session *s, hlimit = options_get_number(&s->options, "history-limit"); w = window_create( - name, cmd, shell, cwd, &env, &s->tio, s->sx, s->sy, hlimit, cause); + name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, hlimit, cause); if (w == NULL) { environ_free(&env); return (NULL); |