mescc: Mes C Library: Fix isatty for x86_64.

* lib/linux/ioctl.c (ioctl3): New function.
* include/sys/ioctl.h: Declare it.
* lib/posix/isatty.c (__tcgetattr): Use it.

diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index f26c9f8ea38795e5fe3ef23474cb2fd068157dce..2650929eea811f502c7f0788365d945b5c09a73d 100644 (file)
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -29,6 +29,7 @@
 #define TCGETS 0x5401
 #define TCGETA 0x5405
 int ioctl (int fd, unsigned long request, ...);
 #define TCGETS 0x5401
 #define TCGETA 0x5405
 int ioctl (int fd, unsigned long request, ...);

+int ioctl3 (int fd, unsigned long request, long data);

 
 #endif // ! SYSTEM_LIBC
 
 
 #endif // ! SYSTEM_LIBC
 

diff --git a/lib/linux/ioctl.c b/lib/linux/ioctl.c
index 5e45c8c7ed994355292aee90ccd870851970ec9b..7df28a0b1b56dc45108f8707be39548d79e0e44f 100644 (file)
--- a/lib/linux/ioctl.c
+++ b/lib/linux/ioctl.c
@@ -33,3 +33,10 @@ ioctl (int filedes, unsigned long command, ...)
   va_end (ap);
   return r;
 }
   va_end (ap);
   return r;
 }

+
+int
+ioctl3 (int filedes, unsigned long command, long data)
+{
+  int r = _sys_call3 (SYS_ioctl, filedes, command, data);
+  return r;
+}

diff --git a/lib/posix/isatty.c b/lib/posix/isatty.c
index db2319ec30607d22bf248604c3e401c45359c748..cf983f6ced0070bac586aad8e6011f4e5db49bb6 100644 (file)
--- a/lib/posix/isatty.c
+++ b/lib/posix/isatty.c
@@ -58,7 +58,7 @@ int
 __tcgetattr (int filedes, struct termios *termios_p)
 {
   struct ktermios kernel_termios;
 __tcgetattr (int filedes, struct termios *termios_p)
 {
   struct ktermios kernel_termios;

-  int r = ioctl (filedes, TCGETS, &kernel_termios);
+  int r = ioctl3 (filedes, TCGETS, (long) &kernel_termios);

 
   termios_p->c_iflag = kernel_termios.c_iflag;
   termios_p->c_oflag = kernel_termios.c_oflag;
 
   termios_p->c_iflag = kernel_termios.c_iflag;
   termios_p->c_oflag = kernel_termios.c_oflag;