From 46b3c1a02564268ab810d0f54190f1e8fc1f4f6d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 10 Apr 2013 12:46:29 +0100 Subject: [PATCH] Use proc_bsdinfo which works on older OS X versions, from OZAKI Kiichi. --- osdep-darwin.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/osdep-darwin.c b/osdep-darwin.c index 3b5e9d3c..dc60b092 100644 --- a/osdep-darwin.c +++ b/osdep-darwin.c @@ -18,7 +18,6 @@ #include -#include #include #include #include @@ -34,19 +33,17 @@ struct event_base *osdep_event_init(void); char * osdep_get_name(int fd, unused char *tty) { -#ifdef __MAC_10_7 - struct proc_bsdshortinfo bsdinfo; + struct proc_bsdinfo bsdinfo; pid_t pgrp; int ret; if ((pgrp = tcgetpgrp(fd)) == -1) return (NULL); - ret = proc_pidinfo(pgrp, PROC_PIDT_SHORTBSDINFO, 0, + ret = proc_pidinfo(pgrp, PROC_PIDTBSDINFO, 0, &bsdinfo, sizeof bsdinfo); - if (ret == sizeof bsdinfo && *bsdinfo.pbsi_comm != '\0') - return (strdup(bsdinfo.pbsi_comm)); -#endif + if (ret == sizeof bsdinfo && *bsdinfo.pbi_comm != '\0') + return (strdup(bsdinfo.pbi_comm)); return (NULL); }