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

revert some things for review purposes

Browse Source
This commit is contained in:
Michael Wehr
2022-02-14 21:15:17 +01:00
parent f854b119e9
commit bb5b892ace
2 changed files with 101 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
advcpmv-0.8-8.32.patch
View File

@@ -1,6 +1,6 @@
diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched-nc/src/copy.c
--- coreutils-8.32/src/copy.c 2020-01-01 15:13:12.000000000 +0100
+++ coreutils-8.32-patched/src/copy.c 2022-02-14 21:10:42.216002503 +0100
+++ coreutils-8.32-patched-nc/src/copy.c 2022-02-14 21:14:14.171156659 +0100
@@ -129,6 +129,133 @@
dev_t dev;
};
@@ -135,21 +135,17 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
/* Initial size of the cp.dest_info hash table. */
#define DEST_INFO_INITIAL_CAPACITY 61
@@ -259,17 +386,129 @@
@@ -258,18 +385,124 @@
bytes read. */
static bool
sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
size_t hole_size, bool punch_holes,
+ /* BEGIN progress mod */
+ bool move_mode,
+ /* END progress mod */
- size_t hole_size, bool punch_holes,
+ size_t hole_size, bool punch_holes, bool move_mode,
char const *src_name, char const *dst_name,
uintmax_t max_n_read, off_t *total_n_read,
- bool *last_write_made_hole)
+ bool *last_write_made_hole
+ /* BEGIN progress mod */
+ , struct progress_status *s_progress
+ /* END progress mod */
+ )
+ bool *last_write_made_hole,
+ struct progress_status *s_progress)
{
*last_write_made_hole = false;
*total_n_read = 0;
@@ -266,7 +262,7 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
if (n_read < 0)
{
@@ -354,6 +593,14 @@
@@ -354,6 +587,14 @@
certain files in /proc or /sys with linux kernels. */
}
@@ -281,54 +277,40 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-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))
@@ -421,8 +668,16 @@
@@ -420,9 +661,11 @@
static bool
extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
size_t hole_size, off_t src_total_size,
enum Sparse_type sparse_mode,
+ /* BEGIN progress mod */
+ bool move_mode,
+ /* END progress mod */
- enum Sparse_type sparse_mode,
+ enum Sparse_type sparse_mode, bool move_mode,
char const *src_name, char const *dst_name,
- bool *require_normal_copy)
+ bool *require_normal_copy
+ /* BEGIN progress mod */
+ , int iCountDown, char ** cProgressField, struct timeval last_time,
+ int last_size, int iBarLength, struct stat src_open_sb
+ /* END progress mod */
+ )
+ bool *require_normal_copy,
+ int iCountDown, char ** cProgressField, struct timeval last_time,
+ int last_size, int iBarLength, struct stat src_open_sb)
{
struct extent_scan scan;
off_t last_ext_start = 0;
@@ -553,10 +808,26 @@
@@ -553,10 +796,16 @@
last_ext_len = ext_len;
bool read_hole;
+ /* BEGIN progress mod */
+ struct timeval a;
+ struct stat b;
+
+ 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,
sparse_mode == SPARSE_ALWAYS ? hole_size: 0,
- true, src_name, dst_name, ext_len, &n_read,
- &read_hole))
+ true,
+ /* 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 */
+ ))
+ true, move_mode, src_name, dst_name, ext_len,
+ &n_read, &read_hole, &s_progress))
goto fail;
dest_pos = ext_start + n_read;
@@ -1305,6 +1576,75 @@
@@ -1305,6 +1554,75 @@
buf_alloc = xmalloc (buf_size + buf_alignment);
buf = ptr_align (buf_alloc, buf_alignment);
@@ -404,75 +386,56 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
if (sparse_src)
{
bool normal_copy_required;
@@ -1316,7 +1656,15 @@
@@ -1316,7 +1634,9 @@
if (extent_copy (source_desc, dest_desc, buf, buf_size, hole_size,
src_open_sb.st_size,
make_holes ? x->sparse_mode : SPARSE_NEVER,
- src_name, dst_name, &normal_copy_required))
+ /* BEGIN progress mod */
+ x->move_mode,
+ /* END progress mod */
+ src_name, dst_name, &normal_copy_required
+ /* BEGIN progress mod */
+ , iCountDown, cProgressField, last_time, last_size,
+ iBarLength, src_open_sb
+ /* END progress mod */
+ ))
+ x->move_mode, src_name, dst_name, &normal_copy_required,
+ iCountDown, cProgressField, last_time, last_size,
+ iBarLength, src_open_sb))
goto preserve_metadata;
if (! normal_copy_required)
@@ -1328,11 +1676,24 @@
@@ -1328,11 +1648,14 @@
off_t n_read;
bool wrote_hole_at_eof;
+
+ /* BEGIN progress mod */
+ struct progress_status s_progress = { iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
+ /* END progress mod */
+
if (! sparse_copy (source_desc, dest_desc, buf, buf_size,
make_holes ? hole_size : 0,
- x->sparse_mode == SPARSE_ALWAYS, src_name, dst_name,
+ x->sparse_mode == SPARSE_ALWAYS,
+ /* BEGIN progress mod */
+ x->move_mode,
+ /* END progress mod */
+ src_name, dst_name,
UINTMAX_MAX, &n_read,
- UINTMAX_MAX, &n_read,
- &wrote_hole_at_eof))
+ &wrote_hole_at_eof
+ /* BEGIN progress mod */
+ , &s_progress
+ /* END progress mod */
+ ))
+ x->sparse_mode == SPARSE_ALWAYS, x->move_mode,
+ src_name, dst_name, UINTMAX_MAX, &n_read,
+ &wrote_hole_at_eof, &s_progress))
{
return_val = false;
goto close_src_and_dst_desc;
@@ -1343,6 +1704,14 @@
@@ -1343,6 +1666,12 @@
return_val = false;
goto close_src_and_dst_desc;
}
+ /* BEGIN progress mod */
+ if (progress) {
+ int i;
+ for ( i = 0; i < 6; i++ )
+ free ( cProgressField[i] );
+ free ( cProgressField );
+ }
+ /* END progress mod */
}
preserve_metadata:
@@ -1716,15 +2085,19 @@
@@ -1716,15 +2045,15 @@
fprintf (stderr,
(x->move_mode || x->unlink_dest_before_opening
|| x->unlink_dest_after_failed_open)
- ? _("%s: replace %s, overriding mode %04lo (%s)? ")
- : _("%s: unwritable %s (mode %04lo, %s); try anyway? "),
+ /* BEGIN progress mod - remove \n\n in string!*/
+ ? _("\n\n%s: replace %s, overriding mode %04lo (%s)? ")
+ : _("\n\n%s: unwritable %s (mode %04lo, %s); try anyway? "),
+ /* END progress mod */
program_name, quoteaf (dst_name),
(unsigned long int) (dst_sb->st_mode & CHMOD_MODE_BITS),
&perms[1]);
@@ -480,28 +443,24 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
else
{
- fprintf (stderr, _("%s: overwrite %s? "),
+ /* BEGIN progress mod - remove \n\n in string!*/
+ fprintf (stderr, _("\n\n%s: overwrite %s? "),
+ /* END progress mod - remove \n\n in string!*/
program_name, quoteaf (dst_name));
}
diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched/src/copy.h
diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched-nc/src/copy.h
--- coreutils-8.32/src/copy.h 2020-01-01 15:13:12.000000000 +0100
+++ coreutils-8.32-patched/src/copy.h 2022-02-14 21:10:42.220002638 +0100
@@ -234,6 +234,11 @@
+++ coreutils-8.32-patched-nc/src/copy.h 2022-02-14 21:14:14.175156795 +0100
@@ -234,6 +234,9 @@
Create destination directories as usual. */
bool symbolic_link;
+ /* BEGIN progress mod */
+ /* If true, draw a nice progress bar on screen */
+ bool progress_bar;
+ /* END progress mod */
+
/* If true, do not copy a nondirectory that has an existing destination
with the same or newer modification time. */
bool update;
@@ -304,4 +309,22 @@
@@ -304,4 +307,22 @@
bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
mode_t cached_umask (void);
@@ -524,34 +483,28 @@ diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched/src/copy.h
+/* END progress mod */
+
#endif
diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched-nc/src/cp.c
--- coreutils-8.32/src/cp.c 2020-01-01 15:13:12.000000000 +0100
+++ coreutils-8.32-patched/src/cp.c 2022-02-14 21:10:42.220002638 +0100
@@ -131,6 +131,9 @@
+++ coreutils-8.32-patched-nc/src/cp.c 2022-02-14 21:14:14.175156795 +0100
@@ -131,6 +131,7 @@
{"symbolic-link", no_argument, NULL, 's'},
{"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'},
+ /* BEGIN progress mod */
+ {"progress-bar", no_argument, NULL, 'g'},
+ /* END progress mod */
{"verbose", no_argument, NULL, 'v'},
{GETOPT_SELINUX_CONTEXT_OPTION_DECL},
{GETOPT_HELP_OPTION_DECL},
@@ -170,6 +173,13 @@
@@ -170,6 +171,9 @@
-f, --force if an existing destination file cannot be\n\
opened, remove it and try again (this option\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\
+ Note that this doesn't work with reflink,\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\
\n\
option)\n\
@@ -635,6 +645,84 @@
@@ -635,6 +639,84 @@
die (EXIT_FAILURE, 0, _("target %s is not a directory"),
quoteaf (file[n_files - 1]));
}
@@ -636,7 +589,7 @@ diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
if (target_directory)
{
@@ -777,6 +865,56 @@
@@ -777,6 +859,56 @@
ok = copy (source, new_dest, 0, x, &unused, NULL);
}
@@ -693,55 +646,46 @@ diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
return ok;
}
@@ -812,6 +950,11 @@
@@ -812,6 +944,7 @@
x->recursive = false;
x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false;
+
+ /* BEGIN progress mod */
+ x->progress_bar = false;
+ /* END progress mod */
+
x->set_mode = false;
x->mode = 0;
@@ -950,7 +1093,8 @@
@@ -950,7 +1083,7 @@
selinux_enabled = (0 < is_selinux_enabled ());
cp_option_init (&x);
- 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",
long_opts, NULL))
!= -1)
{
@@ -1007,6 +1151,12 @@
@@ -1007,6 +1140,10 @@
x.unlink_dest_after_failed_open = true;
break;
+ /* BEGIN progress mod */
+ case 'g':
+ progress = true;
+ break;
+ /* END progress mod */
+
case 'H':
x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
break;
diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched/src/mv.c
diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched-nc/src/mv.c
--- coreutils-8.32/src/mv.c 2020-01-01 15:13:12.000000000 +0100
+++ coreutils-8.32-patched/src/mv.c 2022-02-14 21:10:42.220002638 +0100
@@ -66,6 +66,9 @@
+++ coreutils-8.32-patched-nc/src/mv.c 2022-02-14 21:14:14.175156795 +0100
@@ -66,6 +66,7 @@
{"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'},
{"verbose", no_argument, NULL, 'v'},
+ /* BEGIN progress mod */
+ {"progress-bar", no_argument, NULL, 'g'},
+ /* END progress mod */
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
{NULL, 0, NULL, 0}
@@ -170,8 +173,130 @@
@@ -170,8 +171,130 @@
{
bool copy_into_self;
bool rename_succeeded;
@@ -872,37 +816,30 @@ diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched/src/mv.c
if (ok)
{
char const *dir_to_remove;
@@ -306,6 +431,11 @@
@@ -306,6 +429,7 @@
\n\
-b like --backup but does not accept an argument\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\
+"), stdout);
+/* END progress mod - remove the complete line!*/ fputs (_("\
-i, --interactive prompt before overwrite\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\
@@ -361,7 +491,8 @@
@@ -361,7 +485,7 @@
/* Try to disable the ability to unlink a directory. */
priv_set_remove_linkdir ();
- 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))
!= -1)
{
switch (c)
@@ -407,6 +538,11 @@
@@ -407,6 +531,9 @@
case 'v':
x.verbose = true;
break;
+ /* BEGIN progress mod */
+ case 'g':
+ progress = true;
+ break;
+ /* END progress mod */
case 'S':
make_backups = true;
backup_suffix = optarg;