[src/trunk]: src/sys/compat/netbsd32 Add support for -current's ELF32 exec fo...

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

details:   https://anonhg.NetBSD.org/src/rev/a0b113ca9ec2
branches:  trunk
changeset: 481808:a0b113ca9ec2
user:      eeh <eeh%NetBSD.org@localhost>
date:      Sun Feb 06 16:45:56 2000 +0000

description:
Add support for -current's ELF32 exec format.

diffstat:

 sys/compat/netbsd32/netbsd32_exec.c   |  5 +++--
 sys/compat/netbsd32/netbsd32_netbsd.c |  6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 232b618b94ce -r a0b113ca9ec2 sys/compat/netbsd32/netbsd32_exec.c
--- a/sys/compat/netbsd32/netbsd32_exec.c       Sun Feb 06 16:43:33 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_exec.c       Sun Feb 06 16:45:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_exec.c,v 1.17 1999/12/30 15:40:45 eeh Exp $   */
+/*     $NetBSD: netbsd32_exec.c,v 1.18 2000/02/06 16:45:56 eeh Exp $   */
 /*     from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
 
 /*
@@ -137,7 +137,8 @@
 
        if (itp[0]) {
                if ((error = emul_find(p, NULL, netbsd32_emul_path,
-                   itp, &bp, 0)))
+                                      itp, &bp, 0)) && 
+                   (error = emul_find(p, NULL, "", itp, &bp, 0)))
                        return error;
                if ((error = copystr(bp, itp, MAXPATHLEN, &i)) != 0)
                        return error;
diff -r 232b618b94ce -r a0b113ca9ec2 sys/compat/netbsd32/netbsd32_netbsd.c
--- a/sys/compat/netbsd32/netbsd32_netbsd.c     Sun Feb 06 16:43:33 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c     Sun Feb 06 16:45:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_netbsd.c,v 1.22 2000/01/31 16:41:20 christos Exp $    */
+/*     $NetBSD: netbsd32_netbsd.c,v 1.23 2000/02/06 16:45:56 eeh Exp $ */
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -1887,11 +1887,11 @@
 
        /* Now check if args & environ fit into new stack */
        if (pack.ep_flags & EXEC_32)
-               len = ((argc + envc + 2 + pack.ep_emul->e_arglen) * sizeof(char *) +
+               len = ((argc + envc + 2 + pack.ep_emul->e_arglen) * sizeof(int) +
                       sizeof(int) + dp + STACKGAPLEN + szsigcode +
                       sizeof(struct ps_strings)) - argp;
        else
-               len = ((argc + envc + 2 + pack.ep_emul->e_arglen) * sizeof(int) +
+               len = ((argc + envc + 2 + pack.ep_emul->e_arglen) * sizeof(char *) +
                       sizeof(int) + dp + STACKGAPLEN + szsigcode +
                       sizeof(struct ps_strings)) - argp;