circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-09-09 14:01:08 +01:00
commit 5af2f68a2c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg.c
View File

@ -97,7 +97,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
} }
found = 0; found = 0;
while ((buf = fparseln(f, NULL, &line, delim, 0))) { while ((buf = fparseln(f, NULL, &line, delim, 0)) != NULL) {
log_debug("%s: %s", path, buf); log_debug("%s: %s", path, buf);
/* Skip empty lines. */ /* Skip empty lines. */

4
client.c
View File

@ -264,6 +264,10 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
} }
return (1); return (1);
} }
options_free(&global_options);
options_free(&global_s_options);
options_free(&global_w_options);
environ_free(&global_environ);
/* Set process title, log and signals now this is the client. */ /* Set process title, log and signals now this is the client. */
#ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE