oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(try_pipe): return -1 if I_PUSH fails with ENOSYS

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5167 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-09-28 16:04:02 +00:00
parent 349c79a7e7
commit c12b1910b2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
appl/kx/common.c
View File

@@ -186,7 +186,7 @@ try_pipe (struct x_socket *s, int dpy, const char *pattern)
int ret;
int fd;
int pipefd[2];
snprintf (path, sizeof(path), pattern, dpy);
fd = open (path, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0)
@@ -202,8 +202,11 @@ try_pipe (struct x_socket *s, int dpy, const char *pattern)
err (1, "pipe");
ret = ioctl (pipefd[1], I_PUSH, "connld");
if (ret < 0)
if (ret < 0) {
if(errno == ENOSYS)
return -1;
err (1, "ioctl I_PUSH");
}
ret = fattach (pipefd[1], path);
if (ret < 0)
@@ -334,7 +337,7 @@ get_xsockets (int *number, struct x_socket **sockets, int tcp_socket)
for (path = x_pipes; *path; ++path) {
tmp = try_pipe (&s[n], dpy, *path);
if (tmp == -1) {
if (errno != ENOTDIR && errno != ENOENT)
if (errno != ENOTDIR && errno != ENOENT && errno != ENOSYS)
return -1;
} else if (tmp == 1) {
while (--n >= 0) {