diff --git a/osdep-aix.c b/osdep-aix.c index e1ce4918..8e7db426 100644 --- a/osdep-aix.c +++ b/osdep-aix.c @@ -16,75 +16,19 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include - -#include -#include -#include +#include #include "tmux.h" char * -osdep_get_name(__unused int fd, char *tty) +osdep_get_name(__unused int fd, __unused char *tty) { - struct psinfo p; - char *path; - ssize_t bytes; - int f, ttyfd, retval; - pid_t pgrp; - - if ((ttyfd = open(tty, O_RDONLY|O_NOCTTY)) == -1) - return (NULL); - - retval = ioctl(ttyfd, TIOCGPGRP, &pgrp); - close(ttyfd); - if (retval == -1) - return (NULL); - - xasprintf(&path, "/proc/%u/psinfo", (u_int) pgrp); - f = open(path, O_RDONLY); - free(path); - if (f < 0) - return (NULL); - - bytes = read(f, &p, sizeof(p)); - close(f); - if (bytes != sizeof(p)) - return (NULL); - - return (xstrdup(p.pr_fname)); + return (NULL); } char * -osdep_get_cwd(int fd) +osdep_get_cwd(__unused int fd) { - static char target[MAXPATHLEN + 1]; - char *path; - const char *ttypath; - ssize_t n; - pid_t pgrp; - int len, retval, ttyfd; - - 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/cwd", (u_int) pgrp); - n = readlink(path, target, MAXPATHLEN); - free(path); - if (n > 0) { - target[n] = '\0'; - if ((len = strlen(target)) > 1 && target[len - 1] == '/') - target[len - 1] = '\0'; - return (target); - } return (NULL); } diff --git a/osdep-haiku.c b/osdep-haiku.c index 7b1f800a..5dfee973 100644 --- a/osdep-haiku.c +++ b/osdep-haiku.c @@ -40,7 +40,7 @@ osdep_get_name(int fd, __unused char *tty) } char * -osdep_get_cwd(int fd) +osdep_get_cwd(__unused int fd) { return (NULL); }