Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/svr4 put elf32 specific code from svr4_exec.c to ...
details: https://anonhg.NetBSD.org/src/rev/6c7c362f78cb
branches: trunk
changeset: 499913:6c7c362f78cb
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Fri Dec 01 19:26:26 2000 +0000
description:
put elf32 specific code from svr4_exec.c to separate file svr4_exec_elf32.c
diffstat:
sys/compat/svr4/files.svr4 | 3 +-
sys/compat/svr4/svr4_exec.c | 72 +-----------------------
sys/compat/svr4/svr4_exec_elf32.c | 115 ++++++++++++++++++++++++++++++++++++++
3 files changed, 118 insertions(+), 72 deletions(-)
diffs (230 lines):
diff -r c145281b407d -r 6c7c362f78cb sys/compat/svr4/files.svr4
--- a/sys/compat/svr4/files.svr4 Fri Dec 01 19:25:10 2000 +0000
+++ b/sys/compat/svr4/files.svr4 Fri Dec 01 19:26:26 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.svr4,v 1.11 1999/09/07 06:25:14 christos Exp $
+# $NetBSD: files.svr4,v 1.12 2000/12/01 19:26:26 jdolecek Exp $
#
# Config file description for machine-independent SVR4 compat code.
# Included by ports that need it.
@@ -8,6 +8,7 @@
file compat/svr4/svr4_errno.c compat_svr4
file compat/svr4/svr4_exec.c compat_svr4
+file compat/svr4/svr4_exec_elf32.c compat_svr4 & exec_elf32
file compat/svr4/svr4_fcntl.c compat_svr4
file compat/svr4/svr4_filio.c compat_svr4
file compat/svr4/svr4_ioctl.c compat_svr4
diff -r c145281b407d -r 6c7c362f78cb sys/compat/svr4/svr4_exec.c
--- a/sys/compat/svr4/svr4_exec.c Fri Dec 01 19:25:10 2000 +0000
+++ b/sys/compat/svr4/svr4_exec.c Fri Dec 01 19:26:26 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_exec.c,v 1.35 2000/12/01 12:28:35 jdolecek Exp $ */
+/* $NetBSD: svr4_exec.c,v 1.36 2000/12/01 19:26:26 jdolecek Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -40,23 +40,10 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/exec_elf.h>
-#include <sys/exec.h>
-
-#include <sys/mman.h>
-
-#include <machine/cpu.h>
-#include <machine/reg.h>
#include <compat/svr4/svr4_types.h>
-#include <compat/svr4/svr4_util.h>
#include <compat/svr4/svr4_syscall.h>
-#include <compat/svr4/svr4_exec.h>
#include <compat/svr4/svr4_errno.h>
#include <compat/svr4/svr4_signal.h>
@@ -76,60 +63,3 @@
svr4_sigcode,
svr4_esigcode,
};
-
-void *
-svr4_copyargs(pack, arginfo, stack, argp)
- struct exec_package *pack;
- struct ps_strings *arginfo;
- void *stack;
- void *argp;
-{
- AuxInfo *a;
-
- if (!(a = (AuxInfo *) elf32_copyargs(pack, arginfo, stack, argp)))
- return NULL;
-#ifdef SVR4_COMPAT_SOLARIS2
- if (pack->ep_emul_arg) {
- a->au_type = AT_SUN_UID;
- a->au_v = p->p_ucred->cr_uid;
- a++;
-
- a->au_type = AT_SUN_RUID;
- a->au_v = p->p_cred->ruid;
- a++;
-
- a->au_type = AT_SUN_GID;
- a->au_v = p->p_ucred->cr_gid;
- a++;
-
- a->au_type = AT_SUN_RGID;
- a->au_v = p->p_cred->rgid;
- a++;
- }
-#endif
- return a;
-}
-
-int
-svr4_elf32_probe(p, epp, eh, itp, pos)
- struct proc *p;
- struct exec_package *epp;
- void *eh;
- char *itp;
- vaddr_t *pos;
-{
- const char *bp;
- int error;
- size_t len;
-
- if (itp[0]) {
- if ((error = emul_find(p, NULL, epp->ep_esch->es_emul->e_path,
- itp, &bp, 0)))
- return error;
- if ((error = copystr(bp, itp, MAXPATHLEN, &len)))
- return error;
- free((void *)bp, M_TEMP);
- }
- *pos = SVR4_INTERP_ADDR;
- return 0;
-}
diff -r c145281b407d -r 6c7c362f78cb sys/compat/svr4/svr4_exec_elf32.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/svr4/svr4_exec_elf32.c Fri Dec 01 19:26:26 2000 +0000
@@ -0,0 +1,115 @@
+/* $NetBSD: svr4_exec_elf32.c,v 1.1 2000/12/01 19:26:26 jdolecek Exp $ */
+
+/*-
+ * Copyright (c) 1994 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define ELFSIZE 32 /* XXX should die */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/exec_elf.h>
+#include <sys/exec.h>
+
+#include <sys/mman.h>
+
+#include <machine/cpu.h>
+#include <machine/reg.h>
+
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_exec.h>
+#include <compat/svr4/svr4_errno.h>
+
+void *
+svr4_copyargs(pack, arginfo, stack, argp)
+ struct exec_package *pack;
+ struct ps_strings *arginfo;
+ void *stack;
+ void *argp;
+{
+ AuxInfo *a;
+
+ if (!(a = (AuxInfo *) elf32_copyargs(pack, arginfo, stack, argp)))
+ return NULL;
+#ifdef SVR4_COMPAT_SOLARIS2
+ if (pack->ep_emul_arg) {
+ a->au_type = AT_SUN_UID;
+ a->au_v = p->p_ucred->cr_uid;
+ a++;
+
+ a->au_type = AT_SUN_RUID;
+ a->au_v = p->p_cred->ruid;
+ a++;
+
+ a->au_type = AT_SUN_GID;
+ a->au_v = p->p_ucred->cr_gid;
+ a++;
+
+ a->au_type = AT_SUN_RGID;
+ a->au_v = p->p_cred->rgid;
+ a++;
+ }
+#endif
+ return a;
+}
+
+int
+svr4_elf32_probe(p, epp, eh, itp, pos)
+ struct proc *p;
+ struct exec_package *epp;
+ void *eh;
+ char *itp;
+ vaddr_t *pos;
+{
+ const char *bp;
+ int error;
+ size_t len;
+
+ if (itp[0]) {
+ if ((error = emul_find(p, NULL, epp->ep_esch->es_emul->e_path, itp, &bp, 0)))
+ return error;
+ if ((error = copystr(bp, itp, MAXPATHLEN, &len)))
+ return error;
+ free((void *)bp, M_TEMP);
+ }
+ *pos = SVR4_INTERP_ADDR;
+ return 0;
+}
Home |
Main Index |
Thread Index |
Old Index