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.5 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.16 by sf-exg, Sun May 1 13:54:27 2011 UTC

1#include <stdint.h> 1/*----------------------------------------------------------------------*
2 * File: rxvtdaemon.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 *
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
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
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
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
2#include <cstdlib> 23#include <cstdlib>
3#include <cstring> 24#include <cstring>
4#include <cstdio> 25#include <cstdio>
5 26
27#include <inttypes.h>
6#include <unistd.h> 28#include <unistd.h>
29#include <errno.h>
30#include <sys/types.h>
7#include <sys/utsname.h> 31#include <sys/utsname.h>
8#include <limits.h>
9 32
10#include "rxvtdaemon.h" 33#include "rxvtdaemon.h"
11 34
12char *rxvt_connection::unix_sockname () 35char *rxvt_connection::unix_sockname ()
13{ 36{
18 { 41 {
19 struct utsname u; 42 struct utsname u;
20 uname (&u); 43 uname (&u);
21 44
22 path = getenv ("HOME"); 45 path = getenv ("HOME");
23 snprintf (name, PATH_MAX, "%s/.rxvt-%s", 46 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
24 path ? path : "/tmp", 47 path ? path : "/tmp",
25 u.nodename); 48 u.nodename);
26 49
27 path = name; 50 path = name;
28 } 51 }
31} 54}
32 55
33void rxvt_connection::send (const char *data, int len) 56void rxvt_connection::send (const char *data, int len)
34{ 57{
35 uint8_t s[2]; 58 uint8_t s[2];
59
60 if (len > 65535)
61 len = 65535;
36 62
37 s[0] = len >> 8; s[1] = len; 63 s[0] = len >> 8; s[1] = len;
38 64
39 write (fd, s, 2); 65 write (fd, s, 2);
40 write (fd, data, len); 66 write (fd, data, len);
52 78
53 if (read (fd, s, 2) != 2) 79 if (read (fd, s, 2) != 2)
54 return false; 80 return false;
55 81
56 l = (s[0] << 8) + s[1]; 82 l = (s[0] << 8) + s[1];
57 if (l > 4096) 83 if (l > 65535)
58 return false; 84 return false;
59 85
60 if (len) 86 if (len)
61 *len = l; 87 *len = l;
62 88

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines