--- rxvt-unicode/src/rxvtdaemon.C	2004/07/29 15:25:43	1.7
+++ rxvt-unicode/src/rxvtdaemon.C	2005/12/25 15:30:29	1.9
@@ -26,11 +26,26 @@
 
 #include <inttypes.h>
 #include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
 #include <limits.h>
 
 #include "rxvtdaemon.h"
 
+// works around linux kernel bug, returns EAGAIN on a blocking socket
+static ssize_t
+read_ (int fd, void *buf, size_t count)
+{
+  int ret;
+
+  do
+    ret = read (fd, buf, count);
+  while (ret < 0 && errno == EAGAIN);
+
+  return ret;
+}
+
 char *rxvt_connection::unix_sockname ()
 {
   char name[PATH_MAX];
@@ -42,7 +57,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);
 
@@ -72,7 +87,7 @@
   uint8_t s[2];
   int l;
 
-  if (read (fd, s, 2) != 2)
+  if (read_ (fd, s, 2) != 2)
     return false;
 
   l = (s[0] << 8) + s[1];
@@ -87,7 +102,7 @@
   if (!data)
     return false;
 
-  if (read (fd, data, l) != l)
+  if (read_ (fd, data, l) != l)
     return false;
 
   data[l] = 0;
@@ -108,7 +123,7 @@
 {
   uint8_t s[4];
 
-  if (read (fd, s, 4) != 4)
+  if (read_ (fd, s, 4) != 4)
     return false;
 
   data = (((((s[0] << 8) | s[1]) << 8) | s[2]) << 8) | s[3];