mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 16:21:50 -04:00
884b6a175c
- Refresh old patches to avoid fuzz. - Add two upstream patches to fix the use-after-free() issue. - There seem to be double-free() issues left but these do not show during self-test, only under valgrind instrumentation so we'll move the port ahead and get packages while working with upstream to debug this through the end. - Bump PORTREVISION to 1.
72 lines
1.4 KiB
C
72 lines
1.4 KiB
C
--- e2fsck/unix.c.orig 2014-08-12 18:19:37 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 @@
|
|
#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>
|
|
@@ -590,6 +588,24 @@
|
|
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"
|
|
|
|
/*
|
|
@@ -622,6 +638,17 @@
|
|
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;
|
|
@@ -1001,6 +1028,8 @@
|
|
sigaction(SIGUSR1, &sa, 0);
|
|
sa.sa_handler = signal_progress_off;
|
|
sigaction(SIGUSR2, &sa, 0);
|
|
+ sa.sa_handler = signal_progress_now;
|
|
+ sigaction(SIGINFO, &sa, 0);
|
|
#endif
|
|
|
|
/* Update our PATH to include /sbin if we need to run badblocks */
|