Merge branch 'obsd-master'

3 files changed, 15 insertions, 13 deletions

diff --git a/client.c b/client.c
index 1e7492d9..6c9f0fcd 100644
--- a/client.c
+++ b/client.c
@@ -55,7 +55,7 @@ int		client_attached;
 __dead void	client_exec(const char *);
 int		client_get_lock(char *);
 int		client_connect(struct event_base *, char *, int);
-void		client_send_identify(const char *, int);
+void		client_send_identify(const char *, const char *);
 int		client_write_one(enum msgtype, int, const void *, size_t);
 int		client_write_server(enum msgtype, const void *, size_t);
 void		client_update_event(void);
@@ -214,11 +214,11 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 	struct cmd		*cmd;
 	struct cmd_list		*cmdlist;
 	struct msg_command_data	*data;
-	int			 cmdflags, fd, i, cwd;
-	const char*              ttynam;
+	int			 cmdflags, fd, i;
+	const char		*ttynam, *cwd;
 	pid_t			 ppid;
 	enum msgtype		 msg;
-	char			*cause;
+	char			*cause, path[PATH_MAX];
 	struct termios		 tio, saved_tio;
 	size_t			 size;
 
@@ -271,8 +271,8 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 	}
 
 	/* Save these before pledge(). */
-	if ((cwd = open(".", O_RDONLY)) == -1)
-		cwd = open("/", O_RDONLY);
+	if ((cwd = getcwd(path, sizeof path)) == NULL)
+		cwd = "/";
 	if ((ttynam = ttyname(STDIN_FILENO)) == NULL)
 		ttynam = "";
 
@@ -331,7 +331,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 	}
 
 	/* Send identify messages. */
-	client_send_identify(ttynam, cwd); /* closes cwd */
+	client_send_identify(ttynam, cwd);
 
 	/* Send first command. */
 	if (msg == MSG_COMMAND) {
@@ -386,7 +386,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 
 /* Send identify messages to server. */
 void
-client_send_identify(const char *ttynam, int cwd)
+client_send_identify(const char *ttynam, const char *cwd)
 {
 	const char	 *s;
 	char		**ss;
@@ -401,7 +401,7 @@ client_send_identify(const char *ttynam, int cwd)
 	client_write_one(MSG_IDENTIFY_TERM, -1, s, strlen(s) + 1);
 
 	client_write_one(MSG_IDENTIFY_TTYNAME, -1, ttynam, strlen(ttynam) + 1);
-	client_write_one(MSG_IDENTIFY_CWD, cwd, NULL, 0);
+	client_write_one(MSG_IDENTIFY_CWD, -1, cwd, strlen(cwd) + 1);
 
 	if ((fd = dup(STDIN_FILENO)) == -1)
 		fatal("dup failed");
diff --git a/server-client.c b/server-client.c
index 524bddb9..c0918078 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1175,9 +1175,10 @@ server_client_msg_identify(struct client *c, struct imsg *imsg)
 		c->ttyname = xstrdup(data);
 		break;
 	case MSG_IDENTIFY_CWD:
-		if (datalen != 0)
-			fatalx("bad MSG_IDENTIFY_CWD size");
-		c->cwd = imsg->fd;
+		if (datalen == 0 || data[datalen - 1] != '\0')
+			fatalx("bad MSG_IDENTIFY_CWD string");
+		if ((c->cwd = open(data, O_RDONLY)) == -1)
+			c->cwd = open("/", O_RDONLY);
 		break;
 	case MSG_IDENTIFY_STDIN:
 		if (datalen != 0)
diff --git a/tmux.h b/tmux.h
index 4d19a5ab..15d08611 100644
--- a/tmux.h
+++ b/tmux.h
@@ -396,11 +396,12 @@ enum msgtype {
 	MSG_IDENTIFY_FLAGS = 100,
 	MSG_IDENTIFY_TERM,
 	MSG_IDENTIFY_TTYNAME,
-	MSG_IDENTIFY_CWD,
+	MSG_IDENTIFY_OLDCWD, /* unused */
 	MSG_IDENTIFY_STDIN,
 	MSG_IDENTIFY_ENVIRON,
 	MSG_IDENTIFY_DONE,
 	MSG_IDENTIFY_CLIENTPID,
+	MSG_IDENTIFY_CWD,
 
 	MSG_COMMAND = 200,
 	MSG_DETACH,