diff options
| author | Thomas Adam <thomas.adam@smoothwall.net> | 2013-02-07 12:08:55 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas.adam@smoothwall.net> | 2013-02-07 12:08:55 +0000 |
| commit | 64da762c15ddf0930baa1f8e4fc2b41515a64e3a (patch) | |
| tree | cd2a953395962c7f2e7265d16722508a80606372 /format.c | |
| parent | fe00607816308953209cb85ab92a586c1f344cde (diff) | |
| parent | 8903c1f167839569b7514508b38988aa6486575c (diff) | |
| download | rtmux-64da762c15ddf0930baa1f8e4fc2b41515a64e3a.tar.gz rtmux-64da762c15ddf0930baa1f8e4fc2b41515a64e3a.tar.bz2 rtmux-64da762c15ddf0930baa1f8e4fc2b41515a64e3a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -365,6 +365,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp) unsigned long long size; u_int i; u_int idx; + const char *cwd; size = 0; for (i = 0; i < gd->hsize; i++) { @@ -390,9 +391,11 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp) format_add(ft, "pane_start_command", "%s", wp->cmd); if (wp->cwd != NULL) format_add(ft, "pane_start_path", "%s", wp->cwd); - format_add(ft, "pane_current_path", "%s", osdep_get_cwd(wp->fd)); + if ((cwd = get_proc_cwd(wp->fd)) != NULL) + format_add(ft, "pane_current_path", "%s", cwd); format_add(ft, "pane_pid", "%ld", (long) wp->pid); - format_add(ft, "pane_tty", "%s", wp->tty); + if (wp->tty != NULL) + format_add(ft, "pane_tty", "%s", wp->tty); } void |