Change the way the working directory for new processes is discovered. If

default-path isn't empty, it is used. Otherwise:

1) If tmux neww is run from the command line, the working directory of the
   client is used.

2) Otherwise sysctl KERN_PROC_CWD is used to retrieve the current
   working directory of the process in the active pane.

3) If that fails, the directory where the session was created is used.

Support code by Romain Francois, OpenBSD specific bits by me.

Note this requires a recent userland and kernel with KERN_PROC_CWD.

1 files changed, 26 insertions, 1 deletions

diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c
index f5699e4ed2b..f322c8d23f5 100644
--- a/usr.bin/tmux/cmd.c
+++ b/usr.bin/tmux/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.56 2011/06/05 11:19:03 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.57 2011/12/09 16:28:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1213,3 +1213,28 @@ cmd_template_replace(char *template, const char *s, int idx)
 
 	return (buf);
 }
+
+/* Return the default path for a new pane. */
+char *
+cmd_get_default_path(struct cmd_ctx *ctx)
+{
+	char			*cwd;
+	struct session		*s;
+	struct window_pane	*wp;
+
+	if ((s = cmd_current_session(ctx, 0)) == NULL)
+		return (NULL);
+
+	cwd = options_get_string(&s->options, "default-path");
+	if (*cwd == '\0') {
+		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
+			return (ctx->cmdclient->cwd);
+		if (ctx->curclient != NULL) {
+			wp = s->curw->window->active;
+			if ((cwd = get_proc_cwd(wp->pid)) != NULL)
+				return (cwd);
+		}
+		return (s->cwd);
+	}
+	return (cwd);
+}