From 5d60bc7f7c43c20fcf65531b5a5fb1fc7dcbb338 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 24 Sep 2012 14:05:38 +0100 Subject: Use pgrp of pty fd not pid of immediate child when recovering current working directory (like current process). From Marcel Partap. --- osdep-darwin.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'osdep-darwin.c') diff --git a/osdep-darwin.c b/osdep-darwin.c index 9cac1311..b112fa7c 100644 --- a/osdep-darwin.c +++ b/osdep-darwin.c @@ -26,7 +26,7 @@ #include char *osdep_get_name(int, char *); -char *osdep_get_cwd(pid_t); +char *osdep_get_cwd(int); struct event_base *osdep_event_init(void); #define unused __attribute__ ((unused)) @@ -51,14 +51,18 @@ osdep_get_name(int fd, unused char *tty) } char * -osdep_get_cwd(pid_t pid) +osdep_get_cwd(int fd) { static char wd[PATH_MAX]; struct proc_vnodepathinfo pathinfo; + pid_t pgrp; int ret; + if ((pgrp = tcgetpgrp(fd)) == -1) + return (NULL); + ret = proc_pidinfo( - pid, PROC_PIDVNODEPATHINFO, 0, &pathinfo, sizeof pathinfo); + pgrp, PROC_PIDVNODEPATHINFO, 0, &pathinfo, sizeof pathinfo); if (ret == sizeof pathinfo) { strlcpy(wd, pathinfo.pvi_cdir.vip_path, sizeof wd); return (wd); -- cgit v1.2.3