summary refs log tree commit diff
diff options
context:
space:
mode:
authorKlemens Nanni <klemens@posteo.de>2021-06-14 21:37:07 +0000
committerJune McEnroe <june@causal.agency>2021-06-15 13:20:09 -0400
commitb690bd0b83ffb6d29a1cd373635864bd1b086ac7 (patch)
treec19afee6fbe05b30681ec03dfdc0e2ec4f1e9840
parentOpenBSD: pledge final promises earlier (diff)
downloadcatgirl-b690bd0b83ffb6d29a1cd373635864bd1b086ac7.tar.gz
catgirl-b690bd0b83ffb6d29a1cd373635864bd1b086ac7.zip
OpenBSD: Simplify promise creation after seprintf() introduction
Just truncate the initial promises back to the final ones after pledging
for the first time, saving code and memory.

Assign `ptr' in all initial `seprintf()' calls for consistency while
here.
-rw-r--r--chat.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/chat.c b/chat.c
index 2a64ee0..9332ca8 100644
--- a/chat.c
+++ b/chat.c
@@ -295,10 +295,9 @@ int main(int argc, char *argv[]) {
 	if (logEnable) ptr = seprintf(ptr, end, " wpath cpath");
 	if (!self.restricted) ptr = seprintf(ptr, end, " proc exec");
 
-	char *promisesFinal = strdup(promises);
-	if (!promisesFinal) err(EX_OSERR, "strdup");
+	char *promisesInitial = ptr;
 
-	seprintf(ptr, end, " inet dns");
+	ptr = seprintf(ptr, end, " inet dns");
 	int error = pledge(promises, NULL);
 	if (error) err(EX_OSERR, "pledge");
 #endif
@@ -316,9 +315,9 @@ int main(int argc, char *argv[]) {
 	int irc = ircConnect(bind, host, port);
 
 #ifdef __OpenBSD__
-	error = pledge(promisesFinal, NULL);
+	*promisesInitial = '\0';
+	error = pledge(promises, NULL);
 	if (error) err(EX_OSERR, "pledge");
-	free(promisesFinal);
 #endif
 
 	if (pass) ircFormat("PASS :%s\r\n", pass);
ighlight'> 2021-09-23Add quickJune McEnroe 2021-09-23Add The HobbitJune McEnroe Surprisingly good for something written by a man like a hundred years ago! 2021-09-22Remove PSF fontsJune McEnroe They were fun to make but I never actually used them. 2021-09-22Remove Linux-specific utilitiesJune McEnroe I haven't used these in ages. 2021-09-22Call sandbox in CGI modeJune McEnroe Otherwise upload won't actually work. 2021-09-22Support HTTP PUT in upJune McEnroe For use by Palaver[1]. Unfortunately, at least in the current App Store version of Palaver, this doesn't work correctly with basic auth. [1]: https://palaverapp.com/guides/commands/set.html#ui-image_service 2021-09-22Remove default faviconJune McEnroe I hate these things and also this one sucks. 2021-09-21Use Z_FILTERED strategyJune McEnroe 2021-09-21Recalculate various lengths only as neededJune McEnroe This actually speeds things up quite a bit, saving roughly a second on a big PNG screenshot. Almost all the remaining time is spent in deflate. 2021-09-21Rewrite pngo, add explicit optionsJune McEnroe Interesting to see how my code habits have changed. 2021-09-16Fix /* **/ comment matchingJune McEnroe 2021-09-15Remove typer, add downgrade to READMEJune McEnroe 2021-09-15Set bot mode on downgradeJune McEnroe 2021-09-15Enter capsicum in downgradeJune McEnroe 2021-09-15Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe