enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Fix a compatibility issue with OSX. There is no /proc on this damn system. A possible workaround is to use libproc (built-in). 

Reviewers: billiob, raster

Differential Revision: https://phab.enlightenment.org/D498
This commit is contained in:
Jean Guyomarc'h 2014-01-26 12:20:38 +01:00 committed by Boris Faure
parent 0bc73d9b17
commit 2626037407
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/termio.c
View File

@ -15,6 +15,11 @@
#include "media.h"
#include "dbus.h"
#if defined (__MacOSX__) || (defined (__MACH__) && defined (__APPLE__))
# include <sys/proc_info.h>
# include <libproc.h>
#endif
typedef struct _Termio Termio;
struct _Termio
@ -4832,14 +4837,30 @@ termio_pid_get(const Evas_Object *obj)
Eina_Bool
termio_cwd_get(const Evas_Object *obj, char *buf, size_t size)
{
char procpath[PATH_MAX];
Termio *sd = evas_object_smart_data_get(obj);
pid_t pid;
ssize_t siz;
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
pid = termpty_pid_get(sd->pty);
#if defined (__MacOSX__) || (defined (__MACH__) && defined (__APPLE__))
struct proc_vnodepathinfo vpi;
if (proc_pidinfo(pid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi)) <= 0)
{
ERR("Cannot get working directory of pid %i (%s)",
pid, strerror(errno));
return EINA_FALSE;
}
memcpy(buf, vpi.pvi_cdir.vip_path, size);
#else
char procpath[PATH_MAX];
ssize_t siz;
snprintf(procpath, sizeof(procpath), "/proc/%d/cwd", pid);
if ((siz = readlink(procpath, buf, size)) < 1)
{
@ -4848,6 +4869,9 @@ termio_cwd_get(const Evas_Object *obj, char *buf, size_t size)
return EINA_FALSE;
}
buf[siz] = 0;
#endif
return EINA_TRUE;
}