Revert "replace ioctl syscalls with internal ioctl"

This reverts commit 25fbc06.

Author: cowtoolz

libc/src/termios/linux/tcdrain.cpp

@@ -13,14 +13,19 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, tcdrain, (int fd)) {
-  return LIBC_NAMESPACE::ioctl(fd, TCSBRK, 1);
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCSBRK, 1);
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
+  }
+  return 0;
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/termios/linux/tcflow.cpp

@@ -13,14 +13,19 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, tcflow, (int fd, int action)) {
-  return LIBC_NAMESPACE::ioctl(fd, TCXONC, action);
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCXONC, action);
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
+  }
+  return 0;
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/termios/linux/tcflush.cpp

@@ -13,14 +13,20 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, tcflush, (int fd, int queue_selector)) {
-  return LIBC_NAMESPACE::ioctl(fd, TCFLSH, queue_selector);
+  int ret =
+      LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCFLSH, queue_selector);
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
+  }
+  return 0;
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/termios/linux/tcgetattr.cpp

@@ -14,18 +14,19 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, tcgetattr, (int fd, struct termios *t)) {
   LIBC_NAMESPACE::kernel_termios kt;
-  int ret = LIBC_NAMESPACE::ioctl(fd, TCGETS, &kt);
-  if (ret < 0)
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCGETS, &kt);
+  if (ret < 0) {
+    libc_errno = -ret;
     return -1;
-
+  }
   t->c_iflag = kt.c_iflag;
   t->c_oflag = kt.c_oflag;
   t->c_cflag = kt.c_cflag;

libc/src/termios/linux/tcgetsid.cpp

@@ -13,18 +13,19 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(pid_t, tcgetsid, (int fd)) {
   pid_t sid;
-  int ret = LIBC_NAMESPACE::ioctl(fd, TIOCGSID, &sid);
-  if (ret < 0) 
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TIOCGSID, &sid);
+  if (ret < 0) {
+    libc_errno = -ret;
     return -1;
-    
+  }
   return sid;
 }
 

libc/src/termios/linux/tcsendbreak.cpp

@@ -13,7 +13,7 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
@@ -23,7 +23,12 @@ LLVM_LIBC_FUNCTION(pid_t, tcsendbreak, (int fd, int /* unused duration */)) {
   // POSIX leaves the behavior for non-zero duration implementation dependent.
   // Which means that the behavior can be the same as it is when duration is
   // zero. So, we just pass zero to the syscall.
-  return LIBC_NAMESPACE::ioctl(SYS_ioctl, fd, TCSBRK, 0);
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCSBRK, 0);
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
+  }
+  return 0;
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/termios/linux/tcsetattr.cpp

@@ -14,7 +14,7 @@
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
 
-#include <asm/ioctls.h>  // Safe to include without the risk of name pollution.
+#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
 #include <sys/syscall.h> // For syscall numbers
 #include <termios.h>
 
@@ -52,7 +52,12 @@ LLVM_LIBC_FUNCTION(int, tcsetattr,
       kt.c_cc[i] = 0;
   }
 
-  return LIBC_NAMESPACE::ioctl(fd, cmd, &kt);
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, cmd, &kt);
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
+  }
+  return 0;
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/unistd/linux/isatty.cpp

@@ -23,10 +23,12 @@ LLVM_LIBC_FUNCTION(int, isatty, (int fd)) {
   int line_d_val = INIT_VAL;
   // This gets the line dicipline of the terminal. When called on something that
   // isn't a terminal it doesn't change line_d_val and returns -1.
-  int result = LIBC_NAMESPACE::ioctl(fd, TIOCGETD, &line_d_val);
+  int result =
+      LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TIOCGETD, &line_d_val);
   if (result == 0)
     return 1;
 
+  libc_errno = -result;
   return 0;
 }