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.3 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.9 by root, Sun Dec 25 15:30:29 2005 UTC

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

Diff Legend

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