[hackers] [sbase] Return proper error values in case execvp() fails || sin

From: <git_AT_suckless.org>
Date: Thu, 13 Feb 2014 14:09:05 +0100

commit 43b472601dc0ccefac66cabaf564ce85d6014762
Author: sin <sin_AT_2f30.org>
Date: Thu Feb 13 13:02:12 2014 +0000

    Return proper error values in case execvp() fails

diff --git a/chroot.c b/chroot.c
index 92263c1..9569ad8 100644
--- a/chroot.c
+++ b/chroot.c
_AT_@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "util.h"
_AT_@ -8,7 +9,8 @@ static void usage(void);
 int
 main(int argc, char **argv)
 {
- char *shell[] = { "/bin/sh", "-i", NULL }, *aux;
+ char *shell[] = { "/bin/sh", "-i", NULL }, *aux, *p;
+ int savederrno;
 
         ARGBEGIN {
         default:
_AT_@ -22,18 +24,22 @@ main(int argc, char **argv)
                 shell[0] = aux;
 
         if(chroot(argv[0]) == -1)
- eprintf("chroot: '%s':", argv[0]);
+ eprintf("chroot %s:", argv[0]);
 
         if(chdir("/") == -1)
- eprintf("chroot:");
+ eprintf("chdir:");
 
         if(argc == 1) {
+ p = *shell;
                 execvp(*shell, shell);
         } else {
+ p = 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;
 }
 
Received on Thu Feb 13 2014 - 14:09:05 CET