hermes

commit f71b37008e9be851b2674520616e06bc932a0094
parent c999ef8fd6fdd27021ca5ad7dff9024fbef6190f
Author: Francesco Saccone <francesco@francescosaccone.com>
Date:   Mon, 31 Mar 2025 14:53:41 +0200

feat: rename 'critical' to 'print_error' and do not run exit(1)

Signed-off-by: Francesco Saccone <francesco@francescosaccone.com>

Diffstat:
M
hermes.c
 | 
30
+++++++++++++++---------------
M
socket.c
 | 
8
++++----
M
utils.c
 | 
4
+---
M
utils.h
 | 
2
+-

4 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/hermes.c b/hermes.c
@@ -15,8 +15,8 @@
 
 void
 print_usage(char *program_name) {
-	critical("usage: %s [-p port] [-i file] [-u user] [-g group]",
-	         program_name);
+	print_error("usage: %s [-p port] [-i file] [-u user] [-g group]",
+	            program_name);
 }
 
 int
@@ -47,9 +47,9 @@ main(int argc, char *argv[]) {
 			break;
 		case 'i':
 			if (strlen(argv[i + 1]) >= DIRECTORY_INDEX_MAX_LENGTH) {
-				critical("error: directory index must be less than "
-				         "%u characters",
-				         DIRECTORY_INDEX_MAX_LENGTH);
+				print_error("error: directory index must be less than "
+				            "%u characters",
+				            DIRECTORY_INDEX_MAX_LENGTH);
 			}
 			strncpy(directory_index, argv[i + 1], sizeof(directory_index) - 1);
 			directory_index[sizeof(directory_index) - 1] = '\0';
@@ -57,9 +57,9 @@ main(int argc, char *argv[]) {
 			break;
 		case 'u':
 			if (strlen(argv[i + 1]) >= USER_NAME_MAX_LENGTH) {
-				critical("error: the user name must be less than "
-				         "%u characters",
-				         USER_NAME_MAX_LENGTH);
+				print_error("error: the user name must be less than "
+				            "%u characters",
+				            USER_NAME_MAX_LENGTH);
 			}
 			strncpy(user_name, argv[i + 1], sizeof(user_name) - 1);
 			user_name[sizeof(user_name) - 1] = '\0';
@@ -67,9 +67,9 @@ main(int argc, char *argv[]) {
 			break;
 		case 'g':
 			if (strlen(argv[i + 1]) >= GROUP_NAME_MAX_LENGTH) {
-				critical("error: the group name must be less than "
-				         "%u characters",
-				         GROUP_NAME_MAX_LENGTH);
+				print_error("error: the group name must be less than "
+				            "%u characters",
+				            GROUP_NAME_MAX_LENGTH);
 			}
 			strncpy(group_name, argv[i + 1], sizeof(group_name) - 1);
 			group_name[sizeof(group_name) - 1] = '\0';
@@ -82,7 +82,7 @@ main(int argc, char *argv[]) {
 	}
 
 	if (port < 1 || port > 65535) {
-		critical("error: port must be between 1 and 65535.");
+		print_error("error: port must be between 1 and 65535.");
 		return 1;
 	};
 
@@ -90,12 +90,12 @@ main(int argc, char *argv[]) {
 	group = getgrnam(group_name);
 
 	if (user == NULL) {
-		critical("error: user %s does not exist.", user_name);
+		print_error("error: user %s does not exist.", user_name);
 		return 1;
 	}
 
 	if (group == NULL) {
-		critical("error: group %s does not exist.", group_name);
+		print_error("error: group %s does not exist.", group_name);
 		return 1;
 	}
 
@@ -103,7 +103,7 @@ main(int argc, char *argv[]) {
 
 	switch (fork()) {
 	case -1:
-		critical("error: could not fork process.");
+		print_error("error: could not fork process.");
 		break;
 	case 0:
 		/* child process */
diff --git a/socket.c b/socket.c
@@ -14,7 +14,7 @@ create_socket(unsigned int port) {
 	struct sockaddr_in address;
 
 	if (socket_fd == -1) {
-		critical("error: socket creation");
+		print_error("error: socket creation");
 		exit(1);
 	}
 
@@ -23,12 +23,12 @@ create_socket(unsigned int port) {
 	address.sin_port = htons(port);
 
 	if (bind(socket_fd, (struct sockaddr *)&address, sizeof(address)) == -1) {
-		critical("error: bind socket to address");
+		print_error("error: bind socket to address");
 		exit(1);
 	}
 
 	if (listen(socket_fd, 3) == -1) {
-		critical("error: listen on socket");
+		print_error("error: listen on socket");
 		close(socket_fd);
 		exit(1);
 	}
@@ -57,7 +57,7 @@ read_client_request(int client_socket_fd,
                     char *buffer,
                     unsigned int buffer_size) {
 	if (buffer == NULL || buffer_size == 0) {
-		critical("error: invalid buffer provided in read_client_request");
+		print_error("error: invalid buffer provided in read_client_request");
 		return -1;
 	}
 
diff --git a/utils.c b/utils.c
@@ -5,7 +5,7 @@
 #include "utils.h"
 
 void
-critical(const char *message, ...) {
+print_error(const char *message, ...) {
 	va_list arguments;
 
 	va_start(arguments, message);
@@ -13,6 +13,4 @@ critical(const char *message, ...) {
 	va_end(arguments);
 
 	fprintf(stderr, "\n");
-
-	exit(1);
 }
diff --git a/utils.h b/utils.h
@@ -2,6 +2,6 @@
 #define UTILS_H
 
 void
-critical(const char *message, ...);
+print_error(const char *message, ...);
 
 #endif