--- rxvt-unicode/src/fdpass.C 2006/01/13 07:03:48 1.3 +++ rxvt-unicode/src/fdpass.C 2006/01/24 11:35:17 1.10 @@ -1,4 +1,7 @@ -/*--------------------------------*-C-*---------------------------------* +// This file is part of libptytty. Do not make local modifications. +// http://software.schmorp.de/pkg/libptytty + +/*----------------------------------------------------------------------* * File: fdpass.C *----------------------------------------------------------------------* * @@ -21,23 +24,21 @@ *----------------------------------------------------------------------*/ #include "../config.h" -#include "rxvt.h" -#if ENABLE_FRILLS && HAVE_UNIX_FDPASS +#include // needed by freebsd for NULL used in sys/uio.h +#include #include #include -#include "fdpass.h" - -#include //d +#include "libptytty.h" #ifndef CMSG_LEN // CMSG_SPACe && CMSG_LEN are rfc2292 extensions to unix # define CMSG_LEN(len) (sizeof (cmsghdr) + len) #endif -int -rxvt_send_fd (int socket, int fd) +bool +ptytty::send_fd (int socket, int fd) { msghdr msg; iovec iov; @@ -63,11 +64,11 @@ msg.msg_controllen = cmsg->cmsg_len; - return sendmsg (socket, &msg, 0); + return sendmsg (socket, &msg, 0) >= 0; } int -rxvt_recv_fd (int socket) +ptytty::recv_fd (int socket) { msghdr msg; iovec iov; @@ -102,5 +103,3 @@ return *(int *)CMSG_DATA (cmsg); } -#endif -