Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-10-31 10:01:12 +00:00
18 changed files with 136 additions and 139 deletions

View File

@ -103,8 +103,8 @@ session_find_by_id(u_int id)
/* Create a new session. */
struct session *
session_create(const char *name, int argc, char **argv, const char *path,
int cwd, struct environ *env, struct termios *tio, int idx, u_int sx,
u_int sy, char **cause)
const char *cwd, struct environ *env, struct termios *tio, int idx,
u_int sx, u_int sy, char **cause)
{
struct session *s;
struct winlink *wl;
@ -113,7 +113,7 @@ session_create(const char *name, int argc, char **argv, const char *path,
s->references = 1;
s->flags = 0;
s->cwd = dup(cwd);
s->cwd = xstrdup(cwd);
s->curw = NULL;
TAILQ_INIT(&s->lastw);
@ -223,7 +223,7 @@ session_destroy(struct session *s)
winlink_remove(&s->windows, wl);
}
close(s->cwd);
free((void *)s->cwd);
session_unref(s);
}
@ -314,7 +314,7 @@ session_previous_session(struct session *s)
/* Create a new window on a session. */
struct winlink *
session_new(struct session *s, const char *name, int argc, char **argv,
const char *path, int cwd, int idx, char **cause)
const char *path, const char *cwd, int idx, char **cause)
{
struct window *w;
struct winlink *wl;