circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-12-10 00:01:11 +00:00
parent 75135ded09 bee95bf378
commit a64b7cfe5d
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
input.c
View File

@ -780,7 +780,7 @@ input_free(struct window_pane *wp)
free(ictx->input_buf); free(ictx->input_buf);
evbuffer_free(ictx->since_ground); evbuffer_free(ictx->since_ground);
free (ictx); free(ictx);
wp->ictx = NULL; wp->ictx = NULL;
} }

2
tmux.c
View File

@ -325,7 +325,7 @@ main(int argc, char **argv)
s = getenv("TMUX"); s = getenv("TMUX");
if (s != NULL && *s != '\0' && *s != ',') { if (s != NULL && *s != '\0' && *s != ',') {
path = xstrdup(s); path = xstrdup(s);
path[strcspn (path, ",")] = '\0'; path[strcspn(path, ",")] = '\0';
} }
} }
if (path == NULL && (path = make_label(label)) == NULL) { if (path == NULL && (path = make_label(label)) == NULL) {

2
tty-term.c
View File

@ -403,7 +403,7 @@ tty_term_find(char *name, int fd, char **cause)
term->name = xstrdup(name); term->name = xstrdup(name);
term->references = 1; term->references = 1;
term->flags = 0; term->flags = 0;
term->codes = xcalloc (tty_term_ncodes(), sizeof *term->codes); term->codes = xcalloc(tty_term_ncodes(), sizeof *term->codes);
LIST_INSERT_HEAD(&tty_terms, term, entry); LIST_INSERT_HEAD(&tty_terms, term, entry);
/* Set up curses terminal. */ /* Set up curses terminal. */