Use pgrp of pty fd not pid of immediate child when recovering current working

directory (like current process). From Marcel Partap.
This commit is contained in:
Nicholas Marriott
2012-09-24 14:05:38 +01:00
parent 5b85efeb93
commit 5d60bc7f7c
13 changed files with 41 additions and 23 deletions

View File

@@ -26,7 +26,7 @@
#include <unistd.h>
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);