diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-06-22 17:23:24 -0700 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-06-22 17:23:24 -0700 |
| commit | 09bb53675d4f606eb5c65c3876e23280387f4fb1 (patch) | |
| tree | c163bbe57a6d610e6c5c188e903051cc02fa85ff /usr/src | |
| parent | b97d6ca7333c353b6ca20c20c99fb1be8d32a8de (diff) | |
| download | illumos-gate-09bb53675d4f606eb5c65c3876e23280387f4fb1.tar.gz | |
2062 libbc uname() deals with nodename/nodeext distastefully
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libbc/libc/sys/common/uname.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/usr/src/lib/libbc/libc/sys/common/uname.c b/usr/src/lib/libbc/libc/sys/common/uname.c index ef09e18f63..3d890a5ce9 100644 --- a/usr/src/lib/libbc/libc/sys/common/uname.c +++ b/usr/src/lib/libbc/libc/sys/common/uname.c @@ -24,23 +24,21 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <errno.h> #include <string.h> #include <sys/utsname.h> #include <sys/syscall.h> -/* +/* * utsname structure has a different format in SVr4/SunOS 5.0. * The data needs to be mapped before returning to the user. */ -/* +/* * The following values and structure are from the SVR4 utsname.h. */ #define NEW_SYS_NMLN 257 -#define SYS_NMLN 9 +#define SYS_NMLN 9 #define SYS_NDLN 65 struct n_utsname { @@ -51,14 +49,14 @@ struct n_utsname { char machine[NEW_SYS_NMLN]; }; -int uname( uts ) -register struct utsname *uts; /* where to put results */ +int +uname(struct utsname *uts) { - return(bc_uname(uts)); + return (bc_uname(uts)); } -int bc_uname( uts ) -struct utsname *uts; +int +bc_uname(struct utsname *uts) { struct n_utsname n_uts; int ret; @@ -67,9 +65,18 @@ struct utsname *uts; memcpy(uts->sysname, n_uts.sysname, SYS_NMLN); if (strlen(n_uts.sysname) > SYS_NMLN) uts->sysname[SYS_NMLN-1] = '\0'; - memcpy(uts->nodename, n_uts.nodename, SYS_NDLN); + + /* + * The nodename was originally 9 bytes (including NUL), but a + * field was added, following it, extending it to SYS_NDLN. + * So we have to copy it in two passes + */ + memcpy(uts->nodename, n_uts.nodename, SYS_NMLN); + memcpy(uts->nodeext, n_uts.nodename + SYS_NMLN, + SYS_NDLN - SYS_NMLN); if (strlen(n_uts.nodename) > SYS_NDLN) - uts->nodename[SYS_NDLN-1] = '\0'; + uts->nodeext[sizeof (uts->nodeext) - 1] = '\0'; + memcpy(uts->release, n_uts.release, SYS_NMLN); if (strlen(n_uts.release) > SYS_NMLN) uts->release[SYS_NMLN-1] = '\0'; @@ -81,5 +88,5 @@ struct utsname *uts; uts->machine[SYS_NMLN-1] = '\0'; } - return(ret); + return (ret); } |