trap: Implement POSIX.1-2008 trap reset behaviour - dash

diff options

author	Herbert Xu <herbert@gondor.apana.org.au>	2016-06-06 19:52:43 +0800
committer	Herbert Xu <herbert@gondor.apana.org.au>	2016-09-02 22:10:56 +0800
commit	551215bb2f05b6ed0a639e1a20b88906ddd7ef9b (patch)
tree	fe196361b9b00c679d6c652a18d29f47eaf0f65c /src/funcs/pushd
parent	eval: Fix exit status when calling eval/dot with no commands (diff)
download	dash-551215bb2f05b6ed0a639e1a20b88906ddd7ef9b.tar.gz dash-551215bb2f05b6ed0a639e1a20b88906ddd7ef9b.zip

trap: Implement POSIX.1-2008 trap reset behaviour

Jonathan Perkin submitted a patch to fix the behaviour of trap
when the first argument is an integer.  Currently it is treated
as a command while POSIX requires it to be treated as a signal.

This patch is based on his idea but instead of adding an extra
argument to decode_signal I have added a new decode_signum helper.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Diffstat (limited to 'src/funcs/pushd')

0 files changed, 0 insertions, 0 deletions

/* Copyright (C) 2020 C. McEnroe <june@causal.agency> * * 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 3 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 <assert.h> #include <err.h> #include <errno.h> #include <regex.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sysexits.h> #include <unistd.h> #include "chat.h" static const char *Pattern = { "(" "cvs|" "ftp|" "git|" "gopher|" "http|" "https|" "irc|" "ircs|" "magnet|" "sftp|" "ssh|" "svn|" "telnet|" "vnc" ")" ":([^[:space:]>\"()]|[(][^)]*[)])+" }; static regex_t Regex; static void compile(void) { static bool compiled; if (compiled) return; compiled = true; int error = regcomp(&Regex, Pattern, REG_EXTENDED); if (!error) return; char buf[256]; regerror(error, &Regex, buf, sizeof(buf)); errx(EX_SOFTWARE, "regcomp: %s: %s", buf, Pattern); } struct URL { uint id; char *nick; char *url; }; enum { Cap = 32 }; static struct { struct URL urls[Cap]; size_t len; } ring; static_assert(!(Cap & (Cap - 1)), "Cap is power of two"); static void push(uint 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) { url->nick = strdup(nick); if (!url->nick) err(EX_OSERR, "strdup"); } url->url = strndup(str, len); if (!url->url) err(EX_OSERR, "strndup"); } void urlScan(uint id, const char *nick, const char *mesg) { if (!mesg) return; compile(); regmatch_t match = {0}; for (const char *ptr = mesg; *ptr; ptr += match.rm_eo) { if (regexec(&Regex, ptr, 1, &match, 0)) break; push(id, nick, &ptr[match.rm_so], match.rm_eo - match.rm_so); } } struct Util urlOpenUtil; static const struct Util OpenUtils[] = { { 1, { "open" } }, { 1, { "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(utilPipe[1], STDOUT_FILENO); dup2(utilPipe[1], STDERR_FILENO); if (urlOpenUtil.argc) { struct Util util = urlOpenUtil; utilPush(&util, url); execvp(util.argv[0], (char *const *)util.argv); warn("%s", util.argv[0]); _exit(EX_CONFIG); } for (size_t i = 0; i < ARRAY_LEN(OpenUtils); ++i) { struct Util util = OpenUtils[i]; utilPush(&util, url); execvp(util.argv[0], (char *const *)util.argv); if (errno != ENOENT) { warn("%s", util.argv[0]); _exit(EX_CONFIG); } } warnx("no open utility found"); _exit(EX_CONFIG); } struct Util urlCopyUtil; static const struct Util CopyUtils[] = { { 1, { "pbcopy" } }, { 1, { "wl-copy" } }, { 3, { "xclip", "-selection", "clipboard" } }, { 3, { "xsel", "-i", "-b" } }, }; static void urlCopy(const char *url) { int rw[2]; int error = pipe(rw); if (error) err(EX_OSERR, "pipe"); ssize_t len = write(rw[1], url, strlen(url)); if (len < 0) err(EX_IOERR, "write"); error = close(rw[1]); if (error) err(EX_IOERR, "close"); pid_t pid = fork(); if (pid < 0) err(EX_OSERR, "fork"); if (pid) { close(rw[0]); return; } dup2(rw[0], STDIN_FILENO); dup2(utilPipe[1], STDOUT_FILENO); dup2(utilPipe[1], STDERR_FILENO); close(rw[0]); if (urlCopyUtil.argc) { execvp(urlCopyUtil.argv[0], (char *const *)urlCopyUtil.argv); warn("%s", urlCopyUtil.argv[0]); _exit(EX_CONFIG); } for (size_t i = 0; i < ARRAY_LEN(CopyUtils); ++i) { execvp(CopyUtils[i].argv[0], (char *const *)CopyUtils[i].argv); if (errno != ENOENT) { warn("%s", CopyUtils[i].argv[0]); _exit(EX_CONFIG); } } warnx("no copy utility found"); _exit(EX_CONFIG); } void urlOpenCount(uint id, uint count) { for (uint 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(uint id, const char *str) { for (uint 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; } } } void urlCopyMatch(uint id, const char *str) { for (uint 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 ( !str || (url->nick && !strcmp(url->nick, str)) || strstr(url->url, str) ) { urlCopy(url->url); break; } } }


context:
space:
mode: