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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.13 by root, Mon Feb 20 22:42:00 2006 UTC

1#include <unistd.h> 1/*----------------------------------------------------------------------*
2#include <stdint.h> 2 * File: rxvtdaemon.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
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
3#include <cstdlib> 23#include <cstdlib>
4#include <cstring> 24#include <cstring>
25#include <cstdio>
26
27#include <inttypes.h>
28#include <unistd.h>
29#include <errno.h>
30#include <sys/types.h>
31#include <sys/utsname.h>
32#include <limits.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 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
48 path ? path : "/tmp",
49 u.nodename);
50
51 path = name;
52 }
53
54 return strdup (path);
11} 55}
12 56
13void rxvt_connection::send (const char *data, int len) 57void rxvt_connection::send (const char *data, int len)
14{ 58{
15 uint8_t s[2]; 59 uint8_t s[2];
60
61 if (len > 65535)
62 len = 65535;
16 63
17 s[0] = len >> 8; s[1] = len; 64 s[0] = len >> 8; s[1] = len;
18 65
19 write (fd, s, 2); 66 write (fd, s, 2);
20 write (fd, data, len); 67 write (fd, data, len);
… …
23void rxvt_connection::send (const char *data) 70void rxvt_connection::send (const char *data)
24{ 71{
25 send (data, strlen (data)); 72 send (data, strlen (data));
26} 73}
27 74
28bool rxvt_connection::recv (char *&data, int *len) 75bool rxvt_connection::recv (auto_str &data, int *len)
29{ 76{
30 uint8_t s[2]; 77 uint8_t s[2];
31 int l; 78 int l;
32 79
33 if (read (fd, s, 2) != 2) 80 if (read (fd, s, 2) != 2)
34 return false; 81 return false;
35 82
36 l = (s[0] << 8) + s[1]; 83 l = (s[0] << 8) + s[1];
37 if (l > 4096) 84 if (l > 65535)
38 return false; 85 return false;
39 86
40 if (len) 87 if (len)
41 *len = l; 88 *len = l;
42 89
… …
51 data[l] = 0; 98 data[l] = 0;
52 99
53 return true; 100 return true;
54} 101}
55 102
56bool rxvt_connection::recv (token &data)
57{
58 char *d;
59 int l;
60
61 if (!recv (d, &l))
62 return false;
63
64 if (l < sizeof (token) - 1)
65 strcpy (data, d);
66
67 delete [] d;
68
69 return l < sizeof (token) - 1;
70}
71
72void rxvt_connection::send (int data) 103void rxvt_connection::send (int data)
73{ 104{
74 uint8_t s[4]; 105 uint8_t s[4];
75 106
76 s[0] = data >> 24; s[1] = data >> 16; s[0] = data >> 8; s[1] = data; 107 s[0] = data >> 24; s[1] = data >> 16; s[2] = data >> 8; s[3] = data;
77 108
78 write (fd, s, 4); 109 write (fd, s, 4);
79} 110}
80 111
81bool rxvt_connection::recv (int &data) 112bool rxvt_connection::recv (int &data)

Diff Legend

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