Author: Frédéric Bonnard <frediz@debian.org>

Obtained from:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922552#19

Fixes bug reported upstream at:

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34519

diff --git a/src/diff.c b/src/diff.c
index e2eb32437353..b574e8282dc9 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1451,6 +1451,8 @@ compare_files (struct comparison const *parent,
 	}
     }
 
+  final_process_signals ();
+
   /* Now the comparison has been done, if no error prevented it,
      and STATUS is the value this function will return.  */
 
diff --git a/src/diff.h b/src/diff.h
index 03daaa4a0530..e177fe600a25 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -390,6 +390,7 @@ extern enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *);
 extern void begin_output (void);
 extern void debug_script (struct change *);
 extern void fatal (char const *) __attribute__((noreturn));
+extern void final_process_signals (void);
 extern void finish_output (void);
 extern void message (char const *, char const *, char const *);
 extern void message5 (char const *, char const *, char const *,
diff --git a/src/util.c b/src/util.c
index 4f4d9bb285eb..56d292de2927 100644
--- a/src/util.c
+++ b/src/util.c
@@ -237,6 +237,18 @@ process_signals (void)
     }
 }
 
+/* Process remaining signals once before exit  */
+void
+final_process_signals (void)
+{
+  static int last = 1;
+
+  if (last) {
+    process_signals ();
+    last = 0;
+  }
+}
+
 static void
 install_signal_handlers (void)
 {
guix/log/gnu/machine.scm'>
<input type='hidden' name='id' value='a8f53d544b00ba80f98c1c65e3cb67ce9110ae93'/><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=a8f53d544b00ba80f98c1c65e3cb67ce9110ae93'>root</a>/<a href='/guix/log/gnu?id=a8f53d544b00ba80f98c1c65e3cb67ce9110ae93'>gnu</a>/<a href='/guix/log/gnu/machine.scm?id=a8f53d544b00ba80f98c1c65e3cb67ce9110ae93'>machine.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/machine.scm?id=a8f53d544b00ba80f98c1c65e3cb67ce9110ae93&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-02-08 13:34:02 +0100'>2022-02-08</span></td><td><a href='/guix/commit/gnu/machine.scm?id=ab7114191d4599e36958c2ec18491618bf0cc6a9'>gnu: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/machine.scm: Fix typo in top-level comment.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>jgart</td></tr>
<tr><td><span title='2020-07-25 19:11:36 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu/machine.scm?id=a5e2fc73760a2ae023f2e56bdbf8025971f90e64'>utils: Move &lt;location&gt; and '&amp;error-location' to (guix diagnostics).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/utils.scm (&lt;location&gt;, source-properties-&gt;location)
(location-&gt;source-properties, &amp;error-location): Move to...
* guix/diagnostics.scm: ... here.
* gnu.scm: Adjust imports accordingly.
* gnu/machine.scm: Likewise.
* gnu/system.scm: Likewise.
* gnu/tests.scm: Likewise.
* guix/inferior.scm: Likewise.
* tests/channels.scm: Likewise.
* tests/packages.scm: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>