checkpoint!

4 files changed, 24 insertions, 28 deletions

diff --git a/src/cla_parse.c b/src/cla_parse.c
index a0f3d43..c2f31fd 100644
--- a/src/cla_parse.c
+++ b/src/cla_parse.c
@@ -23,8 +23,8 @@
 
 #include "cla_parse.h"
 
-#include "pkgit_globals.h"
-#include "pkgit_string.h"
+#include "globs.h"
+#include "str.h"
 
 //#include "declare.h"
 //#include "deps_resolve.h"
@@ -46,7 +46,7 @@
 
 #define NOT_ENOUGH_ARGS(arg, next)									\
 	printf("%.*s Not enough arguments! Try: `pkgit %s [%s]`\n",		\
-	str_fmt(PRINT_ERROR), arg, next)
+	PRINT_ERROR, arg, next)
 
 void cmd_add(char **argv, int i) {
 	if (argv[i + 1]) {
@@ -120,7 +120,7 @@ void flags_cmd(int argc, char **argv, int i, package pkg) {
 			case 'u': /*update();*/ printf("update\n"); break;
 			case 'l': /*pkgs_list();*/ printf("list\n"); break;
 			case 's': /*search(argv[i + 1]);*/ printf("search\n"); break;
-			case 'v': printf("%.*s\n", str_fmt(VERSION)); break;
+			case 'v': printf("%s\n", VERSION); break;
 			case 'h': /*help();*/ printf("help\n"); break;
 			default:  break;
 		}
@@ -150,7 +150,7 @@ void cmds_parse(int argc, char **argv, package pkg) {
 		COMMAND("--declare",  "d", { /*declare();*/ });
 		COMMAND("--list",     "l", { /*pkgs_list();*/ });
 		COMMAND("--search",   "s", { /*search(argv[i + 1]);*/ });
-		COMMAND("--version",  "v", { printf("%.*s\n", str_fmt(VERSION)); });
+		COMMAND("--version",  "v", { printf("%s\n", VERSION); });
 		COMMAND("--help",     "h", { /*help();*/ });
 		COMMAND("--check",    "c", { /*deps_resolve();*/ });
 	}
diff --git a/src/pkgit_globals.c b/src/globs.c
index 094eef8..6487f21 100644
--- a/src/pkgit_globals.c
+++ b/src/globs.c
@@ -1,7 +1,14 @@
+#include <stdio.h>
+
+#include "globs.h"
+#include "str.h"
+
 int is_verbose = 1;
 int is_forced = 0;
+char root_config_file[20] = "/etc/pkgit/init.lua";
+char root_config_dir[15] = "/etc/pkgit";
 
-//void init_vars(void) {
+void init_vars(void) {
 //	char *home = getenv("HOME");
 //	if (home) snprintf(home_dir, MAX_PATH_LEN, "%s", home);
 //	else snprintf(home_dir, MAX_PATH_LEN, "/root");
@@ -26,4 +33,4 @@ int is_forced = 0;
 //	install_directories[2] = strdup(get_install_dir("lib"));
 //	install_directories[3] = strdup(get_install_dir("inc"));
 //	install_directories[4] = strdup(get_install_dir("src"));
-//}
+}
diff --git a/src/main.c b/src/main.c
index eebd9ce..33f1854 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,22 +20,9 @@
 #include <stdio.h> 
 
 #include "cla_parse.h"
-#include "pkgit_string.h"
-#include "pkgit_globals.h"
+#include "str.h"
+#include "globs.h"
 
 int main(int argc, char** argv) {
-	//slc_cat(BOLD_YELLOW, slc_from_cstr("["))
-	//slc_cat(BOLD_MAGENTA, slc_from_cstr("pkgit"))
-	//slc_cat(BOLD_MAGENTA, slc_from_cstr("]"))
-	//COLOR_RESET
-	str_slc hello_world = {"", 0};
-	slc_cat(slc_from_cstr("hello"), slc_from_cstr(" world"), &hello_world);
-	str_slc test = {"hello", 5};
-	printf("%.*s\n", str_fmt(test));
-	printf("%.*s%s%.*s\n", str_fmt(BOLD_YELLOW), "TEST", str_fmt(COLOR_RESET));
-	printf("length: %zu\nstring: %.*s\n", hello_world.len, str_fmt(hello_world));
-	str_slc hello_world_ext = {"", 0};
-	slc_cat(slc_from_cstr(hello_world.data), slc_from_cstr("!!!"), &hello_world_ext);
-	printf("length: %zu\nstring: %.*s\n", hello_world_ext.len, str_fmt(hello_world_ext));
 	return 0;
 }
diff --git a/src/pkgit_string.c b/src/str.c
index 6f8a0a6..7bb424e 100644
--- a/src/pkgit_string.c
+++ b/src/str.c
@@ -20,9 +20,10 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "pkgit_string.h"
+#include "str.h"
 
 void slc_print(str_slc slc) {
 	for (size_t i = 0; i < slc.len; i++) {
@@ -95,13 +96,14 @@ str_slc slc_split(str_slc *slc, char delimiter) {
 }
 
 void slc_cat(str_slc first, str_slc second, str_slc *new_slc) {
-	new_slc->len = first.len + second.len + 1;
-	char buf[new_slc->len];
+	if (new_slc->len < first.len + second.len) {
+		printf("fatal: slc_cat length of new slice is too small\n");
+		exit(EXIT_FAILURE);
+	}
 	for (size_t i = 0; i < first.len; i++) {
-		buf[i] = first.data[i];
+		new_slc->data[i] = first.data[i];
 	}
 	for (size_t i = first.len; i < new_slc->len; i++) {
-		buf[i] = second.data[i-first.len];
+		new_slc->data[i] = second.data[i-first.len];
 	}
-	new_slc->data = buf;
 }