diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-09-24 14:05:38 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-09-24 14:05:38 +0100 |
| commit | 5d60bc7f7c43c20fcf65531b5a5fb1fc7dcbb338 (patch) | |
| tree | fd7cdea8dd53657a1545db7df6f2baa1e1c2f574 /osdep-openbsd.c | |
| parent | 5b85efeb93d44e504e36ae06a91c2e1b8b82c50e (diff) | |
Use pgrp of pty fd not pid of immediate child when recovering current working
directory (like current process). From Marcel Partap.
Diffstat (limited to 'osdep-openbsd.c')
| -rw-r--r-- | osdep-openbsd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/osdep-openbsd.c b/osdep-openbsd.c index 4fb75bff..9eee984f 100644 --- a/osdep-openbsd.c +++ b/osdep-openbsd.c @@ -37,7 +37,7 @@ struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); char *osdep_get_name(int, char *); -char *osdep_get_cwd(pid_t); +char *osdep_get_cwd(int); struct event_base *osdep_event_init(void); struct kinfo_proc * @@ -135,12 +135,14 @@ error: } char* -osdep_get_cwd(pid_t pid) +osdep_get_cwd(int fd) { - int name[] = { CTL_KERN, KERN_PROC_CWD, (int)pid }; + int name[] = { CTL_KERN, KERN_PROC_CWD, 0 }; static char path[MAXPATHLEN]; size_t pathlen = sizeof path; + if ((name[2] = tcgetpgrp(fd)) == -1) + return (NULL); if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0) return (NULL); return (path); |