sync

3 files changed, 6 insertions, 65 deletions

diff --git a/sys/compat/common/Makefile.inc b/sys/compat/common/Makefile.inc
index e6f6a879b72..e817400d8c0 100644
--- a/sys/compat/common/Makefile.inc
+++ b/sys/compat/common/Makefile.inc
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1996/05/22 12:01:44 deraadt Exp $
-#	$NetBSD: Makefile.inc,v 1.4 1996/05/11 16:13:31 mycroft Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1996/05/23 08:32:21 deraadt Exp $
+#	$NetBSD: Makefile.inc,v 1.5 1996/05/20 17:23:59 mrg Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
 
diff --git a/sys/compat/common/kern_info_43.c b/sys/compat/common/kern_info_43.c
index 6cb8c297fcc..cd1db21a85a 100644
--- a/sys/compat/common/kern_info_43.c
+++ b/sys/compat/common/kern_info_43.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_info_43.c,v 1.6 1996/05/22 12:01:45 deraadt Exp $	*/
+/*	$OpenBSD: kern_info_43.c,v 1.7 1996/05/23 08:32:22 deraadt Exp $	*/
 /*	$NetBSD: kern_info_43.c,v 1.5 1996/02/04 02:02:22 christos Exp $	*/
 
 /*
@@ -229,65 +229,6 @@ compat_43_sys_getkerninfo(p, v, retval)
 		    kern_sysctl(name, 1, SCARG(uap, where), &size, NULL, 0, p);
 		break;
 
-
-	case KINFO_BSDI_SYSINFO:
-		{
-			size_t len;
-			struct bsdi_si *usi =
-			    (struct bsdi_si *) SCARG(uap, where);
-			struct bsdi_si ksi;
-			char *us = (char *) &usi[1];
-			extern struct timeval boottime;
-			extern char ostype[], osrelease[], machine[],
-			    hostname[], cpu_model[], version[];
-
-			if (usi == NULL) {
-				size = sizeof(ksi) +
-				    strlen(ostype) + strlen(cpu_model) +
-				    strlen(osrelease) + strlen(machine) +
-				    strlen(version) + strlen(hostname) + 6;
-				error = 0;
-				break;
-			}
-
-#define COPY(fld)							\
-			ksi.fld = us - (u_long) usi;			\
-			if ((error = copyoutstr(fld, us, 1024, &len)) != 0)\
-				return error;				\
-			us += len
-
-			COPY(machine);
-			COPY(cpu_model);
-			ksi.ncpu = 1;			/* XXX */
-			ksi.cpuspeed = 40;		/* XXX */
-			ksi.hwflags = 0;		/* XXX */
-			ksi.physmem = ctob(physmem);
-			ksi.usermem = ctob(physmem);	/* XXX */
-			ksi.pagesize = PAGE_SIZE;
-
-			COPY(ostype);
-			COPY(osrelease);
-			ksi.os_revision = NetBSD;	/* XXX */
-			ksi.posix1_version = _POSIX_VERSION;
-			COPY(version);			/* XXX */
-
-			ksi.hz = hz;
-			ksi.profhz = profhz;
-			ksi.ngroups_max = NGROUPS_MAX;
-			ksi.arg_max = ARG_MAX;
-			ksi.open_max = OPEN_MAX;
-			ksi.child_max = CHILD_MAX;
-
-			ksi.boottime = boottime;
-			COPY(hostname);
-
-			size = (us - (char *) &usi[1]) + sizeof(ksi);
-
-			if ((error = copyout(&ksi, usi, sizeof(ksi))) != 0)
-				return error;
-		}
-		break;
-
 	case KINFO_PROC:
 		name[0] = KERN_PROC;
 		name[1] = SCARG(uap, op) & 0xff;
diff --git a/sys/compat/common/tty_43.c b/sys/compat/common/tty_43.c
index 96e32d7af2d..fd60b69c74d 100644
--- a/sys/compat/common/tty_43.c
+++ b/sys/compat/common/tty_43.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: tty_43.c,v 1.3 1996/05/22 12:01:46 deraadt Exp $	*/
-/*	$NetBSD: tty_43.c,v 1.4 1996/05/18 22:17:49 veego Exp $	*/
+/*	$OpenBSD: tty_43.c,v 1.4 1996/05/23 08:32:23 deraadt Exp $	*/
+/*	$NetBSD: tty_43.c,v 1.5 1996/05/20 14:29:17 mark Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -169,7 +169,7 @@ ttcompat(tp, com, data, flag, p)
 		cc[VSTOP] = tc->t_stopc;
 		cc[VEOF] = tc->t_eofc;
 		cc[VEOL] = tc->t_brkc;
-		if (tc->t_brkc == -1)
+		if (tc->t_brkc == (char)-1)
 			cc[VEOL2] = _POSIX_VDISABLE;
 		break;
 	}