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

lass='sub'>Wojtek's customized Guix</td><td 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=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>refs</a><a class='active' href='/guix/log/gnu/installer/keymap.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/installer/keymap.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>tree</a><a href='/guix/commit/gnu/installer/keymap.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>commit</a><a href='/guix/diff/gnu/installer/keymap.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/keymap.scm'>
<input type='hidden' name='id' value='54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'/><input type='hidden' name='showmsg' value='1'/><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=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/installer?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>installer</a>/<a href='/guix/log/gnu/installer/keymap.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>keymap.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/gnu/installer/keymap.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-09-21 20:35:49 +0000'>2021-09-21</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/keymap.scm?id=d58e52b0713648dd30d41b41277854a935d8d15a'>installer: keymap: Fix optional fields handling.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes: &lt;https://issues.guix.gnu.org/50723&gt;.

The keymap xml contains optional shortDescription and description fields. The
assoc-ref call on those fields can return false, handle it correctly.

* gnu/installer/keymap.scm (xkb-rules-&gt;models+layouts): Introduce a new
"maybe-empty" helper to deal with optional fields. Use it for shortDescription
and description fields.


</td></tr>
<tr class='logheader'><td><span title='2020-04-09 02:42:54 +0000'>2020-04-09</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/keymap.scm?id=91c231a2223440081426929828a23c7baa0214fd'>installer: Allow Alt+Shift toggle from non-Latin keyboard layouts.</a></td><td>Florian Pelz</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/40493&gt;.

* gnu/installer/newt/keymap.scm (%non-latin-layouts): New variable.
(%non-latin-variants): New variable.
(%latin-layout+variants): New variable.
(toggleable-latin-layout): New procedure to compute combined layouts.
(run-keymap-page): Use it.
(keyboard-layout-&gt;configuration): Apply it in config.scm.
(run-layout-page): Mention Alt+Shift.
* gnu/installer/keymap.scm (kmscon-update-keymap): Pass on XKB options.
* gnu/installer/record.scm (&lt;installer&gt;): Adjust code comments.
* gnu/installer.scm (apply-keymap): Pass on XKB options.
(installer-steps): Adjust code comments.
* gnu/packages/patches/kmscon-runtime-keymap-switch.patch: Apply XKB options.


</td></tr>