diff --git a/advcpmv-0.9-9.0.patch b/advcpmv-0.9-9.0.patch index f38c74f..8615a79 100644 --- a/advcpmv-0.9-9.0.patch +++ b/advcpmv-0.9-9.0.patch @@ -1,7 +1,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c --- coreutils-9.0/src/copy.c 2021-09-24 13:31:05.000000000 +0200 -+++ coreutils-9.0-patched/src/copy.c 2021-12-25 11:08:37.969704196 +0100 -@@ -129,6 +129,95 @@ ++++ coreutils-9.0-patched/src/copy.c 2022-01-04 21:09:38.656916500 +0100 +@@ -129,6 +129,119 @@ dev_t dev; }; @@ -39,6 +39,30 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c + return _cEscapedString; +} + ++char * format_elapsed_time ( double sec_elapsed ) ++{ ++ // hours ++ long hr = ( (int) sec_elapsed / (60 * 60)) % 24; ++ // minutes ++ int min = ( (int) sec_elapsed / 60) % 60; ++ // seconds ++ double sec = sec_elapsed - (hr * (60 * 60)) - (min * 60); ++ size_t maxneeded = snprintf(NULL, 0, "%ldh %dm %.1fs", hr, min, sec) + 1; ++ char * _cElapsedTimeString; ++ _cElapsedTimeString = (char *) calloc( sizeof(char) * maxneeded, sizeof(char) ); ++ if ( sec_elapsed >= 3600 ) ++ { ++ sprintf(_cElapsedTimeString, "%ldh %dm %.1fs", hr, min, sec); ++ } else if ( sec_elapsed >= 60 ) ++ { ++ sprintf(_cElapsedTimeString, "%dm %.1fs", min, sec); ++ } else ++ { ++ sprintf(_cElapsedTimeString, "%.1fs", sec); ++ } ++ return _cElapsedTimeString; ++} ++ +static void file_progress_bar ( char * _cDest, int _iBarLength, long _lProgress, long _lTotal ) +{ + double dPercent = (double) _lProgress / (double) _lTotal * 100.f; @@ -97,7 +121,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c /* Initial size of the cp.dest_info hash table. */ #define DEST_INFO_INITIAL_CAPACITY 61 -@@ -300,9 +389,16 @@ +@@ -300,9 +413,16 @@ static bool sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, size_t hole_size, bool punch_holes, bool allow_reflink, @@ -115,7 +139,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c { *last_write_made_hole = false; *total_n_read = 0; -@@ -362,6 +458,85 @@ +@@ -362,6 +482,85 @@ while (max_n_read) { @@ -201,7 +225,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size)); if (n_read < 0) { -@@ -446,6 +621,14 @@ +@@ -446,6 +645,14 @@ certain files in /proc or /sys with linux kernels. */ } @@ -216,7 +240,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c /* Ensure a trailing hole is created, so that subsequent calls of sparse_copy() start at the correct offset. */ if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize)) -@@ -517,8 +700,16 @@ +@@ -517,8 +724,16 @@ lseek_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, size_t hole_size, off_t ext_start, off_t src_total_size, enum Sparse_type sparse_mode, @@ -234,7 +258,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c { off_t last_ext_start = 0; off_t last_ext_len = 0; -@@ -590,10 +781,26 @@ +@@ -590,10 +805,26 @@ is conservative and may miss some holes. */ off_t n_read; bool read_hole; @@ -263,7 +287,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c return false; dest_pos = ext_start + n_read; -@@ -1374,8 +1581,82 @@ +@@ -1374,8 +1605,82 @@ buf_alloc = xmalloc (buf_size + buf_alignment); buf = ptr_align (buf_alloc, buf_alignment); @@ -346,7 +370,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c if (! ( #ifdef SEEK_HOLE scantype == LSEEK_SCANTYPE -@@ -1383,15 +1664,30 @@ +@@ -1383,15 +1688,30 @@ scan_inference.ext_start, src_open_sb.st_size, make_holes ? x->sparse_mode : SPARSE_NEVER, x->reflink_mode != REFLINK_NEVER, @@ -379,7 +403,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c { return_val = false; goto close_src_and_dst_desc; -@@ -1402,6 +1698,14 @@ +@@ -1402,6 +1722,14 @@ return_val = false; goto close_src_and_dst_desc; } @@ -396,7 +420,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c if (x->preserve_timestamps) diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h --- coreutils-9.0/src/copy.h 2021-09-24 13:31:05.000000000 +0200 -+++ coreutils-9.0-patched/src/copy.h 2021-12-23 18:38:01.481129523 +0100 ++++ coreutils-9.0-patched/src/copy.h 2022-01-04 21:09:38.660916566 +0100 @@ -236,6 +236,11 @@ Create destination directories as usual. */ bool symbolic_link; @@ -409,12 +433,13 @@ diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h /* If true, do not copy a nondirectory that has an existing destination with the same or newer modification time. */ bool update; -@@ -308,4 +313,18 @@ +@@ -308,4 +313,19 @@ bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE; mode_t cached_umask (void); +/* BEGIN progress mod */ +char * escape_double_quotes ( char * _cUnescapedString ); ++char * format_elapsed_time ( double sec_elapsed ); + +int file_size_format ( char * _cDst, long _lSize, int _iCounter ); + @@ -430,7 +455,7 @@ diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h #endif diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c --- coreutils-9.0/src/cp.c 2021-09-24 13:31:05.000000000 +0200 -+++ coreutils-9.0-patched/src/cp.c 2021-12-25 11:00:50.346873872 +0100 ++++ coreutils-9.0-patched/src/cp.c 2022-01-04 21:09:38.660916566 +0100 @@ -131,6 +131,9 @@ {"symbolic-link", no_argument, NULL, 's'}, {"target-directory", required_argument, NULL, 't'}, @@ -585,8 +610,8 @@ diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c + sprintf ( sFType, "%s", "folder(s)/file(s)" ); + else + sprintf ( sFType, "%s", "file(s)" ); -+ printf ( "%d %s (%s) copied in %.1f seconds (%s/s).\n", g_iFilesCopied, sFType, -+ sTotalWritten, sec_elapsed, s_copy_speed ); ++ printf ( "%d %s (%s) copied in %s (%s/s).\n", g_iFilesCopied, sFType, ++ sTotalWritten, format_elapsed_time(sec_elapsed), s_copy_speed ); + } + /* END progress mod */ + @@ -638,7 +663,7 @@ diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c version_control_string) diff -aur coreutils-9.0/src/mv.c coreutils-9.0-patched/src/mv.c --- coreutils-9.0/src/mv.c 2021-09-24 13:31:05.000000000 +0200 -+++ coreutils-9.0-patched/src/mv.c 2021-12-23 19:15:58.867551600 +0100 ++++ coreutils-9.0-patched/src/mv.c 2022-01-04 21:09:38.660916566 +0100 @@ -66,6 +66,9 @@ {"target-directory", required_argument, NULL, 't'}, {"update", no_argument, NULL, 'u'}, @@ -762,8 +787,8 @@ diff -aur coreutils-9.0/src/mv.c coreutils-9.0-patched/src/mv.c + sprintf ( sFType, "%s", "folder(s)/file(s)" ); + else + sprintf ( sFType, "%s", "file(s)" ); -+ printf ( "%d %s (%s) moved in %.1f seconds (%s/s).\n", g_iFilesCopied, sFType, -+ sTotalWritten, sec_elapsed, s_copy_speed ); ++ printf ( "%d %s (%s) moved in %s (%s/s).\n", g_iFilesCopied, sFType, ++ sTotalWritten, format_elapsed_time(sec_elapsed), s_copy_speed ); + } + } + /* END progress mod */