Module Name: src
Committed By: jakllsch
Date: Wed Jan 25 21:45:39 UTC 2017
Modified Files:
src/sys/compat/netbsd32: netbsd32_exec.h
Log Message:
Catch netbsd32_copyargs() up to changes in r1.441 src/sys/kern/kern_exec.c
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/netbsd32/netbsd32_exec.h
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_exec.h
diff -u src/sys/compat/netbsd32/netbsd32_exec.h:1.32 src/sys/compat/netbsd32/netbsd32_exec.h:1.33
--- src/sys/compat/netbsd32/netbsd32_exec.h:1.32 Fri Oct 24 21:07:55 2014
+++ src/sys/compat/netbsd32/netbsd32_exec.h Wed Jan 25 21:45:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec.h,v 1.32 2014/10/24 21:07:55 christos Exp $ */
+/* $NetBSD: netbsd32_exec.h,v 1.33 2017/01/25 21:45:39 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -94,13 +94,12 @@ netbsd32_copyargs(struct lwp *l, struct
int envc = arginfo->ps_nenvstr;
int error;
- NETBSD32PTR32(dp, cpp +
+ NETBSD32PTR32(dp, (char *)(cpp +
1 + /* int argc */
argc + /* char *argv[] */
1 + /* \0 */
envc + /* char *env[] */
- 1 + /* \0 */
- /* XXX auxinfo multiplied by ptr size? */
+ 1) + /* \0 */
pack->ep_esch->es_arglen); /* auxinfo */
sp = argp;
