summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/kern_exec.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index bceaca3..3aa48ef 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -134,6 +134,61 @@ sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS)
*/
static const struct execsw **execsw;
+#ifndef _SYS_SYSPROTO_H_
+struct execve_args {
+ char *fname;
+ char **argv;
+ char **envv;
+};
+#endif
+
+/*
+ * MPSAFE
+ */
+int
+execve(td, uap)
+ struct thread *td;
+ struct execve_args /* {
+ char *fname;
+ char **argv;
+ char **envv;
+ } */ *uap;
+{
+
+ return (kern_execve(td, uap->fname, uap->argv, uap->envv, NULL));
+}
+
+#ifndef _SYS_SYSPROTO_H_
+struct __mac_execve_args {
+ char *fname;
+ char **argv;
+ char **envv;
+ struct mac *mac_p;
+};
+#endif
+
+/*
+ * MPSAFE
+ */
+int
+__mac_execve(td, uap)
+ struct thread *td;
+ struct __mac_execve_args /* {
+ char *fname;
+ char **argv;
+ char **envv;
+ struct mac *mac_p;
+ } */ *uap;
+{
+
+#ifdef MAC
+ return (kern_execve(td, uap->fname, uap->argv, uap->envv,
+ uap->mac_p));
+#else
+ return (ENOSYS);
+#endif
+}
+
/*
* In-kernel implementation of execve(). All arguments are assumed to be
* userspace pointers from the passed thread.
@@ -669,61 +724,6 @@ done2:
return (error);
}
-#ifndef _SYS_SYSPROTO_H_
-struct execve_args {
- char *fname;
- char **argv;
- char **envv;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-execve(td, uap)
- struct thread *td;
- struct execve_args /* {
- char *fname;
- char **argv;
- char **envv;
- } */ *uap;
-{
-
- return (kern_execve(td, uap->fname, uap->argv, uap->envv, NULL));
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct __mac_execve_args {
- char *fname;
- char **argv;
- char **envv;
- struct mac *mac_p;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-__mac_execve(td, uap)
- struct thread *td;
- struct __mac_execve_args /* {
- char *fname;
- char **argv;
- char **envv;
- struct mac *mac_p;
- } */ *uap;
-{
-
-#ifdef MAC
- return (kern_execve(td, uap->fname, uap->argv, uap->envv,
- uap->mac_p));
-#else
- return (ENOSYS);
-#endif
-}
-
int
exec_map_first_page(imgp)
struct image_params *imgp;
OpenPOWER on IntegriCloud