ioctl: Fix for MacOS X in 64-bit mode.

* lib/ioctl.c (rpl_ioctl): Zero-extend, not sign-extend, the request
value.
Suggested by Eric Blake.
Reported by Markus Gothe <nietzsche@lysator.liu.se>.

diff --git a/ChangeLog b/ChangeLog
index ee86ca938f902549374034362cce908a353e65a8..f2e9ee0a8f8182cd962c3f18b113bc843ea13671 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-22  Bruno Haible  <bruno@clisp.org>
+
+       ioctl: Fix for MacOS X in 64-bit mode.
+       * lib/ioctl.c (rpl_ioctl): Zero-extend, not sign-extend, the request
+       value.
+       Suggested by Eric Blake.
+       Reported by Markus Gothe <nietzsche@lysator.liu.se>.
+
 2011-02-22  Jim Meyering  <meyering@redhat.com>
 
        maint: sc_cpp_indent_check: remove the "only in lib/" restriction

diff --git a/lib/ioctl.c b/lib/ioctl.c
index 72f9f37b18ff53a761d50d6264ad9834e2db7869..7c09d95b49c8aa313b67fca486bfe68ba7713565 100644 (file)
--- a/lib/ioctl.c
+++ b/lib/ioctl.c
@@ -37,7 +37,9 @@ rpl_ioctl (int fd, int request, ... /* {void *,char *} arg */)
   buf = va_arg (args, void *);
   va_end (args);
 
-  return ioctl (fd, request, buf);
+  /* Cast 'request' so that when the system's ioctl function takes a 64-bit
+     request argument, the value gets zero-extended, not sign-extended.  */
+  return ioctl (fd, (unsigned int) request, buf);
 }
 
 #else /* mingw */