From: Bastian Dehn <hhaalo@arcor.de>
Date: Wed, 12 Nov 2025 15:55:27 +0000 (+0100)
Subject: add integrate validation
X-Git-Tag: 1.3.8^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=857a605239f4dd60637f684ea0eea5ee6de44ba0;p=feierabend.git

add integrate validation
---

diff --git a/src/feierabend.c b/src/feierabend.c
index 120608a..20a2047 100644
--- a/src/feierabend.c
+++ b/src/feierabend.c
@@ -186,6 +186,20 @@ int main(int argc, const char* argv[])
 		return 1;
 	}
 
+	if (!validate_hourstring(argv[1])
+		|| !validate_minutestring(argv[2])) {
+			printf("ERROR: one or more invalid arguments\n");
+			return 1;
+	}
+
+	if (argc == 5) {
+		if (!validate_hourstring(argv[3])
+			|| !validate_minutestring(argv[4])) {
+			printf("ERROR: one or more invalid arguments\n");
+			return 1;
+		}
+	}
+
 	feierabend* fabend = _feierabend_init();
 
 	printf("Version: %s\n\n", PROJECT_VERSION);
diff --git a/src/feierabendxml.c b/src/feierabendxml.c
index a47372a..a062db6 100644
--- a/src/feierabendxml.c
+++ b/src/feierabendxml.c
@@ -22,6 +22,15 @@ int main(int argc, char* argv[])
 			printf("ERROR: %s entry <begin_hours> <begin_minutes> <end_hours> <end_minutes>\n", argv[0]);
 			return 1;
 		}
+
+		if (!validate_hourstring(argv[2])
+			|| !validate_minutestring(argv[3])
+			|| !validate_hourstring(argv[4])
+			|| !validate_minutestring(argv[5])) {
+			printf("ERROR: one or more invalid arguments\n");
+			return 1;
+		}
+
 		createEntry(atoi(argv[2]), atoi(argv[3]), atoi(argv[4]), atoi(argv[5]));
 		return 0;
 	}
@@ -31,8 +40,16 @@ int main(int argc, char* argv[])
 			printf("ERROR: %s add <begin_hours> <begin_minutes> <end_hours> <end_minutes>\n", argv[0]);
 			return 1;
 		}
-		addEntry(NULL, atoi(argv[2]), atoi(argv[3]), atoi(argv[4]), atoi(argv[5]));
 
+		if (!validate_hourstring(argv[2])
+			|| !validate_minutestring(argv[3])
+			|| !validate_hourstring(argv[4])
+			|| !validate_minutestring(argv[5])) {
+			printf("ERROR: one or more invalid arguments\n");
+			return 1;
+		}
+
+		addEntry(NULL, atoi(argv[2]), atoi(argv[3]), atoi(argv[4]), atoi(argv[5]));
 		return 0;
 	}
 
@@ -41,13 +58,17 @@ int main(int argc, char* argv[])
 			printf("ERROR: %s dateadd <yyyy-MM-dd> <begin_hours> <begin_minutes> <end_hours> <end_minutes>\n", argv[0]);
 			return 1;
 		}
-		if (!validate_datestring(argv[2])) {
-			printf("ERROR: date invalid format <yyyy-MM-dd>\n");
+
+		if (!validate_datestring(argv[2])
+			|| !validate_hourstring(argv[3])
+			|| !validate_minutestring(argv[4])
+			|| !validate_hourstring(argv[5])
+			|| !validate_minutestring(argv[6])) {
+			printf("ERROR: one or more invalid arguments\n");
 			return 1;
 		}
 
 		addEntry(argv[2], atoi(argv[3]), atoi(argv[4]), atoi(argv[5]), atoi(argv[6]));
-
 		return 0;
 	}