sync with 0504; mostly proto changes (some svr4 ioctl changes)

3 files changed, 13 insertions, 6 deletions

diff --git a/sys/compat/freebsd/freebsd_file.c b/sys/compat/freebsd/freebsd_file.c
index d997c2b7447..44c9cbca3a0 100644
--- a/sys/compat/freebsd/freebsd_file.c
+++ b/sys/compat/freebsd/freebsd_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_file.c,v 1.2 1995/11/07 22:27:21 gwr Exp $	*/
+/*	$NetBSD: freebsd_file.c,v 1.3 1996/05/03 17:03:09 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -54,6 +54,8 @@
 
 const char freebsd_emul_path[] = "/emul/freebsd";
 
+static char * convert_from_freebsd_mount_type __P((int));
+
 static char *
 convert_from_freebsd_mount_type(type)
 	int type;
@@ -106,7 +108,7 @@ freebsd_sys_mount(p, v, retval)
 	if ((type = convert_from_freebsd_mount_type(SCARG(uap, type))) == NULL)
 		return ENODEV;
 	s = stackgap_alloc(&sg, MFSNAMELEN + 1);
-	if (error = copyout(type, s, strlen(type) + 1))
+	if ((error = copyout(type, s, strlen(type) + 1)) != 0)
 		return error;
 	SCARG(&bma, type) = s;
 	FREEBSD_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
diff --git a/sys/compat/freebsd/freebsd_misc.c b/sys/compat/freebsd/freebsd_misc.c
index 4692fedc17e..ed8d0f6123f 100644
--- a/sys/compat/freebsd/freebsd_misc.c
+++ b/sys/compat/freebsd/freebsd_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_misc.c,v 1.1 1995/10/10 01:19:33 mycroft Exp $	*/
+/*	$NetBSD: freebsd_misc.c,v 1.2 1996/05/03 17:03:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -78,11 +78,13 @@ freebsd_sys_rtprio(p, v, retval)
 	void *v;
 	register_t *retval;
 {
+#ifdef notyet
 	struct freebsd_sys_rtprio_args /* {
 		syscallarg(int) function;
 		syscallarg(pid_t) pid;
 		syscallarg(struct freebsd_rtprio *) rtp;
 	} */ *uap = v;
+#endif
 
 	return ENOSYS;	/* XXX */
 }
@@ -93,9 +95,11 @@ freebsd_ntp_adjtime(p, v, retval)
 	void *v;
 	register_t *retval;
 {
+#ifdef notyet
 	struct freebsd_ntp_adjtime_args /* {
 		syscallarg(struct freebsd_timex *) tp;
 	} */ *uap = v;
+#endif
 
 	return ENOSYS;	/* XXX */
 }
diff --git a/sys/compat/freebsd/freebsd_ptrace.c b/sys/compat/freebsd/freebsd_ptrace.c
index 424caf59b19..da83623e768 100644
--- a/sys/compat/freebsd/freebsd_ptrace.c
+++ b/sys/compat/freebsd/freebsd_ptrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_ptrace.c,v 1.1 1995/10/10 01:19:34 mycroft Exp $	*/
+/*	$NetBSD: freebsd_ptrace.c,v 1.2 1996/05/03 17:03:12 christos Exp $	*/
 
 /*-
  * Copyright (c) 1994 Christopher G. Demetriou.  All rights reserved.
@@ -126,8 +126,9 @@ freebsd_sys_ptrace(p, v, retval)
 						      retval);
 
 		case FREEBSD_PT_WRITE_U:
-			if (error = freebsd_ptrace_setregs(&fr,
-				SCARG(uap, addr), SCARG(uap, data)))
+			error = freebsd_ptrace_setregs(&fr,
+			    SCARG(uap, addr), SCARG(uap, data));
+			if (error)
 			    return error;
 			freebsd_to_netbsd_ptrace_regs(&fr,
 						&nrp->regs, &nrp->fpregs);