1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
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)
{
|
