aboutsummaryrefslogtreecommitdiff
path: root/c_implementation
diff options
context:
space:
mode:
Diffstat (limited to 'c_implementation')
-rw-r--r--c_implementation/Makefile.am24
-rw-r--r--c_implementation/src/akfs.c2
-rw-r--r--c_implementation/src/aklog.c192
3 files changed, 90 insertions, 128 deletions
diff --git a/c_implementation/Makefile.am b/c_implementation/Makefile.am
index 87089cb..086886b 100644
--- a/c_implementation/Makefile.am
+++ b/c_implementation/Makefile.am
@@ -1,19 +1,35 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I$(top_srcdir)/include
-lib_LTLIBRARIES = libaklog.la libaksettings.la
+lib_LTLIBRARIES = libaklog.la libaksettings.la libakfs.la libakdatetime.la libakutils.la
libaklog_la_SOURCES = $(top_srcdir)/src/aklog.c
+libakfs_la_SOURCES = $(top_srcdir)/src/akfs.c
+libakutils_la_SOURCES = $(top_srcdir)/src/akutils.c
+libakdatetime_la_SOURCES = $(top_srcdir)/src/akdatetime.c
libaksettings_la_SOURCES = $(top_srcdir)/src/aksettings.c
-include_HEADERS = include/libaklog.h include/libaksettings.h
+
+include_HEADERS = include/libaklog.h include/libaksettings.h include/libakfs.h
bin_PROGRAMS = ak
ak_LDADD = libaklog.la
ak_SOURCES = src/ak.c
-check_PROGRAMS = test_aklog
-test_aklog_SOURCES = ./tests/test_aklog.c
+check_PROGRAMS = test_aklog test_aksettings test_akfs test_akutils test_akdatetime
+test_akdatetime_SOURCES = ./tests/test_akdatetime.c ./src/akdatetime.c
+test_akdatetime_LDADD = libakdatetime.la
+
+test_akutils_SOURCES = ./tests/test_akutils.c ./src/akutils.c
+test_akutils_LDADD = libakutils.la
+
+test_aklog_SOURCES = ./tests/test_aklog.c ./src/aklog.c
test_aklog_LDADD = libaklog.la
+test_akfs_SOURCES = ./tests/test_akfs.c ./src/akfs.c
+test_akfs_LDADD = libakfs.la libaklog.la
+
+test_aksettings_SOURCES = ./tests/test_aksettings.c ./src/aksettings.c ./src/aklog.c
+test_aksettings_LDADD = libaksettings.la
+
tests_test_main_CPPFLAGS = -I$(top_srcdir)/include
TESTS = $(check_PROGRAMS)
diff --git a/c_implementation/src/akfs.c b/c_implementation/src/akfs.c
index a71a003..967a612 100644
--- a/c_implementation/src/akfs.c
+++ b/c_implementation/src/akfs.c
@@ -333,7 +333,7 @@ int ak_fs_open_map_v3(char* maphash)
//char *mapsdir = "/home/kaotisk/.arching-kaos/akfs/maps/";
//strncat(mapsdir, maphash);
// printf("%s\n", mapsdir);
- exit(1);
+ // exit(1);
return 0;
}
else
diff --git a/c_implementation/src/aklog.c b/c_implementation/src/aklog.c
index f6b04e8..36890f2 100644
--- a/c_implementation/src/aklog.c
+++ b/c_implementation/src/aklog.c
@@ -25,133 +25,79 @@ int ak_log_write_to_file(char* message)
void ak_log_print_log_line(char* line)
{
- if ( line )
+ int spaces_found = 0;
+ int last_space = -1;
+ int sa[] = { -1, -1, -1, -1 };
+ long int l = 1000000000;
+ long int ts = 0;
+ struct tm *timeInfo;
+ char ts_string[16]; // %Y%Y%Y%Y%m%m%d%d_%H%H%M%M%S%S
+ for (size_t i = 0; i < strlen(line); ++i)
{
- int i = 0;
- int spaces_found = 0;
- int last_space = -1;
- long int l = 1000000000;
- long int ts = 0;
- struct tm *timeInfo;
- char ts_string[16]; // %Y%Y%Y%Y%m%m%d%d_%H%H%M%M%S%S
- while ( line[i] != '\0' )
+ if ( line[i] == ' ' && spaces_found < 3 )
{
- if ( line[i] == ' ' ) // && spaces_found < 4)
- {
- spaces_found++;
- if (true) //( spaces_found < 4 )
- {
- for ( int k = last_space+1; k < i; k++ )
- {
- switch(spaces_found){
- case 1:
- // TS
- while (true)
- {
- if ( line[k] == ' ' )
- {
- timeInfo = localtime(&ts);
- strftime(ts_string, sizeof(ts_string), "%Y%m%d_%H%M%S", timeInfo);
- printf("%s ", ts_string);
- break;
- }
- else
- {
- switch(line[k])
- {
- case '0':
- ts = 0*l + ts;
- break;
- case '1':
- ts = 1*l + ts;
- break;
- case '2':
- ts = 2*l + ts;
- break;
- case '3':
- ts = 3*l + ts;
- break;
- case '4':
- ts = 4*l + ts;
- break;
- case '5':
- ts = 5*l + ts;
- break;
- case '6':
- ts = 6*l + ts;
- break;
- case '7':
- ts = 7*l + ts;
- break;
- case '8':
- ts = 8*l + ts;
- break;
- case '9':
- ts = 9*l + ts;
- break;
- }
- l = l/10;
- }
- k++;
- }
- break;
- case 2:
- // PROGRAM
- printf("\033[1;32m");
- while (true)
- {
- if ( line[k] == ' ' )
- {
- break;
- }
- else
- {
- printf("%c", line[k]);
- }
- k++;
- }
- break;
- case 3:
- // TYPE
- printf("\033[0;00m \033[1;31m");
- while (true)
- {
- if ( line[k] == ' ' )
- {
- break;
- }
- else
- {
- printf("%c", line[k]);
- }
- k++;
- }
- break;
- case 4:
- // MESSAGE
- printf("\033[0;00m ");
- while (true)
- {
- if ( line[k] == '\0' )
- {
- printf("\n");
- break;
- }
- else
- {
- printf("%c", line[k]);
- }
- k++;
- }
- break;
- }
- }
- last_space = i;
- }
- }
- i++;
+ spaces_found++;
+ last_space = i;
+ sa[spaces_found] = i;
}
}
+ for ( int k = 0; k < sa[1]; ++k)
+ {
+ switch(line[k])
+ {
+ case '0':
+ ts = 0*l + ts;
+ break;
+ case '1':
+ ts = 1*l + ts;
+ break;
+ case '2':
+ ts = 2*l + ts;
+ break;
+ case '3':
+ ts = 3*l + ts;
+ break;
+ case '4':
+ ts = 4*l + ts;
+ break;
+ case '5':
+ ts = 5*l + ts;
+ break;
+ case '6':
+ ts = 6*l + ts;
+ break;
+ case '7':
+ ts = 7*l + ts;
+ break;
+ case '8':
+ ts = 8*l + ts;
+ break;
+ case '9':
+ ts = 9*l + ts;
+ break;
+ }
+ l = l/10;
+ }
+ timeInfo = localtime(&ts);
+ strftime(ts_string, sizeof(ts_string), "%Y%m%d_%H%M%S", timeInfo);
+ printf("%s", ts_string);
+ printf(" \e[1;32m");
+ for ( int k = sa[1]+1; k < sa[2]; ++k)
+ {
+ printf("%c", line[k]);
+ }
+ printf("\e[0m \e[1;31m");
+ for ( int k = sa[2]+1; k < sa[3]; ++k)
+ {
+ printf("%c", line[k]);
+ }
+ printf("\e[0m ");
+ for ( int k = sa[3]+1; k < strlen(line); ++k)
+ {
+ printf("%c", line[k]);
+ }
+ printf("\e[0m");
+ printf("\n");
}
void ak_log_follow()
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 16:53:22 +0000