From 8de1f8b9b5ad238cf0a9754e92d09f719f81ef03 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 24 Mar 2001 04:40:49 +0000 Subject: This is kind of a hack, but it should work. Currently, world is broken because libc/rpc/key_call.c references uname(), and ps/print.c also defines uname(), and ps is linked statically. This leads to a symbol clash. The userland uname(3) kinda sucked anyway as the hostname etc was too short. And since the libc rpc interface now uses the utsname.nodename which gets truncated, I was tempted into doing something about it. Create a new userland uname function, called __xuname() which takes an extra argument that allows you to change the size of the fields. uname() becomes a static inline function in sys/utsname.h that passes the extra argument in. struct utsname has its field members expanded by default now in userland. We still provide a 'uname' externally linkable function for things that either think that they ``know'' the utsname format and assume 32 character strings and bypass the include file, or objects that are linked against old libcs. ie: just about every plausible case that I can think of is covered. Should we ever change the default lengths again, a libc major bump should not be required as the size is now passed to the function. XXX the uname(2) in the kernel is for FreeBSD 1.1 binary compatability! All the uname(3) functions that are exported to userland are actually implemented in libc with sysctl. uname(1) uses sysctl directly and does not call uname(3). PR: bin/4688 --- sys/kern/kern_xxx.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sys/kern/kern_xxx.c') diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 5009db2..4738aa1 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -138,6 +138,14 @@ oquota(p, uap) } #endif /* COMPAT_43 */ +/* + * This is the FreeBSD-1.1 compatable uname(2) interface. These + * days it is done in libc as a wrapper around a bunch of sysctl's. + * This must maintain the old 1.1 binary ABI. + */ +#if SYS_NMLN != 32 +#error "FreeBSD-1.1 uname syscall has been broken" +#endif #ifndef _SYS_SYSPROTO_H_ struct uname_args { struct utsname *name; -- cgit v1.1