[src/netbsd-1-5]: src/sys/compat/ultrix Pull up 1.59 with approval notice fro...

[nisimura <nisimura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1993610fce03
branches:  netbsd-1-5
changeset: 488608:1993610fce03
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Fri Jul 21 02:38:13 2000 +0000

description:
Pull up 1.59 with approval notice from thorpej.

version[] string was const'ifed.

diffstat:

 sys/compat/ultrix/ultrix_misc.c |  29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diffs (56 lines):

diff -r d0dd45d028bb -r 1993610fce03 sys/compat/ultrix/ultrix_misc.c
--- a/sys/compat/ultrix/ultrix_misc.c   Fri Jul 21 00:23:47 2000 +0000
+++ b/sys/compat/ultrix/ultrix_misc.c   Fri Jul 21 02:38:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ultrix_misc.c,v 1.57 2000/04/28 12:52:52 simonb Exp $  */
+/*     $NetBSD: ultrix_misc.c,v 1.57.4.1 2000/07/21 02:38:13 nisimura Exp $    */
 
 /*
  * Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -132,8 +132,6 @@
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 
-#include <vm/vm.h>                                     /* pmap declarations */
-
 #include <sys/conf.h>                                  /* iszerodev() */
 #include <sys/socketvar.h>                             /* sosetopt() */
 
@@ -445,24 +443,25 @@
 {
        struct ultrix_sys_uname_args *uap = v;
        struct ultrix_utsname sut;
-        char *cp, *dp, *ep;
+       const char *cp;
+       char *dp, *ep;
 
        memset(&sut, 0, sizeof(sut));
 
        strncpy(sut.sysname, ostype, sizeof(sut.sysname) - 1);
        strncpy(sut.nodename, hostname, sizeof(sut.nodename) - 1);
        strncpy(sut.release, osrelease, sizeof(sut.release) - 1);
-        dp = sut.version;
-        ep = &sut.version[sizeof(sut.version) - 1];
-        for (cp = version; *cp && *cp != '('; cp++)
-                ;
-        for (cp++; *cp && *cp != ')' && dp < ep; cp++)
-                *dp++ = *cp;
-        for (; *cp && *cp != '#'; cp++)
-                ;
-        for (; *cp && *cp != ':' && dp < ep; cp++)
-                *dp++ = *cp;
-        *dp = '\0';
+       dp = sut.version;
+       ep = &sut.version[sizeof(sut.version) - 1];
+       for (cp = version; *cp && *cp != '('; cp++)
+               ;
+       for (cp++; *cp && *cp != ')' && dp < ep; cp++)
+               *dp++ = *cp;
+       for (; *cp && *cp != '#'; cp++)
+               ;
+       for (; *cp && *cp != ':' && dp < ep; cp++)
+               *dp++ = *cp;
+       *dp = '\0';
        strncpy(sut.machine, machine, sizeof(sut.machine) - 1);
 
        return copyout((caddr_t)&sut, (caddr_t)SCARG(uap, name),