artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mes C Library: m2/execve.c: Remove specialization.

Browse source 
* lib/linux/execve.c (execve): Cater for M2-Planet.
* lib/m2/execve.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-12-29 19:13:02 +01:00
parent f07856de0f
commit d984618a48
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kaem.run
View file

@ -83,7 +83,7 @@ M2-Planet \
-f lib/linux/ioctl3.c \ -f lib/linux/ioctl3.c \
-f lib/m2/isatty.c \ -f lib/m2/isatty.c \
-f lib/linux/fork.c \ -f lib/linux/fork.c \
-f lib/m2/execve.c \ -f lib/linux/execve.c \
-f lib/m2/execv.c \ -f lib/m2/execv.c \
-f lib/m2/waitpid.c \ -f lib/m2/waitpid.c \
-f lib/linux/gettimeofday.c \ -f lib/linux/gettimeofday.c \

10
lib/linux/execve.c
View file

@ -1,6 +1,6 @@
/* -*-comment-start: "//";comment-end:""-*- /* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software * GNU Mes --- Maxwell Equations of Software
* Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
* *
* This file is part of GNU Mes. * This file is part of GNU Mes.
* *
@ -18,11 +18,15 @@
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>. * along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <mes/lib.h>
#include <linux/syscall.h> #include <linux/syscall.h>
#include <syscall.h> #include <syscall.h>
int int
execve (char const *file_name, char *const argv[], char *const env[]) execve (char const *file_name, char **argv, char **env)
{ {
return _sys_call3 (SYS_execve, (long) file_name, (long) argv, (long) env); long long_file_name = cast_voidp_to_long (file_name);
long long_argv = cast_voidp_to_long (argv);
long long_env = cast_voidp_to_long (env);
return _sys_call3 (SYS_execve, long_file_name, long_argv, long_env);
} }

31
lib/m2/execve.c
View file

@ -1,31 +0,0 @@
/* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software
* Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
*
* This file is part of GNU Mes.
*
* GNU Mes is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* GNU Mes is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
*/
#include <linux/syscall.h>
#include <syscall.h>
int
execve (char const *file_name, char **argv, char **env)
{
long long_file_name = file_name;
long long_argv = argv;
long long_env = env;
return _sys_call3 (SYS_execve, file_name, argv, env);
}

2
simple.make
View file

@ -122,7 +122,7 @@ M2_SOURCES = \
lib/linux/ioctl3.c \ lib/linux/ioctl3.c \
lib/m2/isatty.c \ lib/m2/isatty.c \
lib/linux/fork.c \ lib/linux/fork.c \
lib/m2/execve.c \ lib/linux/execve.c \
lib/m2/execv.c \ lib/m2/execv.c \
lib/m2/waitpid.c \ lib/m2/waitpid.c \
lib/linux/gettimeofday.c \ lib/linux/gettimeofday.c \