/* ioctl commands which must be done in the C library.
- Copyright (C) 1994,95,96,97,99,2001 Free Software Foundation, Inc.
+ Copyright (C) 1994,95,96,97,99,2001,2002,2009,2010
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include <hurd.h>
#include <hurd/fd.h>
#include <sys/ioctl.h>
#include <hurd/ioctl.h>
-
+#include <string.h>
/* Symbol set of ioctl handler lists. If there are user-registered
for (i = 0; i < _hurd_dtablesize; ++i)
{
struct hurd_fd *const d = _hurd_dtable[i];
- mach_port_t newctty;
+ mach_port_t newctty = MACH_PORT_NULL;
if (d == NULL)
/* Nothing to do for an unused descriptor cell. */
continue;
- if (cttyid == MACH_PORT_NULL)
- /* We now have no controlling tty at all. */
- newctty = MACH_PORT_NULL;
- else
+ if (cttyid != MACH_PORT_NULL)
+ /* We do have some controlling tty. */
HURD_PORT_USE (&d->port,
({ mach_port_t id;
/* Get the io object's cttyid port. */
if (! __term_getctty (port, &id))
{
- if (id == cttyid && /* Is it ours? */
+ if (id == cttyid /* Is it ours? */
/* Get the ctty io port. */
- __term_open_ctty (port,
- _hurd_pid, _hurd_pgrp,
- &newctty))
+ && __term_open_ctty (port,
+ _hurd_pid, _hurd_pgrp,
+ &newctty))
/* XXX it is our ctty but the call failed? */
newctty = MACH_PORT_NULL;
- __mach_port_deallocate
- (__mach_task_self (), (mach_port_t) id);
+ __mach_port_deallocate (__mach_task_self (), id);
}
- else
- newctty = MACH_PORT_NULL;
0;
}));
}
-/* Make FD be the controlling terminal.
- This function is called for `ioctl (fd, TCIOSCTTY)'. */
-
-static int
-tiocsctty (int fd,
- int request) /* Always TIOCSCTTY. */
+static inline error_t
+do_tiocsctty (io_t port, io_t ctty)
{
mach_port_t cttyid;
error_t err;
- /* Get FD's cttyid port, unless it is already ours. */
- err = HURD_DPORT_USE (fd, ctty != MACH_PORT_NULL ? EADDRINUSE :
- __term_getctty (port, &cttyid));
- if (err == EADDRINUSE)
- /* FD is already the ctty. Nothing to do. */
+ if (ctty != MACH_PORT_NULL)
+ /* PORT is already the ctty. Nothing to do. */
return 0;
- else if (err)
- return __hurd_fail (err);
+
+ /* Get PORT's cttyid port. */
+ err = __term_getctty (port, &cttyid);
+ if (err)
+ return err;
/* Change the terminal's pgrp to ours. */
- err = HURD_DPORT_USE (fd, __tioctl_tiocspgrp (port, _hurd_pgrp));
+ err = __tioctl_tiocspgrp (port, _hurd_pgrp);
if (err)
- return __hurd_fail (err);
+ __mach_port_deallocate (__mach_task_self (), cttyid);
+ else
+ /* Make it our own. */
+ install_ctty (cttyid);
- /* Make it our own. */
- install_ctty (cttyid);
+ return err;
+}
- return 0;
+/* Make FD be the controlling terminal.
+ This function is called for `ioctl (fd, TCIOSCTTY)'. */
+
+static int
+tiocsctty (int fd,
+ int request) /* Always TIOCSCTTY. */
+{
+ return __hurd_fail (HURD_DPORT_USE (fd, do_tiocsctty (port, ctty)));
}
_HURD_HANDLE_IOCTL (tiocsctty, TIOCSCTTY);
siocgifconf (int fd, int request, struct ifconf *ifc)
{
error_t err;
- int data_len = ifc->ifc_len;
+ size_t data_len = ifc->ifc_len;
char *data = ifc->ifc_buf;
if (data_len <= 0)