From 9b9794df33488acc82529ecb9cfe478441f5f48a Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Sat, 8 Feb 2020 19:04:25 -0500 Subject: Implement URL opening --- url.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/url.c b/url.c index 7790461..1396765 100644 --- a/url.c +++ b/url.c @@ -14,12 +14,15 @@ * along with this program. If not, see . */ +#include #include +#include #include #include #include #include #include +#include #include "chat.h" @@ -55,26 +58,31 @@ static void compile(void) { errx(EX_SOFTWARE, "regcomp: %s: %s", buf, Pattern); } +struct URL { + size_t id; + char *nick; + char *url; +}; + enum { Cap = 32 }; static struct { - size_t ids[Cap]; - char *nicks[Cap]; - char *urls[Cap]; + struct URL urls[Cap]; size_t len; } ring; +static_assert(!(Cap & (Cap - 1)), "Cap is power of two"); -static void push(size_t id, const char *nick, const char *url, size_t len) { - size_t i = ring.len++ % Cap; - free(ring.nicks[i]); - free(ring.urls[i]); - ring.ids[i] = id; - ring.nicks[i] = NULL; +static void push(size_t id, const char *nick, const char *str, size_t len) { + struct URL *url = &ring.urls[ring.len++ % Cap]; + free(url->nick); + free(url->url); + url->id = id; + url->nick = NULL; if (nick) { - ring.nicks[i] = strdup(nick); - if (!ring.nicks[i]) err(EX_OSERR, "strdup"); + url->nick = strdup(nick); + if (!url->nick) err(EX_OSERR, "strdup"); } - ring.urls[i] = strndup(url, len); - if (!ring.urls[i]) err(EX_OSERR, "strndup"); + url->url = strndup(str, len); + if (!url->url) err(EX_OSERR, "strndup"); } void urlScan(size_t id, const char *nick, const char *mesg) { @@ -87,10 +95,45 @@ void urlScan(size_t id, const char *nick, const char *mesg) { } } +static const char *OpenBins[] = { "open", "xdg-open" }; + +static void urlOpen(const char *url) { + pid_t pid = fork(); + if (pid < 0) err(EX_OSERR, "fork"); + if (pid) return; + + close(STDIN_FILENO); + dup2(procPipe[1], STDOUT_FILENO); + dup2(procPipe[1], STDERR_FILENO); + for (size_t i = 0; i < ARRAY_LEN(OpenBins); ++i) { + execlp(OpenBins[i], OpenBins[i], url, NULL); + if (errno != ENOENT) { + warn("%s", OpenBins[i]); + _exit(EX_CONFIG); + } + } + warnx("no open utility found"); + _exit(EX_CONFIG); +} + void urlOpenCount(size_t id, size_t count) { - // TODO + for (size_t i = 1; i <= Cap; ++i) { + const struct URL *url = &ring.urls[(ring.len - i) % Cap]; + if (!url->url) break; + if (url->id != id) continue; + urlOpen(url->url); + if (!--count) break; + } } void urlOpenMatch(size_t id, const char *str) { - // TODO + for (size_t i = 1; i <= Cap; ++i) { + const struct URL *url = &ring.urls[(ring.len - i) % Cap]; + if (!url->url) break; + if (url->id != id) continue; + if ((url->nick && !strcmp(url->nick, str)) || strstr(url->url, str)) { + urlOpen(url->url); + break; + } + } } -- cgit 1.4.1 Donenfeld 2014-01-14filter: add lua supportJason A. Donenfeld 2014-01-14filter: basic write hooking infrastructureJason A. Donenfeld 2014-01-14filter: allow for cleanup hook for filter typesJason A. Donenfeld 2014-01-14filter: introduce "filter type" prefixJohn Keeping 2014-01-14filter: add interface layerJohn Keeping 2014-01-14filter: add fprintf_filter functionJohn Keeping 2014-01-14authors: specify maintainersJason A. Donenfeld 2014-01-13filters: Improved syntax-highlighting.pyStefan Tatschner 2014-01-12tests: add CGIT_TEST_OPTS variable to MakefileJohn Keeping 2014-01-12ui-repolist: HTML-escape cgit_rooturl() responseJohn Keeping 2014-01-12ui-shared: URL-escape script_nameJohn Keeping 2014-01-12ui-refs: escape HTML chars in author and tagger namesJohn Keeping 2014-01-12filter: pass extra arguments via cgit_open_filterJohn Keeping 2014-01-12ui-snapshot: set unused cgit_filter fields to zeroJohn Keeping 2014-01-12html: remove redundant htmlfd variableJohn Keeping 2014-01-12tests: add Valgrind supportJohn Keeping 2014-01-12cache: don't leave cache_slot fields uninitializedJohn Keeping 2014-01-10filter: split filter functions into their own fileJason A. Donenfeld 2014-01-10filter: make exit status localJason A. Donenfeld 2014-01-10parsing: fix header typoJason A. Donenfeld 2014-01-10cgit.c: Fix comment on bit mask hackLukas Fleischer 2014-01-10cgit.c: Use "else" for mutually exclusive branchesLukas Fleischer 2014-01-10ui-snapshot.c: Do not reinvent suffixcmp()Lukas Fleischer 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer 2014-01-09README: Fix dependenciesLukas Fleischer 2014-01-08README: Spelling and formatting fixesLukas Fleischer 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch 2014-01-08Add a suggestion to the manpagePřemysl Janouch 2014-01-08Fix the example configurationPřemysl Janouch 2014-01-08Fix about-formatting.shPřemysl Janouch 2014-01-08Fix some spelling errorsPřemysl Janouch 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts