diff --git a/package/c/lib/Makefile b/package/c/lib/Makefile new file mode 100644 index 0000000..6d0c6c8 --- /dev/null +++ b/package/c/lib/Makefile @@ -0,0 +1,26 @@ +CC = gcc +CFLAGS = -Wall -Wextra -std=c11 +LDFLAGS = -L. -lmylib # Link with your library + +# Source files +LIB_SRC = mylib.c +LIB_OBJ = $(LIB_SRC:.c=.o) +TEST_SRC = test/test.c +TEST_OBJ = $(TEST_SRC:.c=.o) +TEST_BIN = test + +# Build library +libmylib.a: $(LIB_OBJ) + ar rcs $@ $^ + +# Build test executable +$(TEST_BIN): $(TEST_OBJ) libmylib.a + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) + +# Compile C files +%.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + +# Clean build artifacts +clean: + rm -f $(LIB_OBJ) $(TEST_OBJ) $(TEST_BIN) libmylib.a diff --git a/package/c/lib/default.nix b/package/c/lib/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/package/c/lib/lib/heclib.c b/package/c/lib/lib/heclib.c new file mode 100644 index 0000000..e69de29 diff --git a/package/c/lib/lib/heclib.h b/package/c/lib/lib/heclib.h new file mode 100644 index 0000000..5d3e78e --- /dev/null +++ b/package/c/lib/lib/heclib.h @@ -0,0 +1,189 @@ +#ifndef EPRINTF_H +#define EPRINTF_H + +#include +#include +#include +#include +#include +#include + +// ------------- +// -- Helpers -- +// ------------- + +// Helper macros for argument counting +// NOTE(yukkop): this ugly macroses for avoid all posible warnings +#define PP_CAT(a, b) PP_CAT_I(a, b) +#define PP_CAT_I(a, b) a##b + +#define PP_NARG(...) PP_NARG_(__VA_ARGS__, PP_RSEQ_N()) +#define PP_NARG_(...) PP_ARG_N(__VA_ARGS__) +#define PP_ARG_N(_1,_2,_3,_4,_5,_6,_7,_8,_9,N,...) N +#define PP_RSEQ_N() 9,8,7,6,5,4,3,2,1,0 + +// ------------ +// -- Colors -- +// ------------ + +// Color mode enumeration +typedef enum { + COLOR_MODE_AUTO, + COLOR_MODE_FORCE, + COLOR_MODE_DISABLE +} ColorMode; + +// Static color mode variable +static ColorMode color_mode = COLOR_MODE_AUTO; + +// Function to set color mode +void set_output_color_mode(ColorMode mode) { + color_mode = mode; +} + +// Macros for detecting terminal and color usage +#define IS_TERMINAL() (isatty(fileno(stderr))) +#define USE_COLOR() ((color_mode == COLOR_MODE_FORCE) || (color_mode == COLOR_MODE_AUTO && IS_TERMINAL())) + +#define COLOR_RED (USE_COLOR() ? "\033[1;31m" : "") +#define COLOR_RESET (USE_COLOR() ? "\033[0m" : "") + +// ------------ +// -- Errors -- +// ------------ + +// Define color macros based on output type +#define ERROR_PREFIX PP_CAT_I(COLOR_RED, "Error: ") +#define ERROR_SUFFIX PP_CAT_I(COLOR_RESET, "\n") + +// eprintf handling 1 or more arguments +#define eprintf_1(fmt) \ + fprintf(stderr, "%s" fmt "%s", ERROR_PREFIX, ERROR_SUFFIX) + +#define eprintf_2(fmt, ...) \ + fprintf(stderr, "%s" fmt "%s", ERROR_PREFIX, __VA_ARGS__, ERROR_SUFFIX) + +#define eprintf(...) \ + PP_CAT(eprintf_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +#define todo fprintf(stderr, "%sNot implimented yet%s", COLOR_RED, COLOR_RESET);exit(1) + +// ------------ +// -- Logger -- +// ------------ + +typedef enum { + LOG_LEVEL_DEBUG, + LOG_LEVEL_LOG, + LOG_LEVEL_INFO, + LOG_LEVEL_NOTICE, + LOG_LEVEL_WARN, + LOG_LEVEL_EXCEPTION +} LogLevel; + +const char* log_level_to_string(LogLevel level) { + switch (level) { + case LOG_LEVEL_DEBUG: return "DEBUG"; + case LOG_LEVEL_LOG: return "LOG"; + case LOG_LEVEL_INFO: return "INFO"; + case LOG_LEVEL_NOTICE: return "NOTICE"; + case LOG_LEVEL_WARN: return "WARN"; + case LOG_LEVEL_EXCEPTION: return "EXCEPTION"; + default: return "UNKNOWN"; + } +} + +LogLevel log_level_from_string(const char *level_str) { + if (!level_str) return LOG_LEVEL_INFO; + if (strcmp(level_str, "DEBUG") == 0) + return LOG_LEVEL_DEBUG; + else if (strcmp(level_str, "LOG") == 0) + return LOG_LEVEL_LOG; + else if (strcmp(level_str, "INFO") == 0) + return LOG_LEVEL_INFO; + else if (strcmp(level_str, "NOTICE") == 0) + return LOG_LEVEL_NOTICE; + else if (strcmp(level_str, "WARN") == 0) + return LOG_LEVEL_WARN; + else if (strcmp(level_str, "EXCEPTION") == 0) + return LOG_LEVEL_EXCEPTION; + else + return LOG_LEVEL_INFO; +} + +LogLevel current_log_level = LOG_LEVEL_INFO; + +void init_logger(void) { + current_log_level = log_level_from_string(getenv("LOG_LEVEL")); +} + +void log_message(LogLevel level, int line, const char *format, ...) { + if (level < current_log_level) { + return; + } + + time_t now = time(NULL); + struct tm tm_info; + localtime_r(&now, &tm_info); + char timeStr[20]; + strftime(timeStr, sizeof(timeStr), "%Y-%m-%d %H:%M:%S", &tm_info); + + fprintf(stderr, "%s %d %s: ", timeStr, line, log_level_to_string(level)); + + va_list args; + va_start(args, format); + vfprintf(stderr, format, args); + va_end(args); + + fprintf(stderr, "\n"); +} + +// DEBUG level +#define raise_debug_1(fmt) \ + log_message(LOG_LEVEL_DEBUG, __LINE__, fmt) +#define raise_debug_2(fmt, ...) \ + log_message(LOG_LEVEL_DEBUG, __LINE__, fmt, __VA_ARGS__) +#define raise_debug(...) \ + PP_CAT(raise_debug_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +// LOG level +#define raise_log_1(fmt) \ + log_message(LOG_LEVEL_LOG, __LINE__, fmt) +#define raise_log_2(fmt, ...) \ + log_message(LOG_LEVEL_LOG, __LINE__, fmt, __VA_ARGS__) +#define raise_log(...) \ + PP_CAT(raise_log_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +// INFO level +#define raise_info_1(fmt) \ + log_message(LOG_LEVEL_INFO, __LINE__, fmt) +#define raise_info_2(fmt, ...) \ + log_message(LOG_LEVEL_INFO, __LINE__, fmt, __VA_ARGS__) +#define raise_info(...) \ + PP_CAT(raise_info_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +// NOTICE level +#define raise_notice_1(fmt) \ + log_message(LOG_LEVEL_NOTICE, __LINE__, fmt) +#define raise_notice_2(fmt, ...) \ + log_message(LOG_LEVEL_NOTICE, __LINE__, fmt, __VA_ARGS__) +#define raise_notice(...) \ + PP_CAT(raise_notice_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +// WARN level +#define raise_warn_1(fmt) \ + log_message(LOG_LEVEL_WARN, __LINE__, fmt) +#define raise_warn_2(fmt, ...) \ + log_message(LOG_LEVEL_WARN, __LINE__, fmt, __VA_ARGS__) +#define raise_warn(...) \ + PP_CAT(raise_warn_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +// EXCEPTION level +#define raise_exception_1(fmt) \ + log_message(LOG_LEVEL_EXCEPTION, __LINE__, fmt) +#define raise_exception_2(fmt, ...) \ + log_message(LOG_LEVEL_EXCEPTION, __LINE__, fmt, __VA_ARGS__) +#define raise_exception(...) \ + PP_CAT(raise_exception_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) + +#endif // EPRINTF_H diff --git a/package/c/lib/test/test.c b/package/c/lib/test/test.c new file mode 100644 index 0000000..b31e5c3 --- /dev/null +++ b/package/c/lib/test/test.c @@ -0,0 +1,12 @@ +#include +#include +#include "heclib.h" + +void test_function() { +} + +int main(void) { + test_function(); + printf("All tests passed\n"); + return 0; +} diff --git a/package/postgres/pg-neo-migration/hectic-chan b/package/postgres/pg-neo-migration/hectic-chan deleted file mode 100755 index 5a1a25f..0000000 Binary files a/package/postgres/pg-neo-migration/hectic-chan and /dev/null differ diff --git a/package/postgres/pg-neo-migration/src/logger.c b/package/postgres/pg-neo-migration/src/logger.c index 9615f44..bfa36c5 100644 --- a/package/postgres/pg-neo-migration/src/logger.c +++ b/package/postgres/pg-neo-migration/src/logger.c @@ -3,7 +3,7 @@ #include #include #include -#include "macros.h" +#include "macro.h" typedef enum { LOG_LEVEL_DEBUG, diff --git a/package/postgres/pg-neo-migration/src/macro.c b/package/postgres/pg-neo-migration/src/macro.c new file mode 100644 index 0000000..1a98ff2 --- /dev/null +++ b/package/postgres/pg-neo-migration/src/macro.c @@ -0,0 +1,2 @@ +#include "macro.h" + diff --git a/package/postgres/pg-neo-migration/src/macros.h b/package/postgres/pg-neo-migration/src/macro.h similarity index 70% rename from package/postgres/pg-neo-migration/src/macros.h rename to package/postgres/pg-neo-migration/src/macro.h index b1649be..62d23a0 100644 --- a/package/postgres/pg-neo-migration/src/macros.h +++ b/package/postgres/pg-neo-migration/src/macro.h @@ -11,16 +11,24 @@ typedef enum { COLOR_MODE_DISABLE } ColorMode; -// Function to set the color mode -void set_output_color_mode(ColorMode mode); +// Static color mode variable +static ColorMode color_mode = COLOR_MODE_AUTO; + +// Function to set color mode +void set_output_color_mode(ColorMode mode) { + color_mode = mode; +} // Macros for detecting terminal and color usage #define IS_TERMINAL() (isatty(fileno(stderr))) #define USE_COLOR() ((color_mode == COLOR_MODE_FORCE) || (color_mode == COLOR_MODE_AUTO && IS_TERMINAL())) +#define COLOR_RED (USE_COLOR() ? "\033[1;31m" : "") +#define COLOR_RESET (USE_COLOR() ? "\033[0m" : "") + // Define color macros based on output type -#define ERROR_PREFIX (IS_TERMINAL() ? "\033[1;31mError: " : "Error: ") -#define ERROR_SUFFIX (IS_TERMINAL() ? "\033[0m\n" : "\n") +#define ERROR_PREFIX PP_CAT_I(COLOR_RED, "Error: ") +#define ERROR_SUFFIX PP_CAT_I(COLOR_RESET, "\n") // Helper macros for argument counting // NOTE(yukkop): this ugly macroses for avoid all posible warnings @@ -42,4 +50,6 @@ void set_output_color_mode(ColorMode mode); #define eprintf(...) \ PP_CAT(eprintf_, PP_NARG(__VA_ARGS__))(__VA_ARGS__) +#define todo fprintf(stderr, "%sNot implimented yet%s", COLOR_RED, COLOR_RESET);exit(1) + #endif // EPRINTF_H diff --git a/package/postgres/pg-neo-migration/src/macros.c b/package/postgres/pg-neo-migration/src/macros.c deleted file mode 100644 index 1b61d85..0000000 --- a/package/postgres/pg-neo-migration/src/macros.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "macros.h" - -// Static color mode variable -static ColorMode color_mode = COLOR_MODE_AUTO; - -// Function to set color mode -void set_output_color_mode(ColorMode mode) { - color_mode = mode; -} diff --git a/package/postgres/pg-neo-migration/src/main.c b/package/postgres/pg-neo-migration/src/main.c index 723dcc6..89c2897 100644 --- a/package/postgres/pg-neo-migration/src/main.c +++ b/package/postgres/pg-neo-migration/src/main.c @@ -2,10 +2,11 @@ #include #include #include "logger.c" -#include "macros.h" +#include "macro.h" #include #include #include +#include // TODO: check on the specific psql version int check_psql_installed(void) { @@ -58,7 +59,7 @@ void create_migration_inner(const char* migration_path, const char* type) { } char filename[1024 + 19]; - snprintf(filename, sizeof(filename), "%s/00-entry-point.sql", path); + snprintf(filename, sizeof(filename), "%s/0000-entry-point.sql", path); FILE *fp = fopen(filename, "w"); if (!fp) { @@ -101,9 +102,10 @@ void help_message(char name[]) { int main(int argc, char *argv[]) { srand(time(NULL)); init_logger(); - raise_log("init"); + todo; + if (check_psql_installed()) { exit(1); } if (argc < 2) { @@ -115,7 +117,9 @@ int main(int argc, char *argv[]) { char *migration_dir; char *db_url; char *migration_name; - char force = 0; + bool force = true; + char **set_vars = NULL; + int set_vars_count = 0; /* Process global options until a known subcommand is encountered */ int i = 1; @@ -171,11 +175,18 @@ int main(int argc, char *argv[]) { force = 1; } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--set")) { if (i+1 < argc) { - set_vars = relloc(set_vars); + set_vars = realloc(set_vars, (set_vars_count+1) * sizeof(char*)); + set_vars[set_vars_count++] = argv[i+1]; + i++; } else { eprintf("%s requires an argument", argv[i]); } + } + if (!db_url) { + eprintf("Database URL is required for %s subcommand.\n", subcommand); + help_message(argv[0]); + exit(1); } } } else if (strcmp(subcommand, "fetch") == 0) { @@ -187,14 +198,13 @@ int main(int argc, char *argv[]) { } else { eprintf("%s requires an argument", argv[i]); } - + + if (!db_url) { + eprintf("Database URL is required for %s subcommand.\n", subcommand); + help_message(argv[0]); + exit(1); + } } } } - - if (!db_url) { - eprintf("Database URL is required for migrate subcommand.\n"); - help_message(argv[0]); - exit(1); - } }