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)
 {
<form class='right' method='get' action='/guix/log/gnu/services/spice.scm'>
<input type='hidden' name='id' value='93d1f8e5fc78bd82e8920d25b3e52a2d22528c17'/><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=93d1f8e5fc78bd82e8920d25b3e52a2d22528c17'>root</a>/<a href='/guix/log/gnu?id=93d1f8e5fc78bd82e8920d25b3e52a2d22528c17'>gnu</a>/<a href='/guix/log/gnu/services?id=93d1f8e5fc78bd82e8920d25b3e52a2d22528c17'>services</a>/<a href='/guix/log/gnu/services/spice.scm?id=93d1f8e5fc78bd82e8920d25b3e52a2d22528c17'>spice.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/services/spice.scm?id=93d1f8e5fc78bd82e8920d25b3e52a2d22528c17&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-06 16:51:49 -0400'>2021-05-06</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=b39c4e18f28d39929a034a2350b316038044638e'>services: spice-vdagent: Clear the socket file prior to starting.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-05-05 16:31:06 -0400'>2021-05-05</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=6b0704339dacaada2dd9a999395c2dffc1bd9af0'>services: Fix the spice-vdagent service.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-04-21 00:06:40 +0200'>2020-04-21</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=7d903d2ff7e17406c0650541f35e37a99dab8759'>services: Don't use the deprecated 'make-forkexec-constructor' call.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-26 18:45:09 +0100'>2020-01-26</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=9a5edd02405b9ee70bc2f93b91483e8da2eadfd3'>services: Fix typo in spice-vdagent-service.</a><span class='msg-avail'>...</span></td><td>Damien Cassou</td></tr>
: Add device-tree-support? option.</a><span class='msg-avail'>...</span></td><td>Reza Alizadeh Majd</td></tr>
<tr><td><span title='2022-08-28 23:37:28 +0200'>2022-08-28</span></td><td><a href='/guix/commit/gnu/bootloader.scm?id=0811d2cb8dff5de9f535e14726c9874ec2f4a96c'>bootloader: Convert device in menu-entry to proper sexp.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2022-08-21 02:00:00 +0200'>2022-08-21</span></td><td><a href='/guix/commit/gnu/bootloader.scm?id=91b112b8dd28007db9a6f43dd65457e6763b486f'>bootloader: Remove expired export.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-11-17 23:05:58 +0100'>2021-11-17</span></td><td><a href='/guix/commit/gnu/bootloader.scm?id=7c4142628a397f7863f346635591dbe92b667b45'>gnu: system: Improve location of some configuration warnings.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2021-08-30 14:22:35 +0200'>2021-08-30</span></td><td><a href='/guix/commit/gnu/bootloader.scm?id=baf4272df2350a40bfa198f5cdb42e707e32ad71'>bootloader: Report location of the deprecated 'target' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/gnu/bootloader.scm?id=2ca982ff41270288913ad6b7d5d9e1cad87b06d9'>gnu: bootloader: Support multiple targets.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>