The branch, master has been updated
via 6405fceee20c54aab10c1a3a2863861d1c0838b6 (commit)
via f9e46a373f1ac7155b77754b43b05ed885a9bec9 (commit)
from d05debbe198699a84ddeaacfa4d5bf57e6afaac8 (commit)
- Log -----------------------------------------------------------------
commit 6405fceee20c54aab10c1a3a2863861d1c0838b6
Merge: f9e46a3 d05debb
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
cmd-select-pane.c | 1 +
tmux.1 | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
commit f9e46a373f1ac7155b77754b43b05ed885a9bec9
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Do not leak command in formats, from Romain Francoise.
---
format.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/format.c b/format.c
index ad52cae..b711111 100644
--- a/format.c
+++ b/format.c
@@ -398,7 +398,8 @@ 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, *cmd;
+ const char *cwd;
+ char *cmd;
size = 0;
for (i = 0; i < gd->hsize; i++) {
@@ -432,8 +433,10 @@ format_window_pane(struct format_tree *ft, struct
window_pane *wp)
format_add(ft, "pane_start_path", "%s", wp->cwd);
if ((cwd = osdep_get_cwd(wp->fd)) != NULL)
format_add(ft, "pane_current_path", "%s", cwd);
- if ((cmd = osdep_get_name(wp->fd, wp->tty)) != NULL)
+ if ((cmd = osdep_get_name(wp->fd, wp->tty)) != NULL) {
format_add(ft, "pane_current_command", "%s", cmd);
+ free(cmd);
+ }
format_add(ft, "cursor_x", "%d", wp->base.cx);
format_add(ft, "cursor_y", "%d", wp->base.cy);
-----------------------------------------------------------------------
Summary of changes:
format.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
