Module Name: src
Committed By: njoly
Date: Tue Nov 15 14:13:18 UTC 2011
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
Fix pipe2 return value.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/compat/netbsd32/netbsd32_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.174 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.175
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.174 Tue Nov 8 10:59:12 2011
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Nov 15 14:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.174 2011/11/08 10:59:12 njoly Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.175 2011/11/15 14:13:17 njoly Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.174 2011/11/08 10:59:12 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.175 2011/11/15 14:13:17 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -2579,12 +2579,18 @@ netbsd32_pipe2(struct lwp *l, const stru
int fd[2], error;
error = pipe1(l, retval, SCARG(uap, flags));
- if (error)
+ if (error != 0)
return error;
fd[0] = retval[0];
fd[1] = retval[1];
- return copyout(fd, SCARG_P32(uap, fildes), sizeof(fd));
+
+ error = copyout(fd, SCARG_P32(uap, fildes), sizeof(fd));
+ if (error != 0)
+ return error;
+
+ retval[0] = 0;
+ return 0;
}
int
