ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtdaemon.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtdaemon.C (file contents):
Revision 1.9 by root, Sun Dec 25 15:30:29 2005 UTC vs.
Revision 1.22 by sf-exg, Thu May 24 15:03:47 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtdaemon.C 2 * File: rxvtdaemon.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include <cstdlib> 23#include <stdlib.h>
24#include <cstring> 24#include <string.h>
25#include <cstdio> 25#include <stdio.h>
26 26
27#include <inttypes.h> 27#include <inttypes.h>
28#include <unistd.h> 28#include <unistd.h>
29#include <errno.h> 29#include <errno.h>
30#include <sys/stat.h>
30#include <sys/types.h> 31#include <sys/types.h>
31#include <sys/utsname.h> 32#include <sys/utsname.h>
32#include <limits.h>
33 33
34#include "rxvtdaemon.h" 34#include "rxvtdaemon.h"
35
36// works around linux kernel bug, returns EAGAIN on a blocking socket
37static ssize_t
38read_ (int fd, void *buf, size_t count)
39{
40 int ret;
41
42 do
43 ret = read (fd, buf, count);
44 while (ret < 0 && errno == EAGAIN);
45
46 return ret;
47}
48 35
49char *rxvt_connection::unix_sockname () 36char *rxvt_connection::unix_sockname ()
50{ 37{
51 char name[PATH_MAX]; 38 char name[PATH_MAX];
52 char *path = getenv ("RXVT_SOCKET"); 39 char *path = getenv ("RXVT_SOCKET");
… …
55 { 42 {
56 struct utsname u; 43 struct utsname u;
57 uname (&u); 44 uname (&u);
58 45
59 path = getenv ("HOME"); 46 path = getenv ("HOME");
47 if (!path)
48 path = "/tmp";
49
50 snprintf (name, PATH_MAX, "%s/.urxvt", path);
51 mkdir (name, 0777);
52
60 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s", 53 snprintf (name, PATH_MAX, "%s/.urxvt/urxvtd-%s",
61 path ? path : "/tmp", 54 path,
62 u.nodename); 55 u.nodename);
63 56
64 path = name; 57 path = name;
65 } 58 }
66 59
… …
68} 61}
69 62
70void rxvt_connection::send (const char *data, int len) 63void rxvt_connection::send (const char *data, int len)
71{ 64{
72 uint8_t s[2]; 65 uint8_t s[2];
66
67 if (len > 65535)
68 len = 65535;
73 69
74 s[0] = len >> 8; s[1] = len; 70 s[0] = len >> 8; s[1] = len;
75 71
76 write (fd, s, 2); 72 write (fd, s, 2);
77 write (fd, data, len); 73 write (fd, data, len);
… …
85bool rxvt_connection::recv (auto_str &data, int *len) 81bool rxvt_connection::recv (auto_str &data, int *len)
86{ 82{
87 uint8_t s[2]; 83 uint8_t s[2];
88 int l; 84 int l;
89 85
90 if (read_ (fd, s, 2) != 2) 86 if (read (fd, s, 2) != 2)
91 return false; 87 return false;
92 88
93 l = (s[0] << 8) + s[1]; 89 l = (s[0] << 8) + s[1];
94 if (l > 4096) 90 if (l > 65535)
95 return false; 91 return false;
96 92
97 if (len) 93 if (len)
98 *len = l; 94 *len = l;
99 95
100 data = new char[l + 1]; 96 data = (char *)malloc (l + 1);
101 97
102 if (!data) 98 if (!data)
103 return false; 99 return false;
104 100
105 if (read_ (fd, data, l) != l) 101 if (read (fd, data, l) != l)
106 return false; 102 return false;
107 103
108 data[l] = 0; 104 data[l] = 0;
109 105
110 return true; 106 return true;
… …
121 117
122bool rxvt_connection::recv (int &data) 118bool rxvt_connection::recv (int &data)
123{ 119{
124 uint8_t s[4]; 120 uint8_t s[4];
125 121
126 if (read_ (fd, s, 4) != 4) 122 if (read (fd, s, 4) != 4)
127 return false; 123 return false;
128 124
129 data = (((((s[0] << 8) | s[1]) << 8) | s[2]) << 8) | s[3]; 125 data = (((((s[0] << 8) | s[1]) << 8) | s[2]) << 8) | s[3];
130 126
131 return true; 127 return true;

Diff Legend

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