--- rxvt-unicode/src/rxvtdaemon.C	2004/07/29 15:25:43	1.7
+++ rxvt-unicode/src/rxvtdaemon.C	2014/11/10 12:14:48	1.25
@@ -1,13 +1,13 @@
-/*--------------------------------*-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 <schmorp@schmorp.de>
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -20,14 +20,16 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include <inttypes.h>
 #include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
-#include <limits.h>
 
 #include "rxvtdaemon.h"
 
@@ -42,8 +44,14 @@
       uname (&u);
 
       path = getenv ("HOME");
-      snprintf (name, PATH_MAX, "%s/.rxvt-%s",
-                path ? path : "/tmp",
+      if (!path)
+        path = "/tmp";
+
+      snprintf (name, PATH_MAX, "%s/.urxvt", path);
+      mkdir (name, 0777);
+
+      snprintf (name, PATH_MAX, "%s/.urxvt/urxvtd-%s",
+                path,
                 u.nodename);
 
       path = name;
@@ -56,6 +64,9 @@
 {
   uint8_t s[2];
 
+  if (len > 65535)
+    len = 65535;
+
   s[0] = len >> 8; s[1] = len;
 
   write (fd, s, 2);
@@ -76,16 +87,13 @@
     return false;
 
   l = (s[0] << 8) + s[1];
-  if (l > 4096)
+  if (l > 65535)
     return false;
 
   if (len)
     *len = l;
 
-  data = new char[l + 1];
-
-  if (!data)
-    return false;
+  data.reset (new char[l + 1]);
 
   if (read (fd, data, l) != l)
     return false;