commit e07e59d949f9441cac8fbf8bb4edeb475226441d
parent 18905fe60a0155510de380024ba6c54b37a3c3df
Author: Friedel Schön <[email protected]>
Date: Wed, 10 May 2023 15:16:30 +0200
simplifying fork-exec with fork_dup_cd_exec()
Diffstat:
5 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/include/util.h b/include/util.h
@@ -17,4 +17,6 @@ ssize_t dgetline(int fd, char* line, size_t line_buffer);
ssize_t readstr(int fd, char* str);
ssize_t writestr(int fd, const char* str);
-unsigned int stat_mode(const char* format, ...);
-\ No newline at end of file
+unsigned int stat_mode(const char* format, ...);
+
+int fork_dup_cd_exec(int dir, const char* path, int fd0, int fd1, int fd2);
+\ No newline at end of file
diff --git a/src/restart.c b/src/restart.c
@@ -14,18 +14,9 @@ static void do_finish(service_t* s) {
struct stat st;
if (fstatat(s->dir, "finish", &st, 0) != -1 && st.st_mode & S_IEXEC) {
s->state = STATE_FINISHING;
- if ((s->pid = fork()) == -1) {
- print_error("error: cannot fork process: %s\n");
- } else if (s->pid == 0) {
- dup2(null_fd, STDIN_FILENO);
- dup2(null_fd, STDOUT_FILENO);
- dup2(null_fd, STDERR_FILENO);
-
- fchdir(s->dir);
-
- execl("./finish", "./finish", NULL);
- print_error("error: cannot execute finish process: %s\n");
- _exit(1);
+ if ((s->pid = fork_dup_cd_exec(s->dir, "./finish", null_fd, null_fd, null_fd)) == -1) {
+ print_error("error: cannot execute ./finish: %s\n");
+ s->state = STATE_INACTIVE;
}
} else if (s->fail_count == SV_FAIL_MAX) {
s->state = STATE_DEAD;
diff --git a/src/start.c b/src/start.c
@@ -101,9 +101,7 @@ void service_run(service_t* s) {
if (setsid() == -1)
print_error("error: cannot setsid: %s\n");
- if (fchdir(s->dir) == -1)
- print_error("error: chdir failed: %s\n");
-
+ fchdir(s->dir);
set_pipes(s);
char args[SV_ARGUMENTS_MAX][SV_PARAM_FILE_LINE_MAX];
@@ -154,18 +152,9 @@ void service_start(service_t* s, bool* changed) {
struct stat st;
if (fstatat(s->dir, "setup", &st, 0) != -1 && st.st_mode & S_IXUSR) {
s->state = STATE_SETUP;
- if ((s->pid = fork()) == -1) {
- print_error("error: cannot fork process: %s\n");
- } else if (s->pid == 0) {
- dup2(null_fd, STDIN_FILENO);
- dup2(null_fd, STDOUT_FILENO);
- dup2(null_fd, STDERR_FILENO);
-
- fchdir(s->dir);
-
- execl("./setup", "./setup", NULL);
- print_error("error: cannot execute setup process: %s\n");
- _exit(1);
+ if ((s->pid = fork_dup_cd_exec(s->dir, "./setup", null_fd, null_fd, null_fd)) == -1) {
+ print_error("error: cannot execute ./setup: %s\n");
+ s->state = STATE_INACTIVE;
}
} else {
service_run(s);
diff --git a/src/stop.c b/src/stop.c
@@ -1,4 +1,5 @@
#include "service.h"
+#include "util.h"
#include <errno.h>
#include <limits.h>
@@ -24,17 +25,9 @@ void service_stop(service_t* s, bool* changed) {
break;
case STATE_ACTIVE_BACKGROUND:
s->state = STATE_STOPPING;
- if ((s->pid = fork()) == -1) {
- print_error("error: cannot fork process: %s\n");
- } else if (s->pid == 0) {
- dup2(null_fd, STDIN_FILENO);
- dup2(null_fd, STDOUT_FILENO);
- dup2(null_fd, STDERR_FILENO);
-
- fchdir(s->dir);
- execl("./stop", "./stop", NULL);
- print_error("error: cannot execute stop process: %s\n");
- _exit(1);
+ if ((s->pid = fork_dup_cd_exec(s->dir, "./stop", null_fd, null_fd, null_fd)) == -1) {
+ print_error("error: cannot execute ./stop: %s\n");
+ s->state = STATE_INACTIVE;
}
if (changed)
*changed = true;
diff --git a/src/util.c b/src/util.c
@@ -1,5 +1,6 @@
#include "util.h"
+#include <errno.h>
#include <limits.h>
#include <stdarg.h>
#include <string.h>
@@ -54,4 +55,23 @@ unsigned int stat_mode(const char* format, ...) {
return st.st_mode;
return 0;
+}
+
+int fork_dup_cd_exec(int dir, const char* path, int fd0, int fd1, int fd2) {
+ pid_t pid;
+ if ((pid = fork()) == -1) {
+ print_error("error: cannot fork process: %s\n");
+ return -1;
+ } else if (pid == 0) {
+ dup2(fd0, STDIN_FILENO);
+ dup2(fd1, STDOUT_FILENO);
+ dup2(fd2, STDERR_FILENO);
+
+ fchdir(dir);
+
+ execl(path, path, NULL);
+ print_error("error: cannot execute stop process: %s\n");
+ _exit(1);
+ }
+ return pid;
}
\ No newline at end of file
