darwin and stupidity fixes for speaker socket move

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index e4a00bead0389c30b4451683cfea22d27b504751..8a3eb06cc91a897c39d4a8880c4d28c502ec19a5 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"


@@ -644,7 +645,7 @@ int main(int argc, char **argv) {
   /* create the socket directory */
   byte_xasprintf(&dir, "%s/speaker", config->home);
   unlink(dir);                          /* might be a leftover socket */
   /* create the socket directory */
   byte_xasprintf(&dir, "%s/speaker", config->home);
   unlink(dir);                          /* might be a leftover socket */

-  if(mkdir(dir, 0700) < 0)
+  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);
     fatal(errno, "error creating %s", dir);
   /* set up the listen socket */
   listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0);