aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordacctal <donotcontactmevia@email.invalid>2026-07-18 03:23:44 +0000
committerdacctal <donotcontactmevia@email.invalid>2026-07-18 03:23:44 +0000
commit7e145a01a440c15aa3f0c1859cd543f4f7a36d4c (patch)
treed2372e34199a63e83420e8527d769aa647256f69
parent9efe3b443e6f84f75ecfb6d5193ae1ff1eb3d485 (diff)
search and list are done!!!
-rw-r--r--include/globs.h5
-rw-r--r--include/search.h27
-rw-r--r--src/parse_args.c20
-rw-r--r--src/search.c70
4 files changed, 116 insertions, 6 deletions
diff --git a/include/globs.h b/include/globs.h
index 9416923..114083e 100644
--- a/include/globs.h
+++ b/include/globs.h
@@ -68,11 +68,12 @@
panic("allocation of `%s` failed", #ptr); \
} while (0)
-#define panic(...) \
+#define panic(...) \
do { \
+ char *tmp = strrchr(__FILE__, '/'); \
eprintf(BOLD RED "panic:" COLOR_RESET " line %d, func \"%s\" in file " \
"\"%s\": ", \
- __LINE__, __func__, __FILE_NAME__); \
+ __LINE__, __func__, tmp ? tmp + 1 : __FILE__); \
eprintf(__VA_ARGS__); \
eprintf("\n"); \
fflush(stderr); \
diff --git a/include/search.h b/include/search.h
new file mode 100644
index 0000000..233537b
--- /dev/null
+++ b/include/search.h
@@ -0,0 +1,27 @@
+/*
+
+ pkgit - package it!
+
+ Copyright (C) 2026 dacctal
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PKGIT_SEARCH_H
+#define PKGIT_SEARCH_H
+
+void list_installed(void);
+void search(char* arg);
+
+#endif
diff --git a/src/parse_args.c b/src/parse_args.c
index 2dfbef5..ff72334 100644
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -32,6 +32,7 @@
#include "pkg.h"
#include "pkgit_lua.h"
#include "add_repo.h"
+#include "search.h"
#define COMMAND(large, small) \
(!strcmp(argv[i], large) || !strcmp(argv[i], small))
@@ -117,6 +118,17 @@ void cmd_remove(int argc, char **argv, int i) {
}
}
+void cmd_search(int argc, char **argv, int i) {
+ if (argv[i + 1]) {
+ for (int j = i + 1; j < argc; j++) {
+ if (argv[j][0] == '-') continue;
+ search(argv[j]);
+ }
+ } else {
+ search("");
+ }
+}
+
void flags_mod(char **argv, int i) {
for (size_t j = 1; j < strlen(argv[i]); j++) {
switch (argv[i][j]) {
@@ -142,8 +154,8 @@ void flags_cmd(int argc, char **argv, int i) {
case 'i': cmd_install(argc, argv, i); break;
case 'r': cmd_remove(argc, argv, i); break;
case 'u': cmd_update(argc, argv, i); break;
- case 'l': panic("not implemented"); printf("list\n"); break;
- case 's': panic("not implemented"); printf("search\n"); break;
+ case 'l': list_installed(); break;
+ case 's': cmd_search(argc, argv, i); break;
case 'v': printf("%s\n", VERSION); break;
case 'h': help(); break;
default: break;
@@ -173,8 +185,8 @@ void parse_cmds(int argc, char **argv) {
if (COMMAND("--remove", "r")) { cmd_remove(argc, argv, i); }
if (COMMAND("--update", "u")) { cmd_update(argc, argv, i); }
if (COMMAND("--declare", "d")) { declare(); }
- if (COMMAND("--list", "l")) { panic("not implemented"); }
- if (COMMAND("--search", "s")) { panic("not implemented"); }
+ if (COMMAND("--list", "l")) { list_installed(); }
+ if (COMMAND("--search", "s")) { cmd_search(argc, argv, i); }
if (COMMAND("--version", "v")) { printf(VERSION "\n"); }
if (COMMAND("--help", "h")) { help(); }
if (COMMAND("--check", "c")) { check(); }
diff --git a/src/search.c b/src/search.c
new file mode 100644
index 0000000..20d3e8c
--- /dev/null
+++ b/src/search.c
@@ -0,0 +1,70 @@
+/*
+
+ pkgit - package it!
+
+ Copyright (C) 2026 dacctal
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+#include <dirent.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include "search.h"
+
+#include "globs.h"
+#include "log.h"
+#include "pkgit_lua.h"
+
+void search(char *arg) {
+ lua_getglobal(L, "repositories");
+ if (!lua_istable(L, -1)) {
+ lua_isnt_type("repositories", "table");
+ lua_pop(L, 1);
+ return;
+ }
+ lua_pushnil(L);
+ while (lua_next(L, -2) != 0) {
+ str key = mstr(lua_tostring(L, -2));
+ if (!lua_istable(L, -1)) {
+ lua_pop(L, 1);
+ str_free(&key);
+ continue;
+ }
+ if (key.len <= 1) str_println(&key);
+ else if (strstr(key.data, arg)) str_println(&key);
+ if (str_is_valid(&key)) str_free(&key);
+ lua_pop(L, 1);
+ }
+}
+
+void list_installed(void) {
+ struct dirent* dirent_ptr;
+ DIR* dir_ptr = opendir(inst_dirs.src.data);
+
+ if (dir_ptr == NULL) {
+ log_error("could not open %.*s", str_fmt(&inst_dirs.src));
+ return;
+ }
+
+ while ((dirent_ptr = readdir(dir_ptr)) != NULL) {
+ if (
+ strcmp(dirent_ptr->d_name, "..") == 0 ||
+ strcmp(dirent_ptr->d_name, ".") == 0
+ ) continue;
+ printf("%s\n", dirent_ptr->d_name);
+ }
+}