commit b3205d0788b44667c13c0c349cf7729f853fb2fd
parent 6b7df70d18f79e2eb393e3cb4b003f47ed2d8cdd
Author: Friedel Schon <[email protected]>
Date: Sat, 29 Apr 2023 23:14:32 +0200
adding utility stat_mode
Diffstat:
7 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/include/util.h b/include/util.h
@@ -1,14 +1,15 @@
#pragma once
-#include <unistd.h>
+#include <stdio.h>
-#define streq(a, b) (!strcmp((a), (b)))
-#define stringify(s) #s
+#define streq(a, b) (!strcmp((a), (b)))
+#define stringify(s) #s
#define static_stringify(s) stringify(s)
-#define print_error(msg, ...) (fprintf(stderr, "error: " msg ": %s\n", ##__VA_ARGS__, strerror(errno)))
+#define print_error(msg, ...) (fprintf(stderr, "error: " msg ": %s\n", ##__VA_ARGS__, strerror(errno)))
#define print_warning(msg, ...) (fprintf(stderr, "warning: " msg ": %s\n", ##__VA_ARGS__, strerror(errno)))
+
typedef struct {
int read;
int write;
@@ -16,4 +17,6 @@ typedef struct {
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);
-\ No newline at end of file
+ssize_t writestr(int fd, const char* str);
+
+unsigned int stat_mode(const char* format, ...);
+\ No newline at end of file
diff --git a/src/register.c b/src/register.c
@@ -1,25 +1,26 @@
#include "service.h"
+#include "util.h"
#include <limits.h>
#include <stdio.h>
#include <string.h>
-#include <sys/stat.h>
+#include <unistd.h>
service_t* service_register(const char* name, bool is_log_service) {
service_t* s;
if ((s = service_get(name)) == NULL) {
- s = &services[services_size++];
- s->state = STATE_INACTIVE;
+ s = &services[services_size++];
+ s->state = STATE_INACTIVE;
s->status_change = time(NULL);
s->restart_manual = S_DOWN;
- s->restart_file = S_DOWN;
- s->last_exit = EXIT_NONE;
- s->return_code = 0;
- s->fail_count = 0;
- s->log_service = NULL;
- s->paused = false;
+ s->restart_file = S_DOWN;
+ s->last_exit = EXIT_NONE;
+ s->return_code = 0;
+ s->fail_count = 0;
+ s->log_service = NULL;
+ s->paused = false;
s->log_pipe.read = 0;
s->log_pipe.write = 0;
s->is_log_service = is_log_service;
@@ -27,8 +28,7 @@ service_t* service_register(const char* name, bool is_log_service) {
strcpy(s->name, name);
}
- struct stat stat_buf;
- char path_buffer[PATH_MAX];
+ char path_buffer[PATH_MAX];
snprintf(path_buffer, PATH_MAX, "%s/%s/%s", service_dir, s->name, "log");
@@ -36,7 +36,7 @@ service_t* service_register(const char* name, bool is_log_service) {
if (s->log_pipe.read == 0 || s->log_pipe.write == 0)
pipe((int*) &s->log_pipe);
- } else if (!s->log_service && stat(path_buffer, &stat_buf) > -1 && S_ISDIR(stat_buf.st_mode)) {
+ } else if (!s->log_service && S_ISDIR(stat_mode("%s/%s/log", service_dir, s->name))) {
snprintf(path_buffer, PATH_MAX, "%s/%s", s->name, "log");
if (!s->log_service)
@@ -45,11 +45,8 @@ service_t* service_register(const char* name, bool is_log_service) {
bool autostart, autostart_once;
- snprintf(path_buffer, PATH_MAX, "%s/%s/up-%s", service_dir, s->name, runlevel);
- autostart = stat(path_buffer, &stat_buf) != -1 && S_ISREG(stat_buf.st_mode);
-
- snprintf(path_buffer, PATH_MAX, "%s/%s/once-%s", service_dir, s->name, runlevel);
- autostart_once = stat(path_buffer, &stat_buf) != -1 && S_ISREG(stat_buf.st_mode);
+ autostart = S_ISREG(stat_mode("%s/%s/up-%s", service_dir, s->name, runlevel));
+ autostart_once = S_ISREG(stat_mode("%s/%s/once-%s", service_dir, s->name, runlevel));
s->restart_file = S_DOWN;
diff --git a/src/restart.c b/src/restart.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
+#include <unistd.h>
/*void stat_mode(const char* path_format, ...) __attribute__((format(printf, 1, 0))) {
@@ -16,11 +17,10 @@
}*/
static void do_finish(service_t* s) {
- char path_buffer[PATH_MAX];
- struct stat stat_buffer;
+ char path_buffer[PATH_MAX];
snprintf(path_buffer, PATH_MAX, "%s/%s/finish", service_dir, s->name);
- if (stat(path_buffer, &stat_buffer) == 0 && stat_buffer.st_mode & S_IEXEC) {
+ if (stat_mode("%s/%s/finish", service_dir, s->name) & S_IEXEC) {
s->state = STATE_FINISHING;
if ((s->pid = fork()) == -1) {
print_error("cannot fork process");
@@ -50,9 +50,6 @@ void service_check_state(service_t* s, bool signaled, int return_code) {
if (s->restart_manual == S_ONCE)
s->restart_manual = S_DOWN;
- char path_buffer[PATH_MAX];
- struct stat stat_buffer;
-
switch (s->state) {
case STATE_SETUP:
service_run(s);
@@ -95,9 +92,9 @@ void service_check_state(service_t* s, bool signaled, int return_code) {
break;
case STATE_STARTING:
if (!signaled && return_code == 0) {
- if (snprintf(path_buffer, PATH_MAX, "%s/%s/stop", service_dir, s->name) && stat(path_buffer, &stat_buffer) == 0 && stat_buffer.st_mode & S_IXUSR) {
+ if (stat_mode("%s/%s/stop", service_dir, s->name) & S_IXUSR) {
s->state = STATE_ACTIVE_BACKGROUND;
- } else if (snprintf(path_buffer, PATH_MAX, "%s/%s/pid", service_dir, s->name) && stat(path_buffer, &stat_buffer) == 0 && stat_buffer.st_mode & S_IRUSR) {
+ } else if (stat_mode("%s/%s/stop", service_dir, s->name) & S_IRUSR) {
s->pid = parse_pid_file(s);
s->state = STATE_ACTIVE_PID;
} else {
diff --git a/src/service.c b/src/service.c
@@ -48,13 +48,10 @@ int service_refresh() {
return -1;
}
- struct stat stat_str;
- char path_buffer[PATH_MAX];
for (int i = 0; i < services_size; i++) {
service_t* s = &services[i];
- snprintf(path_buffer, PATH_MAX, "%s/%s", service_dir, s->name);
- if (stat(path_buffer, &stat_str) == -1 || !S_ISDIR(stat_str.st_mode)) {
+ if (!S_ISDIR(stat_mode("%s/%s", service_dir, s->name))) {
if (s->pid)
kill(s->pid, SIGKILL);
if (i < services_size - 1) {
@@ -68,8 +65,7 @@ int service_refresh() {
while ((ep = readdir(dp)) != NULL) {
if (ep->d_name[0] == '.')
continue;
- snprintf(path_buffer, PATH_MAX, "%s/%s", service_dir, ep->d_name);
- if (stat(path_buffer, &stat_str) == -1 || !S_ISDIR(stat_str.st_mode))
+ if (!S_ISDIR(stat_mode("%s/%s", service_dir, ep->d_name)))
continue;
service_register(ep->d_name, false);
diff --git a/src/start.c b/src/start.c
@@ -14,8 +14,6 @@
static void set_pipes(service_t* s) {
- struct stat estat;
-
if (s->is_log_service) {
close(s->log_pipe.write);
dup2(s->log_pipe.read, STDIN_FILENO);
@@ -28,7 +26,7 @@ static void set_pipes(service_t* s) {
dup2(s->log_service->log_pipe.write, STDERR_FILENO);
close(s->log_service->log_pipe.write);
dup2(null_fd, STDIN_FILENO);
- } else if (stat("log", &estat) == 0 && estat.st_mode & S_IWRITE) { // is not
+ } else if (stat_mode("log") & S_IWRITE) { // is not
int log_fd;
if ((log_fd = open("log", O_WRONLY | O_TRUNC)) == -1)
log_fd = null_fd;
@@ -36,7 +34,7 @@ static void set_pipes(service_t* s) {
dup2(null_fd, STDIN_FILENO);
dup2(log_fd, STDOUT_FILENO);
dup2(log_fd, STDERR_FILENO);
- } else if (stat("nolog", &estat) == 0 && S_ISREG(estat.st_mode)) {
+ } else if (S_ISREG(stat_mode("nolog"))) {
dup2(null_fd, STDIN_FILENO);
dup2(null_fd, STDOUT_FILENO);
dup2(null_fd, STDERR_FILENO);
@@ -83,15 +81,11 @@ static void set_user() {
}
void service_run(service_t* s) {
- printf("old state: %d\n", s->state);
- char path_buf[PATH_MAX];
- struct stat estat;
-
- if (snprintf(path_buf, PATH_MAX, "%s/%s/run", service_dir, s->name) && stat(path_buf, &estat) == 0 && estat.st_mode & S_IXUSR) {
+ if (stat_mode("%s/%s/run", service_dir, s->name) & S_IXUSR) {
s->state = STATE_ACTIVE_FOREGROUND;
- } else if (snprintf(path_buf, PATH_MAX, "%s/%s/start", service_dir, s->name) && stat(path_buf, &estat) == 0 && estat.st_mode & S_IXUSR) {
+ } else if (stat_mode("%s/%s/start", service_dir, s->name) & S_IXUSR) {
s->state = STATE_STARTING;
- } else if (snprintf(path_buf, PATH_MAX, "%s/%s/depends", service_dir, s->name) && stat(path_buf, &estat) == 0 && estat.st_mode & S_IREAD) {
+ } else if (stat_mode("%s/%s/depends", service_dir, s->name) & S_IREAD) {
s->state = STATE_ACTIVE_DUMMY;
} else {
printf("error in %s: `run`, `start` or `depends` not found\n", s->name);
@@ -157,10 +151,10 @@ void service_start(service_t* s, bool* changed) {
service_start(depends[i].depends, NULL);
}
- char path_buf[PATH_MAX];
- struct stat estat;
+ char path_buf[PATH_MAX];
+ snprintf(path_buf, PATH_MAX, "%s/%s/setup", service_dir, s->name);
- if (snprintf(path_buf, PATH_MAX, "%s/%s/setup", service_dir, s->name) && stat(path_buf, &estat) == 0 && estat.st_mode & S_IXUSR) {
+ if (stat_mode("%s/%s/setup", service_dir, s->name) & S_IXUSR) {
s->state = STATE_SETUP;
if ((s->pid = fork()) == -1) {
print_error("cannot fork process");
diff --git a/src/supervise.c b/src/supervise.c
@@ -10,6 +10,7 @@
#include <sys/stat.h>
#include <sys/un.h>
#include <sys/wait.h>
+#include <unistd.h>
bool daemon_running = true;
diff --git a/src/util.c b/src/util.c
@@ -1,12 +1,15 @@
#include "util.h"
+#include <limits.h>
#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
ssize_t dgetline(int fd, char* line, size_t line_buffer) {
ssize_t line_size = 0;
ssize_t rc;
- char c;
+ char c;
while (line_size < (ssize_t) line_buffer - 1 && (rc = read(fd, &c, 1)) == 1) {
if (c == '\r')
continue;
@@ -22,7 +25,7 @@ ssize_t dgetline(int fd, char* line, size_t line_buffer) {
ssize_t readstr(int fd, char* str) {
ssize_t len = 0;
- int rc;
+ int rc;
while ((rc = read(fd, &str[len], 1)) == 1 && str[len] != '\0')
len++;
@@ -35,4 +38,19 @@ ssize_t writestr(int fd, const char* str) {
if (str == NULL)
return write(fd, "", 1);
return write(fd, str, strlen(str) + 1);
+}
+
+unsigned int stat_mode(const char* format, ...) {
+ char path[PATH_MAX];
+ struct stat st;
+
+ va_list args;
+ va_start(args, format);
+ vsnprintf(path, PATH_MAX, format, args);
+ va_end(args);
+
+ if (stat(path, &st) == 0)
+ return st.st_mode;
+
+ return 0;
}
\ No newline at end of file
