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.2 by pcg, Mon Nov 24 19:52:16 2003 UTC vs.
Revision 1.20 by sf-exg, Mon Jan 23 14:29:24 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines