ezntek: checkpoint!

1 files changed, 94 insertions, 58 deletions

diff --git a/cla_parse.c b/cla_parse.c
index 59c8bda..8d5db4f 100644
--- a/cla_parse.c
+++ b/cla_parse.c
@@ -25,31 +25,31 @@
 
 #include "globs.h"
 #include "str.h"
-//#include "declare.h"
-//#include "deps_resolve.h"
+// #include "declare.h"
+// #include "deps_resolve.h"
 #include "help.h"
-//#include "name_from_url.h"
-//#include "pkg_build.h"
+// #include "name_from_url.h"
+// #include "pkg_build.h"
 #include "pkg_create.h"
-//#include "pkg_search.h"
-//#include "pkg_install.h"
-//#include "pkg_list.h"
-//#include "pkg_remove.h"
-//#include "pkgit_globals.h"
-//#include "repo_add.h"
-//#include "update.h"
+// #include "pkg_search.h"
+// #include "pkg_install.h"
+// #include "pkg_list.h"
+// #include "pkg_remove.h"
+// #include "pkgit_globals.h"
+// #include "repo_add.h"
+// #include "update.h"
 
-#define COMMAND(arg, large, small, code) if (						\
-	strcmp(arg, large) == 0 || strcmp(arg, small) == 0) code
+#define COMMAND(arg, large, small, code)                                       \
+	if (strcmp(arg, large) == 0 || strcmp(arg, small) == 0)                    \
+	code
 
-#define NOT_ENOUGH_ARGS(arg, next)									\
-	printf("%s Not enough arguments! Try: `pkgit %s [%s]`\n",		\
-	PRINT_ERROR, arg, next)
+#define NOT_ENOUGH_ARGS(arg, next)                                             \
+	log_error("Not enough arguments! Try: pkgit %s [%s]", (arg), (next))
 
 void cmd_add(char **argv, int i) {
 	if (argv[i + 1]) {
 		printf("add repo %s\n", argv[i + 1]);
-		//repo_add(argv[i + 1], name_from_url(argv[i + 1]));
+		// repo_add(argv[i + 1], name_from_url(argv[i + 1]));
 	} else {
 		NOT_ENOUGH_ARGS(argv[i], "url");
 	}
@@ -58,50 +58,58 @@ void cmd_add(char **argv, int i) {
 void cmd_build(int argc, char **argv, int i, package pkg) {
 	if (argv[i + 1]) {
 		for (int j = i + 1; j < argc; j++) {
-			if (argv[j][0] == '-') continue;
+			if (argv[j][0] == '-')
+				continue;
 			printf("build pkg %s\n", argv[j]);
-			//pkg = pkg_create(argv[j]);
-			//pkg_build(pkg);
+			// pkg = pkg_create(argv[j]);
+			// pkg_build(pkg);
 		}
 	} else {
 		printf("build pkg .\n");
-		//pkg = pkg_create(".");
-		//pkg_build(pkg);
+		// pkg = pkg_create(".");
+		// pkg_build(pkg);
 	}
 }
 
 void cmd_install(int argc, char **argv, int i, package pkg) {
 	if (argv[i + 1]) {
 		for (int j = i + 1; j < argc; j++) {
-			if (argv[j][0] == '-') continue;
+			if (argv[j][0] == '-')
+				continue;
 			printf("install pkg %s\n", argv[j]);
-			//pkg = pkg_create(argv[j]);
-			//pkg_install(pkg);
+			// pkg = pkg_create(argv[j]);
+			// pkg_install(pkg);
 		}
 	} else {
-		//NOT_ENOUGH_ARGS(argv[i], "url/pkg");
+		// NOT_ENOUGH_ARGS(argv[i], "url/pkg");
 	}
 }
 
 void cmd_remove(int argc, char **argv, int i, package pkg) {
 	if (argv[i + 1]) {
 		for (int j = i + 1; j < argc; j++) {
-			if (argv[j][0] == '-') continue;
+			if (argv[j][0] == '-')
+				continue;
 			printf("remove pkg %s\n", argv[j]);
-			//pkg = pkg_create(argv[j]);
-			//pkg_remove(pkg);
+			// pkg = pkg_create(argv[j]);
+			// pkg_remove(pkg);
 		}
 	} else {
-		//NOT_ENOUGH_ARGS(argv[i], "url/pkg");
+		// NOT_ENOUGH_ARGS(argv[i], "url/pkg");
 	}
 }
 
 void flags_mod(char **argv, int i) {
 	for (size_t j = 1; j < strlen(argv[i]); j++) {
 		switch (argv[i][j]) {
-			case 'q': is_verbose = 0; break;
-			case 'f': is_forced = 1; break;
-			default:  break;
+		case 'q':
+			is_verbose = 0;
+			break;
+		case 'f':
+			is_forced = 1;
+			break;
+		default:
+			break;
 		}
 	}
 }
@@ -109,25 +117,49 @@ void flags_mod(char **argv, int i) {
 void flags_cmd(int argc, char **argv, int i, package pkg) {
 	for (size_t j = 1; j < strlen(argv[i]); j++) {
 		switch (argv[i][j]) {
-			case 'a': cmd_add(argv, i); break;
-			case 'b': cmd_build(argc, argv, i, pkg); break;
-			case 'c': /*deps_resolve();*/ printf("deps_resolve\n"); break;
-			case 'd': /*declare();*/ printf("declare\n"); break;
-			case 'i': cmd_install(argc, argv, i, pkg); break;
-			case 'r': cmd_remove(argc, argv, i, pkg); break;
-			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", VERSION); break;
-			case 'h': help(); break;
-			default:  break;
+		case 'a':
+			cmd_add(argv, i);
+			break;
+		case 'b':
+			cmd_build(argc, argv, i, pkg);
+			break;
+		case 'c': /*deps_resolve();*/
+			printf("deps_resolve\n");
+			break;
+		case 'd': /*declare();*/
+			printf("declare\n");
+			break;
+		case 'i':
+			cmd_install(argc, argv, i, pkg);
+			break;
+		case 'r':
+			cmd_remove(argc, argv, i, pkg);
+			break;
+		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", VERSION);
+			break;
+		case 'h':
+			help();
+			break;
+		default:
+			break;
 		}
 	}
 }
 
 void flags_parse(int argc, char **argv, package pkg) {
 	for (int i = 1; i < argc; i++) {
-		if (argv[i][0] != '-') continue;
+		if (argv[i][0] != '-')
+			continue;
 		str_slc arg = str_slc_from_cstr(argv[i]);
 		if (argv[i][1] == '-') {
 			COMMAND(argv[i], "--quiet", "-q", { is_verbose = 0; });
@@ -141,22 +173,26 @@ void flags_parse(int argc, char **argv, package pkg) {
 
 void cmds_parse(int argc, char **argv, package pkg) {
 	for (int i = 1; i < argc; i++) {
-		COMMAND(argv[i], "--add",      "a", { cmd_add(argv, i); });
-		COMMAND(argv[i], "--build",    "b", { cmd_build(argc, argv, i, pkg); });
-		COMMAND(argv[i], "--install",  "i", { cmd_install(argc, argv, i, pkg); });
-		COMMAND(argv[i], "--remove",   "r", { cmd_remove(argc, argv, i, pkg); });
-		COMMAND(argv[i], "--update",   "u", { /*update();*/ });
-		COMMAND(argv[i], "--declare",  "d", { /*declare();*/ });
-		COMMAND(argv[i], "--list",     "l", { /*pkgs_list();*/ });
-		COMMAND(argv[i], "--search",   "s", { /*search(argv[i + 1]);*/ });
-		COMMAND(argv[i], "--version",  "v", { printf("%s\n", VERSION); });
-		COMMAND(argv[i], "--help",     "h", { help(); });
-		COMMAND(argv[i], "--check",    "c", { /*deps_resolve();*/ });
+		COMMAND(argv[i], "--add", "a", { cmd_add(argv, i); });
+		COMMAND(argv[i], "--build", "b", { cmd_build(argc, argv, i, pkg); });
+		COMMAND(argv[i], "--install", "i",
+				{ cmd_install(argc, argv, i, pkg); });
+		COMMAND(argv[i], "--remove", "r", { cmd_remove(argc, argv, i, pkg); });
+		COMMAND(argv[i], "--update", "u", {/*update();*/});
+		COMMAND(argv[i], "--declare", "d", {/*declare();*/});
+		COMMAND(argv[i], "--list", "l", {/*pkgs_list();*/});
+		COMMAND(argv[i], "--search", "s", {/*search(argv[i + 1]);*/});
+		COMMAND(argv[i], "--version", "v", { printf("%s\n", VERSION); });
+		COMMAND(argv[i], "--help", "h", { help(); });
+		COMMAND(argv[i], "--check", "c", {/*deps_resolve();*/});
 	}
 }
 
 void cla_parse(int argc, char **argv) {
-	if (!argv[1]) { help(); return; }
+	if (!argv[1]) {
+		help();
+		return;
+	}
 	package pkg = {0};
 	flags_parse(argc, argv, pkg);
 	cmds_parse(argc, argv, pkg);