hans/advcpmv
1
0
Fork 0
mirror of https://github.com/jarun/advcpmv.git synced 2026-02-01 13:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

add more comments to identify all progress mod changes

Browse Source
This commit is contained in:
Michael Wehr
2021-12-23 12:00:26 +01:00
parent aa4d645a11
commit a1cc785674
1 changed files with 104 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
advcpmv-0.9-9.0.patch
View File

@@ -1,6 +1,6 @@
diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c 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/src/copy.c 2021-09-24 13:31:05.000000000 +0200
+++ coreutils-9.0-patched/src/copy.c 2021-12-23 09:03:07.290374485 +0100 +++ coreutils-9.0-patched/src/copy.c 2021-12-23 11:35:19.632502471 +0100
@@ -129,6 +129,101 @@ @@ -129,6 +129,101 @@
dev_t dev; dev_t dev;
}; };
@@ -103,21 +103,25 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
/* Initial size of the cp.dest_info hash table. */ /* Initial size of the cp.dest_info hash table. */
#define DEST_INFO_INITIAL_CAPACITY 61 #define DEST_INFO_INITIAL_CAPACITY 61
@@ -299,10 +394,11 @@ @@ -300,9 +395,16 @@
bytes read. */
static bool static bool
sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
- size_t hole_size, bool punch_holes, bool allow_reflink, size_t hole_size, bool punch_holes, bool allow_reflink,
+ size_t hole_size, bool punch_holes, bool allow_reflink, bool move_mode, + /* BEGIN progress mod */
+ bool move_mode,
+ /* END progress mod */
char const *src_name, char const *dst_name, char const *src_name, char const *dst_name,
uintmax_t max_n_read, off_t *total_n_read, uintmax_t max_n_read, off_t *total_n_read,
- bool *last_write_made_hole) - bool *last_write_made_hole)
+ bool *last_write_made_hole, + bool *last_write_made_hole
+ struct progress_status *s_progress) + /* BEGIN progress mod */
+ , struct progress_status *s_progress
+ /* END progress mod */
+ )
{ {
*last_write_made_hole = false; *last_write_made_hole = false;
*total_n_read = 0; *total_n_read = 0;
@@ -362,6 +458,85 @@ @@ -362,6 +464,85 @@
while (max_n_read) while (max_n_read)
{ {
@@ -203,7 +207,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)); ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
if (n_read < 0) if (n_read < 0)
{ {
@@ -446,6 +621,14 @@ @@ -446,6 +627,14 @@
certain files in /proc or /sys with linux kernels. */ certain files in /proc or /sys with linux kernels. */
} }
@@ -218,40 +222,54 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
/* Ensure a trailing hole is created, so that subsequent /* Ensure a trailing hole is created, so that subsequent
calls of sparse_copy() start at the correct offset. */ calls of sparse_copy() start at the correct offset. */
if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize)) if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize))
@@ -516,9 +699,11 @@ @@ -517,8 +706,16 @@
static bool
lseek_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, 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, size_t hole_size, off_t ext_start, off_t src_total_size,
- enum Sparse_type sparse_mode, enum Sparse_type sparse_mode,
+ enum Sparse_type sparse_mode, bool move_mode, + /* BEGIN progress mod */
+ bool move_mode,
+ /* END progress mod */
bool allow_reflink, bool allow_reflink,
- char const *src_name, char const *dst_name) - char const *src_name, char const *dst_name)
+ char const *src_name, char const *dst_name, + char const *src_name, char const *dst_name
+ int iCountDown, char ** cProgressField, struct timeval last_time, + /* BEGIN progress mod */
+ int last_size, int iBarLength, struct stat src_open_sb) + , int iCountDown, char ** cProgressField, struct timeval last_time,
+ int last_size, int iBarLength, struct stat src_open_sb
+ /* END progress mod */
+ )
{ {
off_t last_ext_start = 0; off_t last_ext_start = 0;
off_t last_ext_len = 0; off_t last_ext_len = 0;
@@ -590,10 +775,16 @@ @@ -590,10 +787,26 @@
is conservative and may miss some holes. */ is conservative and may miss some holes. */
off_t n_read; off_t n_read;
bool read_hole; bool read_hole;
+ +
+ /* BEGIN progress mod */
+ struct timeval a; + struct timeval a;
+ struct stat b; + struct stat b;
+ +
+ struct progress_status s_progress={iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb}; + struct progress_status s_progress={iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
+ /* END progress mod */
+ +
if ( ! sparse_copy (src_fd, dest_fd, buf, buf_size, if ( ! sparse_copy (src_fd, dest_fd, buf, buf_size,
sparse_mode == SPARSE_NEVER ? 0 : hole_size, sparse_mode == SPARSE_NEVER ? 0 : hole_size,
- true, allow_reflink, src_name, dst_name, - true, allow_reflink, src_name, dst_name,
- ext_len, &n_read, &read_hole)) - ext_len, &n_read, &read_hole))
+ true, allow_reflink, move_mode, src_name, + true, allow_reflink,
+ dst_name, ext_len, &n_read, &read_hole, &s_progress)) + /* BEGIN progress mod */
+ move_mode,
+ /* END progress mod */
+ src_name, dst_name,
+ ext_len, &n_read, &read_hole
+ /* BEGIN progress mod */
+ , &s_progress
+ /* END progress mod */
+ ))
return false; return false;
dest_pos = ext_start + n_read; dest_pos = ext_start + n_read;
@@ -1374,8 +1565,74 @@ @@ -1374,8 +1587,78 @@
buf_alloc = xmalloc (buf_size + buf_alignment); buf_alloc = xmalloc (buf_size + buf_alignment);
buf = ptr_align (buf_alloc, buf_alignment); buf = ptr_align (buf_alloc, buf_alignment);
@@ -322,32 +340,48 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
+ +
off_t n_read; off_t n_read;
bool wrote_hole_at_eof = false; bool wrote_hole_at_eof = false;
+
+ /* BEGIN progress mod */
+ struct progress_status s_progress = { iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb}; + struct progress_status s_progress = { iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
+ /* END progress mod */
+
if (! ( if (! (
#ifdef SEEK_HOLE #ifdef SEEK_HOLE
scantype == LSEEK_SCANTYPE scantype == LSEEK_SCANTYPE
@@ -1383,15 +1640,17 @@ @@ -1383,15 +1666,30 @@
scan_inference.ext_start, src_open_sb.st_size, scan_inference.ext_start, src_open_sb.st_size,
make_holes ? x->sparse_mode : SPARSE_NEVER, make_holes ? x->sparse_mode : SPARSE_NEVER,
x->reflink_mode != REFLINK_NEVER, x->reflink_mode != REFLINK_NEVER,
- src_name, dst_name) - src_name, dst_name)
+ x->move_mode, src_name, dst_name, + /* BEGIN progress mod */
+ iCountDown, cProgressField, last_time, last_size, + x->move_mode,
+ iBarLength, src_open_sb) + /* END progress mod */
+ src_name, dst_name
+ /* BEGIN progress mod */
+ , iCountDown, cProgressField, last_time, last_size,
+ iBarLength, src_open_sb
+ /* END progress mod */
+ )
: :
#endif #endif
sparse_copy (source_desc, dest_desc, buf, buf_size, sparse_copy (source_desc, dest_desc, buf, buf_size,
make_holes ? hole_size : 0, make_holes ? hole_size : 0,
x->sparse_mode == SPARSE_ALWAYS, x->sparse_mode == SPARSE_ALWAYS,
x->reflink_mode != REFLINK_NEVER, x->reflink_mode != REFLINK_NEVER,
- src_name, dst_name, UINTMAX_MAX, &n_read, + /* BEGIN progress mod */
+ x->move_mode,
+ /* END progress mod */
src_name, dst_name, UINTMAX_MAX, &n_read,
- &wrote_hole_at_eof))) - &wrote_hole_at_eof)))
+ x->move_mode, src_name, dst_name, UINTMAX_MAX, + &wrote_hole_at_eof
+ &n_read, &wrote_hole_at_eof, &s_progress))) + /* BEGIN progress mod */
+ , &s_progress
+ /* END progress mod */
+ )))
{ {
return_val = false; return_val = false;
goto close_src_and_dst_desc; goto close_src_and_dst_desc;
@@ -1402,6 +1661,14 @@ @@ -1402,6 +1700,14 @@
return_val = false; return_val = false;
goto close_src_and_dst_desc; goto close_src_and_dst_desc;
} }
@@ -364,18 +398,20 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
if (x->preserve_timestamps) if (x->preserve_timestamps)
diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h 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/src/copy.h 2021-09-24 13:31:05.000000000 +0200
+++ coreutils-9.0-patched/src/copy.h 2021-12-22 22:30:16.072134557 +0100 +++ coreutils-9.0-patched/src/copy.h 2021-12-23 09:37:38.015722020 +0100
@@ -236,6 +236,9 @@ @@ -236,6 +236,11 @@
Create destination directories as usual. */ Create destination directories as usual. */
bool symbolic_link; bool symbolic_link;
+ /* BEGIN progress mod */
+ /* If true, draw a nice progress bar on screen */ + /* If true, draw a nice progress bar on screen */
+ bool progress_bar; + bool progress_bar;
+ /* END progress mod */
+ +
/* If true, do not copy a nondirectory that has an existing destination /* If true, do not copy a nondirectory that has an existing destination
with the same or newer modification time. */ with the same or newer modification time. */
bool update; bool update;
@@ -308,4 +311,18 @@ @@ -308,4 +313,18 @@
bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE; bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
mode_t cached_umask (void); mode_t cached_umask (void);
@@ -396,26 +432,32 @@ diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h
#endif #endif
diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c 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/src/cp.c 2021-09-24 13:31:05.000000000 +0200
+++ coreutils-9.0-patched/src/cp.c 2021-12-22 18:28:14.781215839 +0100 +++ coreutils-9.0-patched/src/cp.c 2021-12-23 11:44:06.012603217 +0100
@@ -131,6 +131,7 @@ @@ -131,6 +131,9 @@
{"symbolic-link", no_argument, NULL, 's'}, {"symbolic-link", no_argument, NULL, 's'},
{"target-directory", required_argument, NULL, 't'}, {"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'}, {"update", no_argument, NULL, 'u'},
+ /* BEGIN progress mod */
+ {"progress-bar", no_argument, NULL, 'g'}, + {"progress-bar", no_argument, NULL, 'g'},
+ /* END progress mod */
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},
{GETOPT_SELINUX_CONTEXT_OPTION_DECL}, {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
{GETOPT_HELP_OPTION_DECL}, {GETOPT_HELP_OPTION_DECL},
@@ -170,6 +171,9 @@ @@ -170,6 +173,13 @@
-f, --force if an existing destination file cannot be\n\ -f, --force if an existing destination file cannot be\n\
opened, remove it and try again (this option\n\ opened, remove it and try again (this option\n\
is ignored when the -n option is also used)\n\ is ignored when the -n option is also used)\n\
+"), stdout); /* BEGIN progress mod - remove the complete line!*/
+ fputs (_("\
+ -g, --progress-bar add a progress bar.\n\ + -g, --progress-bar add a progress bar.\n\
+ Note that this doesn't work with reflink,\n\ + Note that this doesn't work with reflink,\n\
+ reflink will be automatically disabled\n\ + reflink will be automatically disabled\n\
+"), stdout);
+/* END progress mod - remove the complete line!*/ fputs (_("\
-i, --interactive prompt before overwrite (overrides a previous -n\ -i, --interactive prompt before overwrite (overrides a previous -n\
\n\ \n\
option)\n\ option)\n\
@@ -634,6 +638,73 @@ @@ -634,6 +644,73 @@
die (EXIT_FAILURE, 0, _("target %s is not a directory"), die (EXIT_FAILURE, 0, _("target %s is not a directory"),
quoteaf (file[n_files - 1])); quoteaf (file[n_files - 1]));
} }
@@ -489,7 +531,7 @@ diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c
if (target_directory) if (target_directory)
{ {
@@ -781,6 +852,46 @@ @@ -781,6 +858,46 @@
ok = copy (source, new_dest, 0, x, &unused, NULL); ok = copy (source, new_dest, 0, x, &unused, NULL);
} }
@@ -536,7 +578,7 @@ diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c
return ok; return ok;
} }
@@ -816,6 +927,7 @@ @@ -816,6 +933,7 @@
x->recursive = false; x->recursive = false;
x->sparse_mode = SPARSE_AUTO; x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false; x->symbolic_link = false;
@@ -544,57 +586,62 @@ diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c
x->set_mode = false; x->set_mode = false;
x->mode = 0; x->mode = 0;
@@ -954,7 +1066,7 @@ @@ -954,7 +1072,8 @@
selinux_enabled = (0 < is_selinux_enabled ()); selinux_enabled = (0 < is_selinux_enabled ());
cp_option_init (&x); cp_option_init (&x);
- while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ", - while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
+ /* BEGIN and END progress mod - remove the g in the next line!*/
+ while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:TZ", + while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:TZ",
long_opts, NULL)) long_opts, NULL))
!= -1) != -1)
{ {
@@ -1011,6 +1123,10 @@ @@ -1011,6 +1130,12 @@
x.unlink_dest_after_failed_open = true; x.unlink_dest_after_failed_open = true;
break; break;
+ /* BEGIN progress mod */
+ case 'g': + case 'g':
+ progress = true; + progress = true;
+ break; + break;
+ /* END progress mod */
+ +
case 'H': case 'H':
x.dereference = DEREF_COMMAND_LINE_ARGUMENTS; x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
break; break;
@@ -1171,6 +1287,9 @@ @@ -1171,6 +1296,11 @@
usage (EXIT_FAILURE); usage (EXIT_FAILURE);
} }
+ /* BEGIN progress mod */
+ if (progress) + if (progress)
+ x.reflink_mode = REFLINK_NEVER; + x.reflink_mode = REFLINK_NEVER;
+ /* END progress mod */
+ +
x.backup_type = (make_backups x.backup_type = (make_backups
? xget_version (_("backup type"), ? xget_version (_("backup type"),
version_control_string) version_control_string)
diff -aur coreutils-9.0/src/mv.c coreutils-9.0-patched/src/mv.c 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/src/mv.c 2021-09-24 13:31:05.000000000 +0200
+++ coreutils-9.0-patched/src/mv.c 2021-12-22 23:27:30.329010117 +0100 +++ coreutils-9.0-patched/src/mv.c 2021-12-23 11:57:51.221688967 +0100
@@ -66,6 +66,7 @@ @@ -66,6 +66,9 @@
{"target-directory", required_argument, NULL, 't'}, {"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'}, {"update", no_argument, NULL, 'u'},
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},
+ /* BEGIN progress mod */
+ {"progress-bar", no_argument, NULL, 'g'}, + {"progress-bar", no_argument, NULL, 'g'},
+ /* END progress mod */
{GETOPT_HELP_OPTION_DECL}, {GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
@@ -168,10 +169,108 @@ @@ -170,8 +173,106 @@
static bool
do_move (char const *source, char const *dest, const struct cp_options *x)
{ {
+ struct timeval start_time;
+
bool copy_into_self; bool copy_into_self;
bool rename_succeeded; bool rename_succeeded;
+ +
+ /* BEGIN progress mod */ + /* BEGIN progress mod */
+ struct timeval start_time;
+
+ if(progress && x->rename_errno != 0) { + if(progress && x->rename_errno != 0) {
+ if (g_iTotalSize == 0) + if (g_iTotalSize == 0)
+ g_iTotalSize = 0; + g_iTotalSize = 0;
@@ -694,30 +741,37 @@ diff -aur coreutils-9.0/src/mv.c coreutils-9.0-patched/src/mv.c
if (ok) if (ok)
{ {
char const *dir_to_remove; char const *dir_to_remove;
@@ -306,6 +405,7 @@ @@ -306,6 +407,11 @@
\n\ \n\
-b like --backup but does not accept an argument\n\ -b like --backup but does not accept an argument\n\
-f, --force do not prompt before overwriting\n\ -f, --force do not prompt before overwriting\n\
+"), stdout); /* BEGIN progress mod - remove the complete line!*/
+fputs (_("\
+ -g, --progress-bar add progress-bar\n\ + -g, --progress-bar add progress-bar\n\
+"), stdout);
+/* END progress mod - remove the complete line!*/ fputs (_("\
-i, --interactive prompt before overwrite\n\ -i, --interactive prompt before overwrite\n\
-n, --no-clobber do not overwrite an existing file\n\ -n, --no-clobber do not overwrite an existing file\n\
If you specify more than one of -i, -f, -n, only the final one takes effect.\n\ If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
@@ -361,7 +461,7 @@ @@ -361,7 +467,8 @@
/* Try to disable the ability to unlink a directory. */ /* Try to disable the ability to unlink a directory. */
priv_set_remove_linkdir (); priv_set_remove_linkdir ();
- while ((c = getopt_long (argc, argv, "bfint:uvS:TZ", long_options, NULL)) - while ((c = getopt_long (argc, argv, "bfint:uvS:TZ", long_options, NULL))
+ /* BEGIN and END progress mod - remove the g in the next line!*/
+ while ((c = getopt_long (argc, argv, "bfint:uvgS:TZ", long_options, NULL)) + while ((c = getopt_long (argc, argv, "bfint:uvgS:TZ", long_options, NULL))
!= -1) != -1)
{ {
switch (c) switch (c)
@@ -407,6 +507,9 @@ @@ -407,6 +514,11 @@
case 'v': case 'v':
x.verbose = true; x.verbose = true;
break; break;
+ /* BEGIN progress mod */
+ case 'g': + case 'g':
+ progress = true; + progress = true;
+ break; + break;
+ /* END progress mod */
case 'S': case 'S':
make_backups = true; make_backups = true;
backup_suffix = optarg; backup_suffix = optarg;