folkslinux
/
proot
mirror of https://github.com/proot-me/proot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix test-25069c12 and test-25069c13 for new kernels. 

Fix both tests in the same vein as [1].  Note that this behavior had been
changed by Linux's [2], not by glibc as suggested by [1].

[1] 10dd605103
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dcd46d897adb70d63e025f175a00a89797d31a43
This commit is contained in:
Josselin Poiret 2023-04-28 13:55:50 +02:00 committed by Lucas Ramage
parent c5a465e8d6
commit a5ee0b7900
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test-25069c12.c
View File

@ -1,14 +1,15 @@
#include <unistd.h> /* execve(2), */
#include <stdlib.h> /* exit(3), */
#include <unistd.h> /* execv(2), */
#include <stdlib.h> /* exit(3), getenv(3), setenv(3), */
#include <string.h> /* strcmp(3), */
int main(int argc, char *argv[])
{
char *void_array[] = { NULL };
if (argc == 0)
if (getenv("PROC_SELF_EXE") != NULL)
exit(EXIT_SUCCESS);
execve("/proc/self/exe", void_array, void_array);
setenv("PROC_SELF_EXE", "1", 1);
execv("/proc/self/exe", void_array);
exit(EXIT_FAILURE);
}

9
test/test-25069c13.c
View File

@ -1,12 +1,13 @@
#include <unistd.h> /* execve(2), */
#include <stdlib.h> /* exit(3), */
#include <unistd.h> /* execv(2), */
#include <stdlib.h> /* exit(3), getenv(3), setenv(3), */
#include <string.h> /* strcmp(3), */
int main(int argc, char *argv[])
{
if (argc == 0)
if (getenv("PROC_SELF_EXE") != NULL)
exit(EXIT_SUCCESS);
execve("/proc/self/exe", NULL, NULL);
setenv("PROC_SELF_EXE", "1", 1);
execv("/proc/self/exe", NULL);
exit(EXIT_FAILURE);
}