… | |
… | |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
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 |
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 |
10 | * the Free Software Foundation; either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
18 | * You should have received a copy of the GNU General Public License |
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 |
19 | * along with this program; if not, write to the Free Software |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | *----------------------------------------------------------------------*/ |
21 | *----------------------------------------------------------------------*/ |
22 | |
22 | |
23 | #include <cstdlib> |
23 | #include <stdlib.h> |
24 | #include <cstring> |
24 | #include <string.h> |
25 | #include <cstdio> |
25 | #include <stdio.h> |
26 | |
26 | |
27 | #include <inttypes.h> |
27 | #include <inttypes.h> |
28 | #include <unistd.h> |
28 | #include <unistd.h> |
29 | #include <errno.h> |
29 | #include <errno.h> |
30 | #include <sys/stat.h> |
30 | #include <sys/stat.h> |
… | |
… | |
34 | #include "rxvtdaemon.h" |
34 | #include "rxvtdaemon.h" |
35 | |
35 | |
36 | char *rxvt_connection::unix_sockname () |
36 | char *rxvt_connection::unix_sockname () |
37 | { |
37 | { |
38 | char name[PATH_MAX]; |
38 | char name[PATH_MAX]; |
39 | char *path = getenv ("RXVT_SOCKET"); |
39 | const char *path = getenv ("RXVT_SOCKET"); |
40 | |
40 | |
41 | if (!path) |
41 | if (!path) |
42 | { |
42 | { |
43 | struct utsname u; |
43 | struct utsname u; |
44 | uname (&u); |
44 | uname (&u); |
… | |
… | |
91 | return false; |
91 | return false; |
92 | |
92 | |
93 | if (len) |
93 | if (len) |
94 | *len = l; |
94 | *len = l; |
95 | |
95 | |
96 | data = new char[l + 1]; |
96 | data.reset (new char[l + 1]); |
97 | |
|
|
98 | if (!data) |
|
|
99 | return false; |
|
|
100 | |
97 | |
101 | if (read (fd, data, l) != l) |
98 | if (read (fd, data, l) != l) |
102 | return false; |
99 | return false; |
103 | |
100 | |
104 | data[l] = 0; |
101 | data[l] = 0; |