From 3121eeb5e68bedd6e2398f35b9bd60b69709a47e Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Tue, 14 Dec 2021 18:49:54 +0100
Subject: [PATCH] Replace hardcoded command length

---
 src/screenshot/screenshot.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/screenshot/screenshot.c b/src/screenshot/screenshot.c
index 9df0ea7..5f27681 100644
--- a/src/screenshot/screenshot.c
+++ b/src/screenshot/screenshot.c
@@ -42,8 +42,9 @@ static bool exec_screenshooter_interactive(const char *path) {
 		perror("fork");
 		return false;
 	} else if (pid == 0) {
-		char cmd[strlen(path) + 25];
-		snprintf(cmd, sizeof(cmd), "grim -g \"$(slurp)\" -- %s", path);
+		const char cmd_fmt[] = "grim -g \"$(slurp)\" -- %s";
+		char cmd[strlen(path) + sizeof(cmd_fmt)];
+		snprintf(cmd, sizeof(cmd), cmd_fmt, path);
 		execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
 		perror("execl");
 		exit(127);
-- 
2.34.0

tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>refs</a><a class='active' href='/guix/log/tests/services.scm'>log</a><a href='/guix/tree/tests/services.scm?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>tree</a><a href='/guix/commit/tests/services.scm?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>commit</a><a href='/guix/diff/tests/services.scm?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/services.scm'>
<input type='hidden' name='id' value='fe2ea5a4563756c6b18e38daaf139f1043863ca8'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>root</a>/<a href='/guix/log/tests?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>tests</a>/<a href='/guix/log/tests/services.scm?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8'>services.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/services.scm?id=fe2ea5a4563756c6b18e38daaf139f1043863ca8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-06-06 11:54:39 +0200'>2023-06-06</span></td><td><a href='/guix/commit/tests/services.scm?id=181951207339508789b28ba7cb914f983319920f'>services: 'modify-services' preserves service ordering.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/63921&gt;.

The regression was introduced in
dbbc7e946131ba257728f1d05b96c4339b7ee88b, which changed the order of
services.  As a result, someone using 'modify-services' could find
themselves with incorrect ordering of expressions in the "boot" script,
whereby the cleanup expressions would come after (execl ".../shepherd").
This, in turn, would lead shepherd to error out at boot with EADDRINUSE
on /var/run/shepherd/socket.

* gnu/services.scm (%delete-service, %apply-clauses): Remove.
(clause-alist): New macro.
(apply-clauses): New procedure.
(modify-services): Use it.  Adjust docstring.
* tests/services.scm ("modify-services: do nothing"): Remove 'sort' call.
("modify-services: delete service"): Likewise, and add 't4' service.
("modify-services: change value"): Remove 'sort' call and fix expected value.
</span></span></td><td>Ludovic Courtès</td></tr>