--- rxvt-unicode/src/rxvtdaemon.C	2004/01/17 01:20:01	1.4
+++ rxvt-unicode/src/rxvtdaemon.C	2005/12/25 15:30:29	1.9
@@ -1,14 +1,51 @@
-#include <stdint.h>
+/*--------------------------------*-C-*---------------------------------*
+ * File:	rxvtdaemon.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2004 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"
 
+// 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];
@@ -20,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);
 
@@ -50,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];
@@ -65,7 +102,7 @@
   if (!data)
     return false;
 
-  if (read (fd, data, l) != l)
+  if (read_ (fd, data, l) != l)
     return false;
 
   data[l] = 0;
@@ -77,7 +114,7 @@
 {
   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);
 }
@@ -86,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];