--- rxvt-unicode/src/rxvtdaemon.C	2003/11/24 19:52:16	1.2
+++ rxvt-unicode/src/rxvtdaemon.C	2004/03/17 05:15:02	1.5
@@ -1,13 +1,33 @@
-#include <unistd.h>
 #include <stdint.h>
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
+
+#include <unistd.h>
+#include <sys/utsname.h>
+#include <limits.h>
 
 #include "rxvtdaemon.h"
 
-const char *rxvt_connection::unix_sockname ()
+char *rxvt_connection::unix_sockname ()
 {
-  return "/tmp/rxvtd~";
+  char name[PATH_MAX];
+  char *path = getenv ("RXVT_SOCKET");
+
+  if (!path)
+    {
+      struct utsname u;
+      uname (&u);
+
+      path = getenv ("HOME");
+      snprintf (name, PATH_MAX, "%s/.rxvt-%s",
+                path ? path : "/tmp",
+                u.nodename);
+
+      path = name;
+    }
+
+  return strdup (path);
 }
 
 void rxvt_connection::send (const char *data, int len)
@@ -57,7 +77,7 @@
 {
   uint8_t s[4];
 
-  s[0] = data >> 24; s[1] = data >> 16; s[0] = data >> 8; s[1] = data;
+  s[0] = data >> 24; s[1] = data >> 16; s[2] = data >> 8; s[3] = data;
 
   write (fd, s, 4);
 }