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.5 by pcg, Wed Mar 17 05:15:02 2004 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>
4#include <cstdio> 25#include <cstdio>
5 26
27#include <inttypes.h>
6#include <unistd.h> 28#include <unistd.h>
29#include <errno.h>
30#include <sys/types.h>
7#include <sys/utsname.h> 31#include <sys/utsname.h>
8#include <limits.h> 32#include <limits.h>
9 33
10#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}
11 48
12char *rxvt_connection::unix_sockname () 49char *rxvt_connection::unix_sockname ()
13{ 50{
14 char name[PATH_MAX]; 51 char name[PATH_MAX];
15 char *path = getenv ("RXVT_SOCKET"); 52 char *path = getenv ("RXVT_SOCKET");
… …
18 { 55 {
19 struct utsname u; 56 struct utsname u;
20 uname (&u); 57 uname (&u);
21 58
22 path = getenv ("HOME"); 59 path = getenv ("HOME");
23 snprintf (name, PATH_MAX, "%s/.rxvt-%s", 60 snprintf (name, PATH_MAX, "%s/.rxvt-unicode-%s",
24 path ? path : "/tmp", 61 path ? path : "/tmp",
25 u.nodename); 62 u.nodename);
26 63
27 path = name; 64 path = name;
28 } 65 }
… …
48bool rxvt_connection::recv (auto_str &data, int *len) 85bool rxvt_connection::recv (auto_str &data, int *len)
49{ 86{
50 uint8_t s[2]; 87 uint8_t s[2];
51 int l; 88 int l;
52 89
53 if (read (fd, s, 2) != 2) 90 if (read_ (fd, s, 2) != 2)
54 return false; 91 return false;
55 92
56 l = (s[0] << 8) + s[1]; 93 l = (s[0] << 8) + s[1];
57 if (l > 4096) 94 if (l > 4096)
58 return false; 95 return false;
… …
63 data = new char[l + 1]; 100 data = new char[l + 1];
64 101
65 if (!data) 102 if (!data)
66 return false; 103 return false;
67 104
68 if (read (fd, data, l) != l) 105 if (read_ (fd, data, l) != l)
69 return false; 106 return false;
70 107
71 data[l] = 0; 108 data[l] = 0;
72 109
73 return true; 110 return true;
… …
84 121
85bool rxvt_connection::recv (int &data) 122bool rxvt_connection::recv (int &data)
86{ 123{
87 uint8_t s[4]; 124 uint8_t s[4];
88 125
89 if (read (fd, s, 4) != 4) 126 if (read_ (fd, s, 4) != 4)
90 return false; 127 return false;
91 128
92 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];
93 130
94 return true; 131 return true;

Diff Legend

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