extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-23 23:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 852:

Browse Source 
Check if the index is in use and fail before creating the child process,
rather than leaving a stray child on failure.
This commit is contained in:
Tiago Cunha 2011-02-15 15:09:52 +00:00
parent d0d1c0e486
commit 4e4568cade
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
session.c
View File

@ -1,4 +1,4 @@
/* $Id: session.c,v 1.87 2011-01-21 23:53:01 tcunha Exp $ */ /* $Id: session.c,v 1.88 2011-02-15 15:09:52 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -211,10 +211,16 @@ session_new(struct session *s,
const char *name, const char *cmd, const char *cwd, int idx, char **cause) const char *name, const char *cmd, const char *cwd, int idx, char **cause)
{ {
struct window *w; struct window *w;
struct winlink *wl;
struct environ env; struct environ env;
const char *shell; const char *shell;
u_int hlimit; u_int hlimit;
if ((wl = winlink_add(&s->windows, idx)) == NULL) {
xasprintf(cause, "index in use: %d", idx);
return (NULL);
}
environ_init(&env); environ_init(&env);
environ_copy(&global_environ, &env); environ_copy(&global_environ, &env);
environ_copy(&s->environ, &env); environ_copy(&s->environ, &env);
@ -228,15 +234,18 @@ session_new(struct session *s,
w = window_create( 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) { if (w == NULL) {
winlink_remove(&s->windows, wl);
environ_free(&env); environ_free(&env);
return (NULL); return (NULL);
} }
winlink_set_window(wl, w);
environ_free(&env); environ_free(&env);
if (options_get_number(&s->options, "set-remain-on-exit")) if (options_get_number(&s->options, "set-remain-on-exit"))
options_set_number(&w->options, "remain-on-exit", 1); options_set_number(&w->options, "remain-on-exit", 1);
return (session_attach(s, w, idx, cause)); session_group_synchronize_from(s);
return (wl);
} }
/* Attach a window to a session. */ /* Attach a window to a session. */
@ -245,8 +254,12 @@ session_attach(struct session *s, struct window *w, int idx, char **cause)
{ {
struct winlink *wl; struct winlink *wl;
if ((wl = winlink_add(&s->windows, w, idx)) == NULL) if ((wl = winlink_add(&s->windows, idx)) == NULL) {
xasprintf(cause, "index in use: %d", idx); xasprintf(cause, "index in use: %d", idx);
return (NULL);
}
winlink_set_window(wl, w);
session_group_synchronize_from(s); session_group_synchronize_from(s);
return (wl); return (wl);
} }
@ -525,7 +538,8 @@ session_group_synchronize1(struct session *target, struct session *s)
/* Link all the windows from the target. */ /* Link all the windows from the target. */
RB_FOREACH(wl, winlinks, ww) { RB_FOREACH(wl, winlinks, ww) {
wl2 = winlink_add(&s->windows, wl->window, wl->idx); wl2 = winlink_add(&s->windows, wl->idx);
winlink_set_window(wl2, wl->window);
wl2->flags |= wl->flags & WINLINK_ALERTFLAGS; wl2->flags |= wl->flags & WINLINK_ALERTFLAGS;
} }

5
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.606 2011-02-14 23:11:33 tcunha Exp $ */ /* $Id: tmux.h,v 1.607 2011-02-15 15:09:52 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1824,7 +1824,8 @@ struct winlink *winlink_find_by_index(struct winlinks *, int);
struct winlink *winlink_find_by_window(struct winlinks *, struct window *); struct winlink *winlink_find_by_window(struct winlinks *, struct window *);
int winlink_next_index(struct winlinks *, int); int winlink_next_index(struct winlinks *, int);
u_int winlink_count(struct winlinks *); u_int winlink_count(struct winlinks *);
struct winlink *winlink_add(struct winlinks *, struct window *, int); struct winlink *winlink_add(struct winlinks *, int);
void winlink_set_window(struct winlink *, struct window *);
void winlink_remove(struct winlinks *, struct winlink *); void winlink_remove(struct winlinks *, struct winlink *);
struct winlink *winlink_next(struct winlink *); struct winlink *winlink_next(struct winlink *);
struct winlink *winlink_previous(struct winlink *); struct winlink *winlink_previous(struct winlink *);

26
window.c
View File

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.144 2011-01-21 23:44:13 tcunha Exp $ */ /* $Id: window.c,v 1.145 2011-02-15 15:09:52 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -120,7 +120,7 @@ winlink_count(struct winlinks *wwl)
} }
struct winlink * struct winlink *
winlink_add(struct winlinks *wwl, struct window *w, int idx) winlink_add(struct winlinks *wwl, int idx)
{ {
struct winlink *wl; struct winlink *wl;
@ -132,14 +132,18 @@ winlink_add(struct winlinks *wwl, struct window *w, int idx)
wl = xcalloc(1, sizeof *wl); wl = xcalloc(1, sizeof *wl);
wl->idx = idx; wl->idx = idx;
wl->window = w;
RB_INSERT(winlinks, wwl, wl); RB_INSERT(winlinks, wwl, wl);
w->references++;
return (wl); return (wl);
} }
void
winlink_set_window(struct winlink *wl, struct window *w)
{
wl->window = w;
w->references++;
}
void void
winlink_remove(struct winlinks *wwl, struct winlink *wl) winlink_remove(struct winlinks *wwl, struct winlink *wl)
{ {
@ -150,11 +154,13 @@ winlink_remove(struct winlinks *wwl, struct winlink *wl)
xfree(wl->status_text); xfree(wl->status_text);
xfree(wl); xfree(wl);
if (w->references == 0) if (w != NULL) {
fatal("bad reference count"); if (w->references == 0)
w->references--; fatal("bad reference count");
if (w->references == 0) w->references--;
window_destroy(w); if (w->references == 0)
window_destroy(w);
}
} }
struct winlink * struct winlink *