From f9e46a373f1ac7155b77754b43b05ed885a9bec9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 5 Mar 2013 20:01:16 +0000 Subject: Do not leak command in formats, from Romain Francoise. --- format.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'format.c') diff --git a/format.c b/format.c index ad52caea..b711111b 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); -- cgit From f47a063841f2baa1590fb9e53713b3713a03020d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 7 Mar 2013 10:07:22 +0000 Subject: Rename session idx to session id throughout and add $ prefix to targets to use it, extended from a diff from George Nachman. --- format.c | 1 + 1 file changed, 1 insertion(+) (limited to 'format.c') diff --git a/format.c b/format.c index b711111b..4d70d59b 100644 --- a/format.c +++ b/format.c @@ -280,6 +280,7 @@ format_session(struct format_tree *ft, struct session *s) format_add(ft, "session_windows", "%u", winlink_count(&s->windows)); format_add(ft, "session_width", "%u", s->sx); format_add(ft, "session_height", "%u", s->sy); + format_add(ft, "session_id", "%u", s->id); sg = session_group_find(s); format_add(ft, "session_grouped", "%d", sg != NULL); -- cgit