dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quicklaunch: use XDG_RUNTIME_DIR instead of hardcoded /tmp

This commit is contained in:
Mike Blumenkrantz 2018-02-02 16:59:56 -05:00
parent 7f0a4154f5
commit c0b3a0b562
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/elementary/quicklaunch.c
View File

@ -182,6 +182,7 @@ main(int argc, char **argv)
char buf[PATH_MAX]; char buf[PATH_MAX];
struct sigaction action; struct sigaction action;
const char *domain; const char *domain;
char *rundir;
int ret = 0; int ret = 0;
if (!eina_init()) if (!eina_init())
@ -203,7 +204,9 @@ main(int argc, char **argv)
if (!domain) domain = getenv("DISPLAY"); if (!domain) domain = getenv("DISPLAY");
if (!domain) domain = "unknown"; if (!domain) domain = "unknown";
} }
snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i", getuid()); rundir = getenv("XDG_RUNTIME_DIR");
if (!rundir) rundir = "/tmp";
snprintf(buf, sizeof(buf), "%s/elm-ql-%i", rundir, getuid());
if (stat(buf, &st) < 0) if (stat(buf, &st) < 0)
{ {
ret = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR); ret = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR);
@ -213,7 +216,7 @@ main(int argc, char **argv)
exit(-1); exit(-1);
} }
} }
snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i/%s", getuid(), domain); snprintf(buf, sizeof(buf), "%s/elm-ql-%i/%s", rundir, getuid(), domain);
unlink(buf); unlink(buf);
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0) if (sock < 0)

5
src/bin/elementary/run.c
View File

@ -34,6 +34,7 @@ main(int argc, char **argv)
int we_are_elementary_run = 0; int we_are_elementary_run = 0;
char *domain; char *domain;
char *cwd; char *cwd;
char *rundir;
int sargc, slen, envnum; int sargc, slen, envnum;
unsigned char *sbuf = NULL, *pos; unsigned char *sbuf = NULL, *pos;
@ -51,7 +52,9 @@ main(int argc, char **argv)
if (!domain) domain = getenv("DISPLAY"); if (!domain) domain = getenv("DISPLAY");
if (!domain) domain = "unknown"; if (!domain) domain = "unknown";
} }
snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i/%s", getuid(), domain); rundir = getenv("XDG_RUNTIME_DIR");
if (!rundir) rundir = "/tmp";
snprintf(buf, sizeof(buf), "%s/elm-ql-%i/%s", rundir, getuid(), domain);
if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{ {
perror("elementary_quicklaunch: socket(AF_UNIX, SOCK_STREAM, 0)"); perror("elementary_quicklaunch: socket(AF_UNIX, SOCK_STREAM, 0)");