diff options
| author | Roland McGrath <roland@gnu.org> | 1996-02-16 02:19:52 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-02-16 02:19:52 +0000 |
| commit | 9e3db9cd59f37a5a591ac341833508b4ba6b4f8d (patch) | |
| tree | 1a9a9926dd575e3b73078873e356a958742c1f8e /hurd/hurd | |
| parent | a1c46301bb74628aba2d86340024159f6f5d344a (diff) | |
| download | glibc-9e3db9cd59f37a5a591ac341833508b4ba6b4f8d.tar.gz glibc-9e3db9cd59f37a5a591ac341833508b4ba6b4f8d.tar.xz glibc-9e3db9cd59f37a5a591ac341833508b4ba6b4f8d.zip | |
Thu Feb 15 13:57:08 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> cvs/libc-960216
* mach/Machrules: Use -include for $(*.ir). * hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS): Mask off type bits in request values. * sysdeps/mach/hurd/ioctls.h (_IOC_NOTYPE): New macro. (_IOT_COUNT2): Field is 3 bits, not 2. * sysdeps/mach/hurd/ioctl.c: Ignore handler if it fails with ENOTTY. * hurd/hurdioctl.c (_hurd_lookup_ioctl_handler): Mask off type bits before looking up handler. (fioctl): Use __hurd_dfail. (fioctl, fioclex): Use ENOTTY for bogus request instead of EGRATUITOUS. Wed Feb 14 00:21:17 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/alpha/memchr.c (memchr): loop searching for matching character bailed out one too early; changed constant 6 to 7 to fix this.
Diffstat (limited to 'hurd/hurd')
| -rw-r--r-- | hurd/hurd/ioctl.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h index 518ef51b33..431b3be425 100644 --- a/hurd/hurd/ioctl.h +++ b/hurd/hurd/ioctl.h @@ -1,5 +1,5 @@ /* User-registered handlers for specific `ioctl' requests. -Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995, 1996 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 @@ -22,6 +22,7 @@ Cambridge, MA 02139, USA. */ #define __need___va_list #include <stdarg.h> +#include <ioctls.h> /* Type of handler function, called like ioctl to do its entire job. */ @@ -30,7 +31,8 @@ typedef int (*ioctl_handler_t) (int fd, int request, void *arg); /* Structure that records an ioctl handler. */ struct ioctl_handler { - int first_request, last_request; /* Range of handled request values. */ + /* Range of handled _IOC_NOTYPE (REQUEST) values. */ + int first_request, last_request; /* Handler function, called like ioctl to do its entire job. */ ioctl_handler_t handler; @@ -54,7 +56,8 @@ extern int hurd_register_ioctl_handler (int first_request, int last_request, #define _HURD_HANDLE_IOCTLS(handler, first, last) \ static const struct ioctl_handler handler##_ioctl_handler \ __attribute__ ((__unused__)) = \ - { (first), (last), (int (*) (int, int, void *)) (handler), NULL }; \ + { _IOC_NOTYPE (first), _IOC_NOTYPE (last), \ + (int (*) (int, int, void *)) (handler), NULL }; \ text_set_element (_hurd_ioctl_handler_lists, ##handler##_ioctl_handler) /* Define a library-internal handler for a single ioctl command. */ |