ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use SOCKPATH_xxx macros

This commit is contained in:
Alexandre Ratchov 2015-10-02 14:26:46 +02:00
parent d91596856b
commit 0a39548f4d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sndiod/sndiod.c
View File

@ -261,10 +261,10 @@ getbasepath(char *base, size_t size)
uid = geteuid(); uid = geteuid();
if (uid == 0) { if (uid == 0) {
mask = 022; mask = 022;
snprintf(base, PATH_MAX, "/tmp/aucat"); snprintf(base, SOCKPATH_MAX, SOCKPATH_DIR);
} else { } else {
mask = 077; mask = 077;
snprintf(base, PATH_MAX, "/tmp/aucat-%u", uid); snprintf(base, SOCKPATH_MAX, SOCKPATH_DIR "-%u", uid);
} }
if (mkdir(base, 0777 & ~mask) < 0) { if (mkdir(base, 0777 & ~mask) < 0) {
if (errno != EEXIST) if (errno != EEXIST)
@ -334,7 +334,7 @@ main(int argc, char **argv)
{ {
int c, background, unit; int c, background, unit;
int pmin, pmax, rmin, rmax; int pmin, pmax, rmin, rmax;
char base[PATH_MAX], path[PATH_MAX]; char base[SOCKPATH_MAX], path[SOCKPATH_MAX];
unsigned int mode, dup, mmc, vol; unsigned int mode, dup, mmc, vol;
unsigned int hold, autovol, bufsz, round, rate; unsigned int hold, autovol, bufsz, round, rate;
const char *str; const char *str;
@ -467,7 +467,7 @@ main(int argc, char **argv)
mode, vol, mmc, dup); mode, vol, mmc, dup);
} }
getbasepath(base, sizeof(base)); getbasepath(base, sizeof(base));
snprintf(path, PATH_MAX, "%s/%s%u", base, AUCAT_PATH, unit); snprintf(path, SOCKPATH_MAX, "%s/" SOCKPATH_FILE "%u", base, unit);
listen_new_un(path); listen_new_un(path);
if (geteuid() == 0) if (geteuid() == 0)
privdrop(); privdrop();