From 24d9dc518de6761f645165d49f321b2b56904fb5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 2 Oct 2014 09:25:15 +0100 Subject: [PATCH] Fix osdep_get_cwd on Solaris 11, from J Raynor. --- osdep-sunos.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/osdep-sunos.c b/osdep-sunos.c index fd644f5d..d071694e 100644 --- a/osdep-sunos.c +++ b/osdep-sunos.c @@ -69,10 +69,19 @@ osdep_get_cwd(int fd) { static char target[MAXPATHLEN + 1]; char *path; + const char *ttypath; ssize_t n; pid_t pgrp; + int retval, ttyfd; - if ((pgrp = tcgetpgrp(fd)) == -1) + if ((ttypath = ptsname(fd)) == NULL) + return (NULL); + if ((ttyfd = open(ttypath, O_RDONLY|O_NOCTTY)) == -1) + return (NULL); + + retval = ioctl(ttyfd, TIOCGPGRP, &pgrp); + close(ttyfd); + if (retval == -1) return (NULL); xasprintf(&path, "/proc/%u/path/cwd", (u_int) pgrp);