[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtdaemon.C

Comparing rxvt-unicode/src/rxvtdaemon.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.3 by pcg, Thu Nov 27 10:12:10 2003 UTC

-#include <unistd.h>
 #include <stdint.h>
 #include <cstdlib>
 #include <cstring>
+#include <unistd.h>
+#include <sys/utsname.h>
+#include <limits.h>
 #include "rxvtdaemon.h"
-const char *rxvt_connection::unix_sockname ()
+char *rxvt_connection::unix_sockname ()
 {
-  return "/tmp/rxvtd~";
+  char name[PATH_MAX];
+  char *path = getenv ("RXVT_SOCKET");
+  if (!path)
+    {
+      struct utsname u;
+      uname (&u);
+      path = getenv ("HOME");
+      snprintf (name, PATH_MAX, "%s/.rxvt-%s",
+                path ? path : "/tmp",
+                u.nodename);
+      path = name;
+    }
+  return strdup (path);
 }
 void rxvt_connection::send (const char *data, int len)
 {
   uint8_t s[2];
 void rxvt_connection::send (const char *data)
 {
   send (data, strlen (data));
 }
-bool rxvt_connection::recv (char *&data, int *len)
+bool rxvt_connection::recv (auto_str &data, int *len)
 {
   uint8_t s[2];
   int l;
   if (read (fd, s, 2) != 2)
   data[l] = 0;
   return true;
 }
-bool rxvt_connection::recv (token &data)
-{
-  char *d;
-  int l;
-  if (!recv (d, &l))
-    return false;
-  if (l < sizeof (token) - 1)
-    strcpy (data, d);
-  delete [] d;
-  return l < sizeof (token) - 1;
-}
 void rxvt_connection::send (int data)
 {
   uint8_t s[4];
   s[0] = data >> 24; s[1] = data >> 16; s[0] = data >> 8; s[1] = data;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines