midfavila/sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Return proper error values in case execvp() fails

Browse Source
This commit is contained in:
sin 2014-02-13 13:02:12 +00:00
parent 79a913f4e6
commit 43b472601d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chroot.c
View File

@ -1,4 +1,5 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "util.h" #include "util.h"
@ -8,7 +9,8 @@ static void usage(void);
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
char *shell[] = { "/bin/sh", "-i", NULL }, *aux; char *shell[] = { "/bin/sh", "-i", NULL }, *aux, *p;
int savederrno;
ARGBEGIN { ARGBEGIN {
default: default:
@ -22,18 +24,22 @@ main(int argc, char **argv)
shell[0] = aux; shell[0] = aux;
if(chroot(argv[0]) == -1) if(chroot(argv[0]) == -1)
eprintf("chroot: '%s':", argv[0]); eprintf("chroot %s:", argv[0]);
if(chdir("/") == -1) if(chdir("/") == -1)
eprintf("chroot:"); eprintf("chdir:");
if(argc == 1) { if(argc == 1) {
p = *shell;
execvp(*shell, shell); execvp(*shell, shell);
} else { } else {
p = argv[1];
execvp(argv[1], argv+1); execvp(argv[1], argv+1);
} }
eprintf("chroot: '%s':", argv[1]); savederrno = errno;
weprintf("execvp %s:", p);
_exit(savederrno == ENOENT ? 127 : 126);
return EXIT_FAILURE; return EXIT_FAILURE;
} }