circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Browse Source 
Conflicts:
	cmd-split-window.c
	cmd-unbind-key.c
	format.c
	osdep-openbsd.c
This commit is contained in:
Nicholas Marriott
2013-10-11 16:52:39 +01:00
parent e588ddb5d6 d518067be6
commit 8bcdd8fc21
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
format.c
View File

@@ -353,15 +353,20 @@ format_expand(struct format_tree *ft, const char *fmt)
char *
format_get_command(struct window_pane *wp)
{
char *cmd;
char *cmd, *out;
cmd = osdep_get_name(wp->fd, wp->tty);
if (cmd == NULL || *cmd == '\0') {
cmd = wp->cmd;
if (cmd == NULL || *cmd == '\0')
cmd = wp->shell;
free(cmd);
cmd = xstrdup(wp->cmd);
if (cmd == NULL || *cmd == '\0') {
free(cmd);
cmd = xstrdup(wp->shell);
}
}
return (parse_window_name(cmd));
out = parse_window_name(cmd);
free(cmd);
return (out);
}
/* Set default format keys for a session. */
@@ -518,7 +523,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
struct grid_line *gl;
unsigned long long size;
u_int i, idx;
const char *cwd;
const char *cmd;
char *cmd;
size = 0;