Bandie/grub2-se-verifyserv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Smarter exec error handling

Browse Source
This commit is contained in:
Bandie 2018-03-18 14:37:29 +01:00
parent f37ec9e797
commit 731e893580
Signed by: Bandie
GPG Key ID: C1E133BC65A822DD
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/grub2-se-verifyserv.c
View File

@ -36,6 +36,15 @@ void help(){
"}\n\n", PROGRAM, VRFFILE, VRFFILE); "}\n\n", PROGRAM, VRFFILE, VRFFILE);
} }
void exec_failed(){
fprintf(stderr, "ERROR: It is not possible to execute %s: ", PROGRAM);
if(access(PROGRAM, F_OK)) fprintf(stderr, "It does not exist (in your PATH variable).\n");
else fprintf(stderr, "Access denied. (Are you root?)\n");
if(access(VRFFILE, F_OK) != -1)
unlink(VRFFILE);
exit(EXIT_FAILURE);
}
void sig_handler(int signo){ void sig_handler(int signo){
if(signo == SIGTERM || signo == SIGINT){ if(signo == SIGTERM || signo == SIGINT){
// Unverify // Unverify
@ -69,31 +78,23 @@ int main(int argc, char *argv[]){
if(fork() == 0){ if(fork() == 0){
// Check if program is even executable
if(!access(PROGRAM, F_OK) && !access(PROGRAM, R_OK) && !access(PROGRAM, X_OK)){
// Exec program silently by default // Exec program silently by default
if(!verbose){ if(!verbose){
int fd = open("/dev/null", O_WRONLY | O_CREAT, 0666); int fd = open("/dev/null", O_WRONLY | O_CREAT, 0666);
dup2(fd, 1); dup2(fd, 1);
dup2(fd, 2); dup2(fd, 2);
execlp(PROGRAM, PROGRAM, NULL); if(execlp(PROGRAM, PROGRAM, NULL) < 0){
exec_failed();
}
close(fd); close(fd);
} }
else
execlp(PROGRAM, PROGRAM, NULL);
}
else{ else{
if(execlp(PROGRAM, PROGRAM, NULL) < 0){
fprintf(stderr, "ERROR: It is not possible to execute %s: ", PROGRAM); exec_failed();
if(access(PROGRAM, F_OK)) fprintf(stderr, "It does not exist.\n"); }
else fprintf(stderr, "Access denied. (Are you root?)\n");
return 1;
} }
} }
else { else {
if(verbose) if(verbose)