]> gitweb.hhaalo.de Git - feierabend.git/commitdiff
add now time german output
authorBastian Dehn <hhaalo@arcor.de>
Sun, 9 Jun 2024 15:44:53 +0000 (17:44 +0200)
committerBastian Dehn <hhaalo@arcor.de>
Sun, 9 Jun 2024 15:44:53 +0000 (17:44 +0200)
src/CMakeLists.txt
src/main.c
src/time_format.c

index a838995b9c88dc4c774657ced184c52dd96e3603..8b9335dd759af2300b442771d8544755ba99ba00 100644 (file)
@@ -2,4 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.25.1)
 
 PROJECT(feierabend VERSION 0.0.1)
 
-ADD_EXECUTABLE(${PROJECT_NAME} main.c)
\ No newline at end of file
+ADD_EXECUTABLE(${PROJECT_NAME}
+       main.c
+       time_format.c
+       worktime.c
+       break.c)
\ No newline at end of file
index ac285ad462691fdc03d13d15052605978c4b9ef5..644e8bf31c4aa2eeee402cd5107464833e2e5297 100644 (file)
@@ -1,6 +1,7 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
-
+#include "time_format.h"
 
 int main(int argc, char* argv[])
 {
@@ -13,17 +14,18 @@ int main(int argc, char* argv[])
        struct tm begin_tm;
        time(&begin);
        gmtime_r(&begin, &begin_tm);
-       begin_tm.tm_hour = argv[1];
-       begin_tm.tm_min = argv[2];
+       begin_tm.tm_hour = atoi(argv[1]);
+       begin_tm.tm_min = atoi(argv[2]);
 
        time_t now = 0;
        struct tm now_tm;
        time(&now);
        localtime_r(&now, &now_tm);
+       char weekday[11];
+       get_weekday(now_tm.tm_wday, weekday);
 
-       printf("%s %02d %02d.%02d.%04d %02d:%02d\n",
-               "Aktuelle Zeit: ",
-               now_tm.tm_wday,
+       printf("Aktuelle Zeit: %s %02d.%02d.%04d %02d:%02d\n",
+               weekday,
                now_tm.tm_mday,
                now_tm.tm_mon + 1,
                now_tm.tm_year + 1900,
index b419e149c523f9da0ca755ad97d46ebe96ad813b..90517cac8d7538ec107a5157b417232fcb50269b 100644 (file)
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "time_format.h"
 
 void get_time_str(time_t time, char* timestr)