tools/nolibc: move ioctl() to sys/ioctl.h

This is the location regular userspace expects this definition.

Signed-off-by: Thomas Weißschuh <[e-mail]>
Acked-by: Willy Tarreau <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]

tools/include/nolibc/Makefile

···
 		string.h \
 		sys.h \
 		sys/auxv.h \
+		sys/ioctl.h \
 		sys/mman.h \
 		sys/random.h \
 		sys/stat.h \

tools/include/nolibc/nolibc.h

···
 #include "types.h"
 #include "sys.h"
 #include "sys/auxv.h"
+#include "sys/ioctl.h"
 #include "sys/mman.h"
 #include "sys/random.h"
 #include "sys/stat.h"

tools/include/nolibc/sys.h

···
 
 
 /*
- * int ioctl(int fd, unsigned long cmd, ... arg);
- */
-
-static __attribute__((unused))
-long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-	return my_syscall3(__NR_ioctl, fd, cmd, arg);
-}
-
-#define ioctl(fd, cmd, arg) __sysret(sys_ioctl(fd, cmd, (unsigned long)(arg)))
-
-/*
  * int kill(pid_t pid, int signal);
  */
 

tools/include/nolibc/sys/ioctl.h

···
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * Ioctl definitions for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <[e-mail]>
+ */
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#ifndef _NOLIBC_SYS_IOCTL_H
+#define _NOLIBC_SYS_IOCTL_H
+
+#include "../sys.h"
+
+#include <linux/ioctl.h>
+
+/*
+ * int ioctl(int fd, unsigned long cmd, ... arg);
+ */
+
+static __attribute__((unused))
+long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
+{
+	return my_syscall3(__NR_ioctl, fd, cmd, arg);
+}
+
+#define ioctl(fd, cmd, arg) __sysret(sys_ioctl(fd, cmd, (unsigned long)(arg)))
+
+#endif /* _NOLIBC_SYS_IOCTL_H */