--- rxvt-unicode/src/fdpass.C 2005/12/23 14:46:34 1.1 +++ rxvt-unicode/src/fdpass.C 2006/01/22 16:36:40 1.9 @@ -1,9 +1,12 @@ -/*--------------------------------*-C-*---------------------------------* +// This file is part of libptytty. Do not make local modifications. +// http://software.schmorp.de/pkg/libptytty + +/*----------------------------------------------------------------------* * File: fdpass.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2005 Marc Lehmann + * Copyright (c) 2005-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,23 +23,20 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *----------------------------------------------------------------------*/ -#include "../config.h" /* NECESSARY */ - -#if ENABLE_FRILLS && HAVE_UNIX_FDPASS +#include "../config.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; @@ -62,11 +62,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; @@ -101,5 +101,3 @@ return *(int *)CMSG_DATA (cmsg); } -#endif -