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.9 by root, Sun Dec 25 15:30:29 2005 UTC

1#include <unistd.h> 1/*--------------------------------*-C-*---------------------------------*
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-2004 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 () 36// works around linux kernel bug, returns EAGAIN on a blocking socket
37static ssize_t
38read_ (int fd, void *buf, size_t count)
9{ 39{
10 return "/tmp/rxvtd~"; 40 int ret;
41
42 do
43 ret = read (fd, buf, count);
44 while (ret < 0 && errno == EAGAIN);
45
46 return ret;
47}
48
49char *rxvt_connection::unix_sockname ()
50{
51 char name[PATH_MAX];
52 char *path = getenv ("RXVT_SOCKET");
53
54 if (!path)
55 {
56 struct utsname u;
57 uname (&u);
58
59 path = getenv ("HOME");
60 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
61 path ? path : "/tmp",
62 u.nodename);
63
64 path = name;
65 }
66
67 return strdup (path);
11} 68}
12 69
13void rxvt_connection::send (const char *data, int len) 70void rxvt_connection::send (const char *data, int len)
14{ 71{
15 uint8_t s[2]; 72 uint8_t s[2];
… …
28bool rxvt_connection::recv (auto_str &data, int *len) 85bool rxvt_connection::recv (auto_str &data, int *len)
29{ 86{
30 uint8_t s[2]; 87 uint8_t s[2];
31 int l; 88 int l;
32 89
33 if (read (fd, s, 2) != 2) 90 if (read_ (fd, s, 2) != 2)
34 return false; 91 return false;
35 92
36 l = (s[0] << 8) + s[1]; 93 l = (s[0] << 8) + s[1];
37 if (l > 4096) 94 if (l > 4096)
38 return false; 95 return false;
… …
43 data = new char[l + 1]; 100 data = new char[l + 1];
44 101
45 if (!data) 102 if (!data)
46 return false; 103 return false;
47 104
48 if (read (fd, data, l) != l) 105 if (read_ (fd, data, l) != l)
49 return false; 106 return false;
50 107
51 data[l] = 0; 108 data[l] = 0;
52 109
53 return true; 110 return true;
… …
55 112
56void rxvt_connection::send (int data) 113void rxvt_connection::send (int data)
57{ 114{
58 uint8_t s[4]; 115 uint8_t s[4];
59 116
60 s[0] = data >> 24; s[1] = data >> 16; s[0] = data >> 8; s[1] = data; 117 s[0] = data >> 24; s[1] = data >> 16; s[2] = data >> 8; s[3] = data;
61 118
62 write (fd, s, 4); 119 write (fd, s, 4);
63} 120}
64 121
65bool rxvt_connection::recv (int &data) 122bool rxvt_connection::recv (int &data)
66{ 123{
67 uint8_t s[4]; 124 uint8_t s[4];
68 125
69 if (read (fd, s, 4) != 4) 126 if (read_ (fd, s, 4) != 4)
70 return false; 127 return false;
71 128
72 data = (((((s[0] << 8) | s[1]) << 8) | s[2]) << 8) | s[3]; 129 data = (((((s[0] << 8) | s[1]) << 8) | s[2]) << 8) | s[3];
73 130
74 return true; 131 return true;

Diff Legend

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