~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure disorder-normalize gets the right config file
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index
a6c5f43
..
8a3eb06
100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-69,6
+69,7
@@
#include <fcntl.h>
#include <poll.h>
#include <sys/un.h>
#include <fcntl.h>
#include <poll.h>
#include <sys/un.h>
+#include <sys/stat.h>
#include "configuration.h"
#include "syscalls.h"
#include "configuration.h"
#include "syscalls.h"
@@
-78,6
+79,7
@@
#include "speaker-protocol.h"
#include "user.h"
#include "speaker.h"
#include "speaker-protocol.h"
#include "user.h"
#include "speaker.h"
+#include "printf.h"
/** @brief Linked list of all prepared tracks */
struct track *tracks;
/** @brief Linked list of all prepared tracks */
struct track *tracks;
@@
-142,7
+144,7
@@
static void help(void) {
/* Display version number and terminate. */
static void version(void) {
/* Display version number and terminate. */
static void version(void) {
- xprintf("
disorder-speaker version %s\n
", disorder_version_string);
+ xprintf("
%s
", disorder_version_string);
xfclose(stdout);
exit(0);
}
xfclose(stdout);
exit(0);
}
@@
-598,6
+600,7
@@
int main(int argc, char **argv) {
static const int one = 1;
struct speaker_message sm;
const char *d;
static const int one = 1;
struct speaker_message sm;
const char *d;
+ char *dir;
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
@@
-639,11
+642,16
@@
int main(int argc, char **argv) {
backend = backends[n];
/* backend-specific initialization */
backend->init();
backend = backends[n];
/* backend-specific initialization */
backend->init();
+ /* create the socket directory */
+ byte_xasprintf(&dir, "%s/speaker", config->home);
+ unlink(dir); /* might be a leftover socket */
+ if(mkdir(dir, 0700) < 0 && errno != EEXIST)
+ fatal(errno, "error creating %s", dir);
/* set up the listen socket */
listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
/* set up the listen socket */
listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
- snprintf(addr.sun_path, sizeof addr.sun_path, "%s/speaker",
+ snprintf(addr.sun_path, sizeof addr.sun_path, "%s/speaker
/socket
",
config->home);
if(unlink(addr.sun_path) < 0 && errno != ENOENT)
error(errno, "removing %s", addr.sun_path);
config->home);
if(unlink(addr.sun_path) < 0 && errno != ENOENT)
error(errno, "removing %s", addr.sun_path);