add integrate validation

diff --git a/src/feierabend.c b/src/feierabend.c
index 120608a3752c0f0314fab2f95824d82d4e46e962..20a2047d5c968a71c41c96db757245450c0d0c6f 100644 (file)
--- 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 a47372a2e5522d5bf40e43a095c69928cdc6a7e5..a062db64a6cb82e67ada791fa1540959a2d505c7 100644 (file)
--- 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;
        }