… | |
… | |
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.reset ((char *)malloc (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; |