From 42272dfbd5058724fc094eb3ea438ec6b7eb6cff Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 24 Sep 2012 13:05:10 +0000 Subject: Use pgrp of pty fd not pid of immediate child when recovering current working directory (like current process). From Marcel Partap. --- procname.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'procname.c') diff --git a/procname.c b/procname.c index 370fe342..1928b92e 100644 --- a/procname.c +++ b/procname.c @@ -36,7 +36,7 @@ struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); char *get_proc_name(int, char *); -char *get_proc_cwd(pid_t); +char *get_proc_cwd(int); struct kinfo_proc * cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2) @@ -133,12 +133,14 @@ error: } char* -get_proc_cwd(pid_t pid) +get_proc_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); -- cgit