--- rxvt-unicode/src/rxvtdaemon.C	2004/04/08 20:31:45	1.6
+++ rxvt-unicode/src/rxvtdaemon.C	2007/12/14 02:22:24	1.14
@@ -1,9 +1,9 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	rxvtdaemon.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 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
@@ -20,12 +20,14 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 
-#include <stdint.h>
 #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>
 
@@ -42,7 +44,7 @@
       uname (&u);
 
       path = getenv ("HOME");
-      snprintf (name, PATH_MAX, "%s/.rxvt-%s",
+      snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
                 path ? path : "/tmp",
                 u.nodename);
 
@@ -56,6 +58,9 @@
 {
   uint8_t s[2];
 
+  if (len > 65535)
+    len = 65535;
+
   s[0] = len >> 8; s[1] = len;
 
   write (fd, s, 2);
@@ -76,7 +81,7 @@
     return false;
 
   l = (s[0] << 8) + s[1];
-  if (l > 4096)
+  if (l > 65535)
     return false;
 
   if (len)