1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-05 16:19:23 +02:00

dd: output final progress before syncing

Problem reported by Sworddragon (Bug#51482).
* src/dd.c (reported_w_bytes): New var.
(print_xfer_stats): Set it.
(dd_copy): Print a final progress report if useful before
synchronizing output data.
This commit is contained in:
Paul Eggert
2022-01-27 18:34:09 -08:00
parent 816d84f138
commit c4f9554ee9
2 changed files with 16 additions and 0 deletions
+4
View File
@@ -58,6 +58,10 @@ GNU coreutils NEWS -*- outline -*-
The new 'date' option --resolution outputs the timestamp resolution.
With conv=fdatasync or conv=fsync, dd status=progress now reports
any extra final progress just before synchronizing output data,
since synchronizing can take a long time.
sort --debug now diagnoses issues with --field-separator characters
that conflict with characters possibly used in numbers.
+12
View File
@@ -196,6 +196,9 @@ static intmax_t r_full = 0;
/* Number of bytes written. */
static intmax_t w_bytes = 0;
/* Last-reported number of bytes written, or negative if never reported. */
static intmax_t reported_w_bytes = -1;
/* Time that dd started. */
static xtime_t start_time;
@@ -815,6 +818,8 @@ print_xfer_stats (xtime_t progress_time)
}
else
fputc ('\n', stderr);
reported_w_bytes = w_bytes;
}
static void
@@ -2365,6 +2370,13 @@ dd_copy (void)
}
}
/* fdatasync/fsync can take a long time, so issue a final progress
indication now if progress has been made since the previous indication. */
if (conversions_mask & (C_FDATASYNC | C_FSYNC)
&& status_level == STATUS_PROGRESS
&& 0 <= reported_w_bytes && reported_w_bytes < w_bytes)
print_xfer_stats (0);
if ((conversions_mask & C_FDATASYNC) && ifdatasync (STDOUT_FILENO) != 0)
{
if (errno != ENOSYS && errno != EINVAL)