--- rxvt-unicode/src/rxvtdaemon.C	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvtdaemon.C	2004/01/17 01:20:01	1.4
@@ -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)
@@ -25,7 +45,7 @@
   send (data, strlen (data));
 }
 
-bool rxvt_connection::recv (char *&data, int *len)
+bool rxvt_connection::recv (auto_str &data, int *len)
 {
   uint8_t s[2];
   int l;
@@ -53,22 +73,6 @@
   return true;
 }
 
-bool rxvt_connection::recv (token &data)
-{
-  char *d;
-  int l;
-
-  if (!recv (d, &l))
-    return false;
-
-  if (l < sizeof (token) - 1)
-    strcpy (data, d);
-
-  delete [] d;
-
-  return l < sizeof (token) - 1;
-}
-
 void rxvt_connection::send (int data)
 {
   uint8_t s[4];