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.8 by root, Wed Aug 18 00:34:27 2004 UTC vs.
Revision 1.24 by root, Thu May 22 18:54:33 2014 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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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>
30#include <sys/stat.h>
31#include <sys/types.h>
29#include <sys/utsname.h> 32#include <sys/utsname.h>
30#include <limits.h>
31 33
32#include "rxvtdaemon.h" 34#include "rxvtdaemon.h"
33 35
34char *rxvt_connection::unix_sockname () 36char *rxvt_connection::unix_sockname ()
35{ 37{
… …
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");
47 if (!path)
48 path = "/tmp";
49
50 snprintf (name, PATH_MAX, "%s/.urxvt", path);
51 mkdir (name, 0777);
52
45 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s", 53 snprintf (name, PATH_MAX, "%s/.urxvt/urxvtd-%s",
46 path ? path : "/tmp", 54 path,
47 u.nodename); 55 u.nodename);
48 56
49 path = name; 57 path = name;
50 } 58 }
51 59
… …
53} 61}
54 62
55void rxvt_connection::send (const char *data, int len) 63void rxvt_connection::send (const char *data, int len)
56{ 64{
57 uint8_t s[2]; 65 uint8_t s[2];
66
67 if (len > 65535)
68 len = 65535;
58 69
59 s[0] = len >> 8; s[1] = len; 70 s[0] = len >> 8; s[1] = len;
60 71
61 write (fd, s, 2); 72 write (fd, s, 2);
62 write (fd, data, len); 73 write (fd, data, len);
… …
74 85
75 if (read (fd, s, 2) != 2) 86 if (read (fd, s, 2) != 2)
76 return false; 87 return false;
77 88
78 l = (s[0] << 8) + s[1]; 89 l = (s[0] << 8) + s[1];
79 if (l > 4096) 90 if (l > 65535)
80 return false; 91 return false;
81 92
82 if (len) 93 if (len)
83 *len = l; 94 *len = l;
84 95
85 data = new char[l + 1]; 96 data.reset ((char *)malloc (l + 1));
86 97
87 if (!data) 98 if (!data)
88 return false; 99 return false;
89 100
90 if (read (fd, data, l) != l) 101 if (read (fd, data, l) != l)

Diff Legend

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