bc291dcbd8
When compiled in debug mode, output more info. Also change the insanely stupid "exited successfully" message to something actually sensible.
129 lines
3.0 KiB
C
129 lines
3.0 KiB
C
/*
|
|
luksrku - Tool to remotely unlock LUKS disks using TLS.
|
|
Copyright (C) 2016-2016 Johannes Bauer
|
|
|
|
This file is part of luksrku.
|
|
|
|
luksrku 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; this program is ONLY licensed under
|
|
version 3 of the License, later versions are explicitly excluded.
|
|
|
|
luksrku 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 luksrku; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
Johannes Bauer <JohannesBauer@gmx.de>
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include "exec.h"
|
|
#include "log.h"
|
|
|
|
void argv_dump(const char **argv) {
|
|
int i = 0;
|
|
while (argv[i]) {
|
|
printf(" %2d: '%s'\n", i, argv[i]);
|
|
i++;
|
|
}
|
|
}
|
|
|
|
static int arg_count(const char **argv) {
|
|
int count = 0;
|
|
while (*argv) {
|
|
count++;
|
|
argv++;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
static void argv_free(char** argv) {
|
|
char **cur = argv;
|
|
while (*cur) {
|
|
free(*cur);
|
|
cur++;
|
|
}
|
|
free(argv);
|
|
}
|
|
|
|
static char **argv_dup(const char **argv) {
|
|
int argc = arg_count(argv);
|
|
char **result = calloc(1, sizeof(char*) * (argc + 1));
|
|
if (!result) {
|
|
log_libc(LLVL_ERROR, "malloc(3) failed in argv_dup");
|
|
return NULL;
|
|
}
|
|
|
|
result[argc - 1] = NULL;
|
|
for (int i = 0; i < argc; i++) {
|
|
result[i] = strdup(argv[i]);
|
|
if (!result[i]) {
|
|
log_libc(LLVL_ERROR, "strdup(3) failed in argv_dup");
|
|
argv_free(result);
|
|
return NULL;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
struct runresult_t exec_command(const char **argv) {
|
|
struct runresult_t runresult;
|
|
char **argvcopy = argv_dup(argv);
|
|
|
|
memset(&runresult, 0, sizeof(runresult));
|
|
|
|
pid_t pid = fork();
|
|
if (pid == -1) {
|
|
perror("fork");
|
|
runresult.success = false;
|
|
argv_free(argvcopy);
|
|
return runresult;
|
|
}
|
|
if (pid == 0) {
|
|
/* Child */
|
|
#ifdef DEBUG
|
|
const bool silent = true;
|
|
#else
|
|
const bool silent = false;
|
|
#endif
|
|
if (silent) {
|
|
/* Shut up the child if user did not request debug output */
|
|
close(1);
|
|
close(2);
|
|
}
|
|
execvp(argvcopy[0], argvcopy);
|
|
log_libc(LLVL_ERROR, "Execution of %s in forked child process failed execvp(3)", argvcopy[0]);
|
|
|
|
/* Exec failed, terminate chExec failed, terminate child process
|
|
* (parent will catch this as the return code) */
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
int status;
|
|
if (waitpid(pid, &status, 0) == (pid_t)-1) {
|
|
log_libc(LLVL_ERROR, "exec_command %s failed executing waitpid(2)", argvcopy[0]);
|
|
runresult.success = false;
|
|
runresult.returncode = -1;
|
|
} else {
|
|
runresult.success = true;
|
|
runresult.returncode = WEXITSTATUS(status);
|
|
}
|
|
argv_free(argvcopy);
|
|
log_msg(LLVL_DEBUG, "Subprocess (PID %d): %s exited with returncode %d", pid, argv[0], runresult.returncode);
|
|
return runresult;
|
|
}
|
|
|
|
|