commit eb357ded63789183423e7c3af25ee9805cb4ba12
parent e07e59d949f9441cac8fbf8bb4edeb475226441d
Author: Friedel Schön <[email protected]>
Date: Wed, 10 May 2023 15:31:23 +0200
add config.h constants
Diffstat:
9 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/include/config.h b/include/config.h
@@ -1,8 +1,8 @@
#pragma once
// environment variable where the current runlevel is stored
-#ifndef SV_RUNLEVEL_ENV
-# define SV_RUNLEVEL_ENV "SERVICE_RUNLEVEL"
+#ifndef SV_RUNLEVEL_DEFAULT_ENV
+# define SV_RUNLEVEL_DEFAULT_ENV "SERVICE_RUNLEVEL"
#endif
// seconds to wait for a service before it gets killed
@@ -31,8 +31,8 @@
#endif
// default runlevel
-#ifndef SV_RUNLEVEL
-# define SV_RUNLEVEL "default"
+#ifndef SV_RUNLEVEL_DEFAULT
+# define SV_RUNLEVEL_DEFAULT "default"
#endif
// path to service-dir
@@ -114,3 +114,23 @@
#ifndef SV_LOG_DIR
# define SV_LOG_DIR "/var/log/fiss"
#endif
+
+#ifndef SV_PID_BUFFER
+# define SV_PID_BUFFER 16
+#endif
+
+#ifndef SV_SOCKET_SERVICE_MAX
+# define SV_SOCKET_SERVICE_MAX 128
+#endif
+
+#ifndef SV_USER_BUFFER
+# define SV_USER_BUFFER 256
+#endif
+
+#ifndef SV_USER_GROUP_MAX
+# define SV_USER_GROUP_MAX 32
+#endif
+
+#ifndef SV_VLOGGER_BUFFER
+# define SV_VLOGGER_BUFFER 1024
+#endif
diff --git a/src/config_parser.c b/src/config_parser.c
@@ -70,7 +70,7 @@ pid_t parse_pid_file(service_t* s) {
if ((pid_file = openat(s->dir, "pid", O_RDONLY)) == -1)
return 0;
- char buffer[20];
+ char buffer[SV_PID_BUFFER];
int n;
if ((n = read(pid_file, buffer, sizeof(buffer))) <= 0) {
close(pid_file);
diff --git a/src/dependency.c b/src/dependency.c
@@ -1,3 +1,4 @@
+#include "config.h"
#include "service.h"
#include "util.h"
@@ -28,7 +29,7 @@ void service_update_dependency(service_t* s) {
if ((depends_file = openat(s->dir, "depends", O_RDONLY)) == -1)
return;
- char line[512];
+ char line[SV_NAME_MAX];
while (dgetline(depends_file, line, sizeof(line)) > 0) {
if (streq(s->name, line)) {
fprintf(stderr, "warning: %s depends on itself\n", s->name);
diff --git a/src/exec/finit.c b/src/exec/finit.c
@@ -77,7 +77,7 @@ int main(int argc, const char** argv) {
sigaction(SIGTERM, &sigact, NULL);
sigaction(SIGINT, &sigact, NULL);
- service_supervise(SV_SERVICE_DIR, SV_RUNLEVEL, true);
+ service_supervise(SV_SERVICE_DIR, SV_RUNLEVEL_DEFAULT, true);
sigblock_all(false);
}
diff --git a/src/exec/fsvc.c b/src/exec/fsvc.c
@@ -148,7 +148,7 @@ static const struct option long_options[] = {
};
int main(int argc, char** argv) {
- strcpy(runlevel, getenv(SV_RUNLEVEL_ENV) ?: SV_RUNLEVEL);
+ strcpy(runlevel, getenv(SV_RUNLEVEL_DEFAULT_ENV) ?: SV_RUNLEVEL_DEFAULT);
char* argexec = argv[0];
@@ -286,7 +286,7 @@ int main(int argc, char** argv) {
printf("warn: --reset specified but not used\n");
- service_t response[50];
+ service_t response[SV_SOCKET_SERVICE_MAX];
int rc;
if (check) {
diff --git a/src/exec/vlogger.c b/src/exec/vlogger.c
@@ -1,3 +1,4 @@
+#include "config.h"
#include "message.h"
#include "util.h"
@@ -78,7 +79,7 @@ static void strpriority(char* facil_str, int* facility, int* level) {
}
int main(int argc, char* argv[]) {
- char buf[1024];
+ char buf[SV_VLOGGER_BUFFER];
char *p, *e, *argv0;
char* tag = NULL;
int c;
diff --git a/src/register.c b/src/register.c
@@ -1,3 +1,4 @@
+#include "config.h"
#include "service.h"
#include "util.h"
@@ -50,8 +51,8 @@ service_t* service_register(int dir, const char* name, bool is_log_service) {
bool autostart, autostart_once;
- char up_path[512] = "up-";
- char once_path[512] = "once-";
+ char up_path[SV_NAME_MAX] = "up-";
+ char once_path[SV_NAME_MAX] = "once-";
strcat(up_path, runlevel);
strcat(once_path, runlevel);
diff --git a/src/socket_handler.c b/src/socket_handler.c
@@ -19,8 +19,8 @@ void service_handle_socket(int client) {
int res = 0;
int res_off = 0;
- service_t* response[128];
- service_t* request[128];
+ service_t* response[SV_SOCKET_SERVICE_MAX];
+ service_t* request[SV_SOCKET_SERVICE_MAX];
if (service_len > 0) {
if (command[0] == S_SWITCH) {
diff --git a/src/start.c b/src/start.c
@@ -53,7 +53,7 @@ static void set_pipes(service_t* s) {
}
static void set_user() {
- char buffer[1024];
+ char buffer[SV_USER_BUFFER];
int user_file;
if ((user_file = open("user", O_RDONLY)) != -1) {
ssize_t n;
@@ -65,7 +65,7 @@ static void set_user() {
buffer[n] = '\0';
uid_t uid;
- gid_t gids[60];
+ gid_t gids[SV_USER_GROUP_MAX];
if ((n = parse_ugid(buffer, &uid, gids)) <= 0) {
fprintf(stderr, "warn: malformatted user file\n");
close(user_file);
