=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v retrieving revision 1.20 retrieving revision 1.21 diff -c -r1.20 -r1.21 *** src/usr.bin/tmux/format.c 2013/03/24 09:54:10 1.20 --- src/usr.bin/tmux/format.c 2013/03/25 10:07:21 1.21 *************** *** 1,4 **** ! /* $OpenBSD: format.c,v 1.20 2013/03/24 09:54:10 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: format.c,v 1.21 2013/03/25 10:07:21 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott *************** *** 398,404 **** struct grid_line *gl; unsigned long long size; u_int i, idx; ! const char *cwd, *cmd; size = 0; for (i = 0; i < gd->hsize; i++) { --- 398,405 ---- struct grid_line *gl; unsigned long long size; u_int i, idx; ! const char *cwd; ! char *cmd; size = 0; for (i = 0; i < gd->hsize; i++) { *************** *** 432,439 **** format_add(ft, "pane_start_path", "%s", wp->cwd); if ((cwd = get_proc_cwd(wp->fd)) != NULL) format_add(ft, "pane_current_path", "%s", cwd); ! if ((cmd = get_proc_name(wp->fd, wp->tty)) != NULL) format_add(ft, "pane_current_command", "%s", cmd); format_add(ft, "cursor_x", "%d", wp->base.cx); format_add(ft, "cursor_y", "%d", wp->base.cy); --- 433,442 ---- format_add(ft, "pane_start_path", "%s", wp->cwd); if ((cwd = get_proc_cwd(wp->fd)) != NULL) format_add(ft, "pane_current_path", "%s", cwd); ! if ((cmd = get_proc_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);