--- rxvt-unicode/src/rxvtdaemon.C	2007/12/14 02:22:24	1.14
+++ rxvt-unicode/src/rxvtdaemon.C	2019/06/25 03:35:01	1.26
@@ -3,11 +3,11 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2007 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,23 +20,23 @@
  * 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"
 
 char *rxvt_connection::unix_sockname ()
 {
   char name[PATH_MAX];
-  char *path = getenv ("RXVT_SOCKET");
+  const char *path = getenv ("RXVT_SOCKET");
 
   if (!path)
     {
@@ -44,8 +44,14 @@
       uname (&u);
 
       path = getenv ("HOME");
-      snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%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;
@@ -87,10 +93,7 @@
   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;