commit ddee3e83c8f682a0717a716b746caa1f26a4bcff
parent 11513725fd332099066efaabb09538bba2121133
Author: Friedel Schon <[email protected]>
Date: Sat, 22 Apr 2023 22:40:02 +0200
removing unused includes
Diffstat:
23 files changed, 30 insertions(+), 104 deletions(-)
diff --git a/include/service.h b/include/service.h
@@ -6,7 +6,6 @@
#include <stdbool.h>
#include <stdint.h>
#include <time.h>
-#include <unistd.h>
#define SV_SERIAL_LEN 17
#define SV_HAS_LOGSERVICE ((void*) 1)
diff --git a/include/util.h b/include/util.h
@@ -1,6 +1,5 @@
#pragma once
-#include <time.h>
#include <unistd.h>
#define streq(a, b) (!strcmp((a), (b)))
diff --git a/src/command.c b/src/command.c
@@ -1,4 +1,5 @@
#include "service.h"
+#include "util.h"
#include <errno.h>
#include <stdio.h>
diff --git a/src/command_handler.c b/src/command_handler.c
@@ -1,7 +1,7 @@
#include "service.h"
#include <fcntl.h>
-#include <linux/limits.h>
+#include <limits.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/config_parser.c b/src/config_parser.c
@@ -1,15 +1,15 @@
#include "config_parser.h"
#include <fcntl.h>
-#include <linux/limits.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
void parse_param_file(service_t* s, char* args[]) {
- int param_file;
- int args_size = 0;
- int line_size = 0;
+ int param_file;
+ int args_size = 0;
+ int line_size = 0;
char c;
snprintf(args[args_size++], SV_PARAM_FILE_LINE_MAX, "%s/%s/%s", service_dir, s->name, "run");
@@ -39,9 +39,9 @@ void parse_param_file(service_t* s, char* args[]) {
}
void parse_env_file(char** env) {
- int env_file;
- int env_size = 0;
- int line_size = 0;
+ int env_file;
+ int env_size = 0;
+ int line_size = 0;
char c;
if ((env_file = open("env", O_RDONLY)) != -1) {
@@ -71,7 +71,7 @@ pid_t parse_pid_file(service_t* s) {
return 0;
char buffer[20];
- int n;
+ int n;
if ((n = read(pid_file, buffer, sizeof(buffer))) <= 0) {
close(pid_file);
return 0;
diff --git a/src/dependency.c b/src/dependency.c
@@ -2,7 +2,7 @@
#include "util.h"
#include <fcntl.h>
-#include <linux/limits.h>
+#include <limits.h>
#include <stdio.h>
#include <string.h>
@@ -19,11 +19,11 @@ void service_add_dependency(service_t* s, service_t* d) {
void service_update_dependency(service_t* s) {
service_t* dep;
- if (s->log_service) { // aka keep first entry (the log service) if a log service is used
+ if (s->log_service) { // aka keep first entry (the log service) if a log service is used
service_add_dependency(s, s->log_service);
}
- int depends_file;
+ int depends_file;
char depends_path[PATH_MAX];
snprintf(depends_path, PATH_MAX, "%s/%s/%s", service_dir, s->name, "depends");
diff --git a/src/exec/finit.c b/src/exec/finit.c
@@ -6,15 +6,9 @@
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/reboot.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/wait.h>
-#include <unistd.h>
void sigblock_all(bool unblock);
diff --git a/src/exec/fsvc.c b/src/exec/fsvc.c
@@ -2,16 +2,10 @@
#include "service.h"
#include "signame.h"
-#include <errno.h>
-#include <fcntl.h>
#include <getopt.h>
-#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
static const char HELP_MESSAGE[] =
diff --git a/src/exec/fsvs.c b/src/exec/fsvs.c
@@ -4,19 +4,8 @@
#include "service.h"
#include "util.h"
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
#include <getopt.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
#include <sys/wait.h>
#include <unistd.h>
diff --git a/src/exec/halt.c b/src/exec/halt.c
@@ -1,15 +1,12 @@
#include <err.h>
-#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <sys/reboot.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/utsname.h>
#include <unistd.h>
#include <utmp.h>
+
extern char* __progname;
typedef enum { NOOP,
diff --git a/src/exec/seedrng.c b/src/exec/seedrng.c
@@ -1,12 +1,9 @@
/* Based on code from <https://git.zx2c4.com/seedrng/about/>. */
-#include "util.h"
-
#include <endian.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/random.h>
-#include <poll.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
@@ -14,12 +11,13 @@
#include <string.h>
#include <sys/file.h>
#include <sys/ioctl.h>
+#include <sys/poll.h>
#include <sys/random.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <time.h>
#include <unistd.h>
+
#ifndef LOCALSTATEDIR
# define LOCALSTATEDIR "/var/lib"
#endif
diff --git a/src/exec/vlogger.c b/src/exec/vlogger.c
@@ -1,13 +1,12 @@
-#include "util.h"
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <syslog.h>
+#include <sys/syslog.h>
#include <unistd.h>
+
extern char* __progname;
static char pwd[PATH_MAX];
diff --git a/src/register.c b/src/register.c
@@ -1,13 +1,10 @@
-#include "config.h"
#include "service.h"
-#include <errno.h>
-#include <fcntl.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;
diff --git a/src/restart.c b/src/restart.c
@@ -1,15 +1,10 @@
#include "config_parser.h"
-#include "service.h"
-#include "util.h"
#include <errno.h>
#include <limits.h>
-#include <linux/limits.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/wait.h>
static void do_finish(service_t* s) {
diff --git a/src/serialize.c b/src/serialize.c
@@ -1,13 +1,5 @@
-#include "config.h"
#include "service.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
void service_store(service_t* s, uint8_t* buffer) {
buffer[0] = (s->state);
diff --git a/src/service.c b/src/service.c
@@ -1,23 +1,14 @@
-// daemon manager
-
#include "service.h"
-#include "config.h"
#include "pattern.h"
-#include "util.h"
-#include <ctype.h>
#include <dirent.h>
#include <errno.h>
-#include <fcntl.h>
-#include <linux/limits.h>
-#include <stddef.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <unistd.h>
+
service_t services[SV_SERVICE_MAX];
int services_size = 0;
diff --git a/src/socket_handler.c b/src/socket_handler.c
@@ -1,9 +1,8 @@
#include "service.h"
-#include <errno.h>
-#include <signal.h>
#include <stdio.h>
+
void service_handle_socket(int client) {
char command[2] = { 0, 0 };
char service_name[SV_NAME_MAX];
diff --git a/src/stage.c b/src/stage.c
@@ -5,7 +5,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/src/start.c b/src/start.c
@@ -1,19 +1,14 @@
-#include "config.h"
#include "config_parser.h"
-#include "service.h"
#include "user_group.h"
-#include "util.h"
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
#include <limits.h>
-#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <unistd.h>
static void set_pipes(service_t* s) {
@@ -25,13 +20,13 @@ static void set_pipes(service_t* s) {
close(s->log_pipe.read);
dup2(null_fd, STDOUT_FILENO);
dup2(null_fd, STDERR_FILENO);
- } else if (s->log_service) { // aka has_log_service
+ } else if (s->log_service) { // aka has_log_service
close(s->log_service->log_pipe.read);
dup2(s->log_service->log_pipe.write, STDOUT_FILENO);
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("log", &estat) == 0 && estat.st_mode & S_IWRITE) { // is not
int log_fd;
if ((log_fd = open("log", O_WRONLY | O_TRUNC)) == -1)
log_fd = null_fd;
@@ -59,7 +54,7 @@ static void set_pipes(service_t* s) {
static void set_user() {
char buffer[1024];
- int user_file;
+ int user_file;
if ((user_file = open("user", O_RDONLY)) != -1) {
ssize_t n;
if ((n = read(user_file, buffer, sizeof(buffer))) == -1) {
@@ -121,7 +116,7 @@ void service_start(service_t* s, bool* changed) {
if ((s->pid = fork()) == -1) {
print_error("cannot fork process");
exit(1);
- } else if (s->pid == 0) { // child
+ } else if (s->pid == 0) { // child
if (setsid() == -1)
print_error("cannot setsid");
diff --git a/src/stop.c b/src/stop.c
@@ -5,7 +5,7 @@
#include <signal.h>
#include <stdio.h>
#include <string.h>
-#include <sys/stat.h>
+
void service_stop(service_t* s, bool* changed) {
char path_buffer[PATH_MAX];
diff --git a/src/supervise.c b/src/supervise.c
@@ -1,24 +1,14 @@
-#include "config.h"
-#include "config_parser.h"
#include "service.h"
-#include "util.h"
-#include <asm-generic/errno.h>
-#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
-#include <getopt.h>
#include <limits.h>
-#include <signal.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <sys/wait.h>
-#include <unistd.h>
bool daemon_running = true;
diff --git a/src/user_group.c b/src/user_group.c
@@ -35,15 +35,15 @@ static int parse_ugid_num(char* str, uid_t* uid, gid_t* gids) {
int parse_ugid(char* str, uid_t* uid, gid_t* gids) {
struct passwd* pwd;
struct group* gr;
- char* end;
- char* groupstr = NULL;
- int gid_size = 0;
+ char* end;
+ char* groupstr = NULL;
+ int gid_size = 0;
if (str[0] == ':')
return (parse_ugid_num(str + 1, uid, gids));
if ((end = strchr(str, ':')) != NULL) {
- end[0] = '\0';
+ end[0] = '\0';
groupstr = end + 1;
}
diff --git a/src/util.c b/src/util.c
@@ -1,8 +1,6 @@
#include "util.h"
#include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
ssize_t dgetline(int fd, char* line, size_t line_buffer) {
