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.6 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.11 by root, Wed Jan 11 00:59:58 2006 UTC

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 <stdint.h>
24#include <cstdlib> 23#include <cstdlib>
25#include <cstring> 24#include <cstring>
26#include <cstdio> 25#include <cstdio>
27 26
27#include <inttypes.h>
28#include <unistd.h> 28#include <unistd.h>
29#include <errno.h>
30#include <sys/types.h>
29#include <sys/utsname.h> 31#include <sys/utsname.h>
30#include <limits.h> 32#include <limits.h>
31 33
32#include "rxvtdaemon.h" 34#include "rxvtdaemon.h"
33 35
40 { 42 {
41 struct utsname u; 43 struct utsname u;
42 uname (&u); 44 uname (&u);
43 45
44 path = getenv ("HOME"); 46 path = getenv ("HOME");
45 snprintf (name, PATH_MAX, "%s/.rxvt-%s", 47 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
46 path ? path : "/tmp", 48 path ? path : "/tmp",
47 u.nodename); 49 u.nodename);
48 50
49 path = name; 51 path = name;
50 } 52 }
53} 55}
54 56
55void rxvt_connection::send (const char *data, int len) 57void rxvt_connection::send (const char *data, int len)
56{ 58{
57 uint8_t s[2]; 59 uint8_t s[2];
60
61 if (len > 65535)
62 len = 65535;
58 63
59 s[0] = len >> 8; s[1] = len; 64 s[0] = len >> 8; s[1] = len;
60 65
61 write (fd, s, 2); 66 write (fd, s, 2);
62 write (fd, data, len); 67 write (fd, data, len);
74 79
75 if (read (fd, s, 2) != 2) 80 if (read (fd, s, 2) != 2)
76 return false; 81 return false;
77 82
78 l = (s[0] << 8) + s[1]; 83 l = (s[0] << 8) + s[1];
79 if (l > 4096) 84 if (l > 65535)
80 return false; 85 return false;
81 86
82 if (len) 87 if (len)
83 *len = l; 88 *len = l;
84 89

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines