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.4 by pcg, Sat Jan 17 01:20:01 2004 UTC vs.
Revision 1.23 by sf-exg, Fri May 25 07:38:05 2012 UTC

1#include <stdint.h> 1/*----------------------------------------------------------------------*
2#include <cstdlib> 2 * File: rxvtdaemon.C
3#include <cstring> 3 *----------------------------------------------------------------------*
4#include <cstdio> 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 *----------------------------------------------------------------------*/
5 22
23#include <stdlib.h>
24#include <string.h>
25#include <stdio.h>
26
27#include <inttypes.h>
6#include <unistd.h> 28#include <unistd.h>
29#include <errno.h>
30#include <sys/stat.h>
31#include <sys/types.h>
7#include <sys/utsname.h> 32#include <sys/utsname.h>
8#include <limits.h>
9 33
10#include "rxvtdaemon.h" 34#include "rxvtdaemon.h"
11 35
12char *rxvt_connection::unix_sockname () 36char *rxvt_connection::unix_sockname ()
13{ 37{
… …
18 { 42 {
19 struct utsname u; 43 struct utsname u;
20 uname (&u); 44 uname (&u);
21 45
22 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
23 snprintf (name, PATH_MAX, "%s/.rxvt-%s", 53 snprintf (name, PATH_MAX, "%s/.urxvt/urxvtd-%s",
24 path ? path : "/tmp", 54 path,
25 u.nodename); 55 u.nodename);
26 56
27 path = name; 57 path = name;
28 } 58 }
29 59
… …
31} 61}
32 62
33void rxvt_connection::send (const char *data, int len) 63void rxvt_connection::send (const char *data, int len)
34{ 64{
35 uint8_t s[2]; 65 uint8_t s[2];
66
67 if (len > 65535)
68 len = 65535;
36 69
37 s[0] = len >> 8; s[1] = len; 70 s[0] = len >> 8; s[1] = len;
38 71
39 write (fd, s, 2); 72 write (fd, s, 2);
40 write (fd, data, len); 73 write (fd, data, len);
… …
52 85
53 if (read (fd, s, 2) != 2) 86 if (read (fd, s, 2) != 2)
54 return false; 87 return false;
55 88
56 l = (s[0] << 8) + s[1]; 89 l = (s[0] << 8) + s[1];
57 if (l > 4096) 90 if (l > 65535)
58 return false; 91 return false;
59 92
60 if (len) 93 if (len)
61 *len = l; 94 *len = l;
62 95
63 data = new char[l + 1]; 96 data.reset ((char *)malloc (l + 1));
64 97
65 if (!data) 98 if (!data)
66 return false; 99 return false;
67 100
68 if (read (fd, data, l) != l) 101 if (read (fd, data, l) != l)
… …
75 108
76void rxvt_connection::send (int data) 109void rxvt_connection::send (int data)
77{ 110{
78 uint8_t s[4]; 111 uint8_t s[4];
79 112
80 s[0] = data >> 24; s[1] = data >> 16; s[0] = data >> 8; s[1] = data; 113 s[0] = data >> 24; s[1] = data >> 16; s[2] = data >> 8; s[3] = data;
81 114
82 write (fd, s, 4); 115 write (fd, s, 4);
83} 116}
84 117
85bool rxvt_connection::recv (int &data) 118bool rxvt_connection::recv (int &data)

Diff Legend

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