Commit 7281be58 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

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



This is the location regular userspace expects this definition.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250515-nolibc-sys-v1-1-74f82eea3b59@weissschuh.net
parent 59303930

tools/include/nolibc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ all_files := \ 
		string.h \

		sys.h \

		sys/auxv.h \

		sys/ioctl.h \

		sys/mman.h \

		sys/random.h \

		sys/stat.h \

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#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

+0 −12
Original line number Diff line number Diff line
@@ -517,18 +517,6 @@ uid_t getuid(void) 
}





/*

 * 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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * Ioctl definitions for NOLIBC

 * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>

 */



/* 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 */