From a5f3ca1e2bba7c304f95b3f962cf5cb8ccf3359d Mon Sep 17 00:00:00 2001
Message-Id: <a5f3ca1e2bba7c304f95b3f962cf5cb8ccf3359d.1715163722.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 23 Dec 2007 10:28:08 +0000
Subject: [PATCH] darwin and stupidity fixes for speaker socket move
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 server/speaker.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/speaker.c b/server/speaker.c
index e4a00be..8a3eb06 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -69,6 +69,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/un.h>
+#include <sys/stat.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 */
-  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);
-- 
[mdw]