X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/a99c4e9a49364934a3f74f003507477b9840acb2..fbcfb25715ddbb522c8efac3faec1eca4811683d:/disobedience/rtp.c

diff --git a/disobedience/rtp.c b/disobedience/rtp.c
index a4efed5..faf2c61 100644
--- a/disobedience/rtp.c
+++ b/disobedience/rtp.c
@@ -22,10 +22,13 @@
  */
 
 #include "disobedience.h"
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
 
 /** @brief Path to RTP player's control socket */
 static char *rtp_socket;
@@ -37,12 +40,17 @@ static char *rtp_log;
 static void rtp_init(void) {
   if(!rtp_socket) {
     const char *home = getenv("HOME");
-    char *dir;
+    char *dir, *base;
+    struct utsname uts;
 
-    byte_xasprintf(&dir, "%s/.disorder", home);
+    byte_xasprintf(&dir, "%s/.disorder/", home);
     mkdir(dir, 02700);
-    byte_xasprintf(&rtp_socket, "%s/rtp", dir);
-    byte_xasprintf(&rtp_log, "%s/rtp.log", dir);
+    if(uname(&uts) < 0)
+      byte_xasprintf(&base, "%s/", dir);
+    else
+      byte_xasprintf(&base, "%s/%s-", dir, uts.nodename);
+    byte_xasprintf(&rtp_socket, "%srtp", base);
+    byte_xasprintf(&rtp_log, "%srtp.log", base);
   }
 }