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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- e2fsck/unix.c.orig 2018-07-10 05:14:26 UTC
+++ e2fsck/unix.c
@@ -9,8 +9,6 @@
* %End-Header%
*/
-#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */
-
#include "config.h"
#include <stdio.h>
#ifdef HAVE_STDLIB_H
@@ -37,7 +35,7 @@ extern int optind;
#include <sys/ioctl.h>
#endif
#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+#include <stdlib.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -601,6 +599,24 @@ static int e2fsck_update_progress(e2fsck
return 0;
}
+static int e2fsck_progress_once(e2fsck_t ctx, int pass, unsigned long cur, unsigned long max)
+{
+ char buf[80];
+ float percent;
+
+ if (pass == 0)
+ return 0;
+
+ percent = calc_percent(&e2fsck_tbl, pass, cur, max);
+ e2fsck_simple_progress(ctx, ctx->device_name,
+ percent, 0);
+
+ printf("\n");
+ ctx->progress = 0;
+ return 0;
+}
+
+
#define PATH_SET "PATH=/sbin"
/*
@@ -633,6 +649,17 @@ static void signal_progress_on(int sig E
ctx->progress = e2fsck_update_progress;
}
+static void signal_progress_now(int sig EXT2FS_ATTR((unused)))
+{
+ e2fsck_t ctx = e2fsck_global_ctx;
+
+ if (!ctx)
+ return;
+
+ ctx->progress = e2fsck_progress_once;
+ ctx->progress_fd = 0;
+}
+
static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
@@ -1103,6 +1130,10 @@ static errcode_t PRS(int argc, char *arg
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
sigaction(SIGUSR2, &sa, 0);
+ sa.sa_handler = signal_progress_now;
+ if (!getenv("e2fsprogs_inhibit_SIGINFO")) {
+ sigaction(SIGINFO, &sa, 0);
+ }
#endif
/* Update our PATH to include /sbin if we need to run badblocks */
|
