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

 class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>refs</a><a class='active' href='/guix/log/gnu/system/examples/plasma.tmpl'>log</a><a href='/guix/tree/gnu/system/examples/plasma.tmpl?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>tree</a><a href='/guix/commit/gnu/system/examples/plasma.tmpl?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>commit</a><a href='/guix/diff/gnu/system/examples/plasma.tmpl?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/examples/plasma.tmpl'>
<input type='hidden' name='id' value='5ef5095ab101874e1ddee99fabb9c14e30888b9d'/><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=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>root</a>/<a href='/guix/log/gnu?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>gnu</a>/<a href='/guix/log/gnu/system?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>system</a>/<a href='/guix/log/gnu/system/examples?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>examples</a>/<a href='/guix/log/gnu/system/examples/plasma.tmpl?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d'>plasma.tmpl</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/gnu/system/examples/plasma.tmpl?id=5ef5095ab101874e1ddee99fabb9c14e30888b9d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-08-22 01:14:47 +0200'>2023-08-22</span></td><td><a href='/guix/commit/gnu/system/examples/plasma.tmpl?id=30355c17d7b7eaeb16976c1432d660cb0783014a'>examples: Avoid duplicate SDDM service for Plasma on aarch64-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to cf28f46930f1ea4087d84c162cfacfcdff842b1f.

* gnu/system/examples/plasma.tmpl (services): Remove both
'gdm-service-type' and 'sddm-service-type' from %DESKTOP-SERVICES.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-21 23:06:49 +0200'>2023-08-21</span></td><td><a href='/guix/commit/gnu/system/examples/plasma.tmpl?id=cf28f46930f1ea4087d84c162cfacfcdff842b1f'>examples: Avoid 'modify-services' to remove GDM.</a><span class='msg-avail'>...<span class='msg-tooltip'>This led to a 'tests/guix-system.sh' failure on aarch64-linux:

  …/plasma.tmpl:60:13: error: modify-services: service 'gdm' not found in service list

This is because 'gdm-service-type' is not among %DESKTOP-SERVICES on
that architecture.

* gnu/system/examples/plasma.tmpl (services): Use 'remove' rather
'modify-services' + 'delete'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-08-03 17:38:10 +0800'>2023-08-03</span></td><td><a href='/guix/commit/gnu/system/examples/plasma.tmpl?id=5c688178130ff3da3463d087f74ad9bcc9b104ae'>examples: Add plasma operating-system example template.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/plasma.tmpl: New file.
* Makefile.am (EXAMPLES): register it.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;
</span></span></td><td>Zheng Junjie</td></tr>