diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-10-10 12:35:32 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-10-10 12:35:32 +0000 |
| commit | bca1c2be710022f1028a33267984e46ca110c87e (patch) | |
| tree | 4f2ba6d4bd5b0782d2b08bf2439794559ea6fba5 | |
| parent | 8604b389f25d2e10012c2378f435945358a7be07 (diff) | |
Use format_get_command() and some spacing tweaks.
| -rw-r--r-- | usr.bin/tmux/client.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/format.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/job.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 966626af31e..6f05eb58262 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.74 2013/10/10 12:29:35 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.75 2013/10/10 12:35:30 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -351,6 +351,7 @@ client_send_identify(int flags) for (ss = environ; *ss != NULL; ss++) client_write_one(MSG_IDENTIFY_ENVIRON, -1, *ss, strlen(*ss) + 1); + client_write_one(MSG_IDENTIFY_DONE, -1, NULL, 0); client_update_event(); diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 5d238dee52f..f3d388e586e 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.34 2013/10/10 12:26:35 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.35 2013/10/10 12:35:31 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> @@ -553,7 +553,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp) format_add(ft, "pane_start_command", "%s", wp->cmd); 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) { + if ((cmd = format_get_command(wp)) != NULL) { format_add(ft, "pane_current_command", "%s", cmd); free(cmd); } diff --git a/usr.bin/tmux/job.c b/usr.bin/tmux/job.c index 37804f19049..e4794174d1d 100644 --- a/usr.bin/tmux/job.c +++ b/usr.bin/tmux/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.31 2013/04/17 08:41:41 nicm Exp $ */ +/* $OpenBSD: job.c,v 1.32 2013/10/10 12:35:31 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -145,7 +145,7 @@ job_write_callback(unused struct bufferevent *bufev, void *data) size_t len = EVBUFFER_LENGTH(EVBUFFER_OUTPUT(job->event)); log_debug("job write %p: %s, pid %ld, output left %zu", job, job->cmd, - (long) job->pid, len); + (long) job->pid, len); if (len == 0) { shutdown(job->fd, SHUT_WR); |