Commit 0f971358 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: move uname() and friends to sys/utsname.h 



This is the location regular userspace expects these definitions.

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-7-74f82eea3b59@weissschuh.net
parent e1211e22

tools/include/nolibc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ all_files := \ 
		sys/time.h \

		sys/timerfd.h \

		sys/types.h \

		sys/utsname.h \

		sys/wait.h \

		time.h \

		types.h \

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
#include "sys/sysmacros.h"

#include "sys/time.h"

#include "sys/timerfd.h"

#include "sys/utsname.h"

#include "sys/wait.h"

#include "ctype.h"

#include "elf.h"

tools/include/nolibc/sys.h

+0 −27
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/auxvec.h>

#include <linux/fcntl.h> /* for O_* and AT_* */

#include <linux/stat.h>  /* for statx() */

#include <linux/utsname.h>



#include "errno.h"

#include "stdarg.h"
@@ -894,32 +893,6 @@ int umount2(const char *path, int flags) 
}





/*

 * int uname(struct utsname *buf);

 */



struct utsname {

	char sysname[65];

	char nodename[65];

	char release[65];

	char version[65];

	char machine[65];

	char domainname[65];

};



static __attribute__((unused))

int sys_uname(struct utsname *buf)

{

	return my_syscall1(__NR_uname, buf);

}



static __attribute__((unused))

int uname(struct utsname *buf)

{

	return __sysret(sys_uname(buf));

}





/*

 * int unlink(const char *path);

 */

tools/include/nolibc/sys/utsname.h

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

/*

 * Utsname 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_UTSNAME_H

#define _NOLIBC_SYS_UTSNAME_H



#include "../sys.h"



#include <linux/utsname.h>



/*

 * int uname(struct utsname *buf);

 */



struct utsname {

	char sysname[65];

	char nodename[65];

	char release[65];

	char version[65];

	char machine[65];

	char domainname[65];

};



static __attribute__((unused))

int sys_uname(struct utsname *buf)

{

	return my_syscall1(__NR_uname, buf);

}



static __attribute__((unused))

int uname(struct utsname *buf)

{

	return __sysret(sys_uname(buf));

}



#endif /* _NOLIBC_SYS_UTSNAME_H */