--- rxvt-unicode/src/rxvtdaemon.C	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvtdaemon.C	2006/02/20 22:42:00	1.13
@@ -1,19 +1,66 @@
-#include <unistd.h>
-#include <stdint.h>
+/*----------------------------------------------------------------------*
+ * File:	rxvtdaemon.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
+
+#include <inttypes.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.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-unicode-%s",
+                path ? path : "/tmp",
+                u.nodename);
+
+      path = name;
+    }
+
+  return strdup (path);
 }
 
 void rxvt_connection::send (const char *data, int len)
 {
   uint8_t s[2];
 
+  if (len > 65535)
+    len = 65535;
+
   s[0] = len >> 8; s[1] = len;
 
   write (fd, s, 2);
@@ -25,7 +72,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;
@@ -34,7 +81,7 @@
     return false;
 
   l = (s[0] << 8) + s[1];
-  if (l > 4096)
+  if (l > 65535)
     return false;
 
   if (len)
@@ -53,27 +100,11 @@
   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];
 
-  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);
 }