[packages/coreutils] https://raw.githubusercontent.com/jarun/advcpmv/master/advcpmv-0.8-8.32.patch
arekm
arekm at pld-linux.org
Sun Mar 21 21:08:05 CET 2021
commit e79174a7c949d284722a95fe576bca2bedce6f5b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Mar 21 21:07:56 2021 +0100
https://raw.githubusercontent.com/jarun/advcpmv/master/advcpmv-0.8-8.32.patch
coreutils-advcopy.patch | 1311 ++++++++++++++++++++++++-----------------------
1 file changed, 659 insertions(+), 652 deletions(-)
---
diff --git a/coreutils-advcopy.patch b/coreutils-advcopy.patch
index a05e96a..3b580e7 100644
--- a/coreutils-advcopy.patch
+++ b/coreutils-advcopy.patch
@@ -1,652 +1,659 @@
-diff -crB coreutils-8.21/src/copy.c coreutils-8.21-patch0.5/src/copy.c
-*** coreutils-8.21/src/copy.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/copy.c 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 135,140 ****
---- 135,190 ----
- return err;
- }
-
-+ /* BEGIN progress mod */
-+ static void file_progress_bar ( char * _cDest, int _iBarLength, int _iProgress, int _iTotal )
-+ {
-+ // write number to progress bar
-+ float fPercent = ( float ) _iProgress / ( float ) _iTotal * 100.f;
-+ sprintf ( _cDest + ( _iBarLength - 6 ), "%4.1f", fPercent );
-+ // remove zero
-+ _cDest[_iBarLength - 2] = ' ';
-+
-+ // fill rest with '-'
-+ int i;
-+ for ( i = 1; i <= _iBarLength - 9; i++ )
-+ {
-+ if ( fPercent > ( float ) ( i - 1 ) / ( _iBarLength - 10 ) * 100.f )
-+ _cDest[i] = '|';
-+ else
-+ _cDest[i] = '-';
-+ }
-+ }
-+
-+ int file_size_format ( char * _cDst, int _iSize, int _iCounter )
-+ {
-+ int iCounter = _iCounter;
-+ double dSize = ( double ) _iSize;
-+ while ( dSize >= 1000. )
-+ {
-+ dSize /= 1024.;
-+ iCounter++;
-+ }
-+
-+ /* get unit */
-+ char * sUnit;
-+ if ( iCounter == 0 )
-+ sUnit = "B";
-+ else if ( iCounter == 1 )
-+ sUnit = "KiB";
-+ else if ( iCounter == 2 )
-+ sUnit = "MiB";
-+ else if ( iCounter == 3 )
-+ sUnit = "GiB";
-+ else if ( iCounter == 4 )
-+ sUnit = "TiB";
-+ else
-+ sUnit = "N/A";
-+
-+ /* write number */
-+ return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
-+ }
-+ /* END progress mod */
-+
- /* Copy the regular file open on SRC_FD/SRC_NAME to DST_FD/DST_NAME,
- honoring the MAKE_HOLES setting and using the BUF_SIZE-byte buffer
- BUF for temporary storage. Copy no more than MAX_N_READ bytes.
-***************
-*** 151,163 ****
- bool make_holes,
- char const *src_name, char const *dst_name,
- uintmax_t max_n_read, off_t *total_n_read,
-! bool *last_write_made_hole)
- {
- *last_write_made_hole = false;
- *total_n_read = 0;
-
- while (max_n_read)
- {
- bool make_hole = false;
-
- ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
---- 201,369 ----
- bool make_holes,
- char const *src_name, char const *dst_name,
- uintmax_t max_n_read, off_t *total_n_read,
-! bool *last_write_made_hole
-! )
- {
-+ /* BEGIN progress mod */
-+ /* create a field of 6 lines */
-+ char ** cProgressField = ( char ** ) calloc ( 6, sizeof ( char * ) );
-+ /* get console width */
-+ int iBarLength = 80;
-+ struct winsize win;
-+ if ( ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0 )
-+ iBarLength = win.ws_col;
-+ /* create rows */
-+ int it;
-+ for ( it = 0; it < 6; it++ )
-+ {
-+ cProgressField[it] = ( char * ) malloc ( iBarLength + 1 );
-+ /* init with spaces */
-+ int j;
-+ for ( j = 0; j < iBarLength; j++ )
-+ cProgressField[it][j] = ' ';
-+ cProgressField[it][iBarLength] = '\0';
-+ }
-+
-+ /* global progress bar? */
-+ if ( g_iTotalSize )
-+ {
-+ /* init global progress bar */
-+ cProgressField[2][0] = '[';
-+ cProgressField[2][iBarLength - 8] = ']';
-+ cProgressField[2][iBarLength - 7] = ' ';
-+ cProgressField[2][iBarLength - 1] = '%';
-+
-+ /* total size */
-+ cProgressField[1][iBarLength - 11] = '/';
-+ file_size_format ( cProgressField[1] + iBarLength - 9, g_iTotalSize, 1 );
-+
-+ /* show how many files were written */
-+ int sum_length = sprintf ( cProgressField[1], "%d files copied so far...", g_iFilesCopied );
-+ cProgressField[1][sum_length] = ' ';
-+ }
-+
-+ /* truncate filename? */
-+ int fn_length;
-+ if ( strlen ( src_name ) > iBarLength - 22 )
-+ fn_length =
-+ sprintf ( cProgressField[4], "...%s", src_name + ( strlen ( src_name ) - iBarLength + 25 ) );
-+ else
-+ fn_length = sprintf ( cProgressField[4], "%s", src_name );
-+ cProgressField[4][fn_length] = ' ';
-+
-+ /* filesize */
-+ int file_size = max_n_read;
-+ struct stat file_stat;
-+ if (fstat(src_fd, & file_stat) == 0)
-+ file_size = file_stat.st_size;
-+ cProgressField[4][iBarLength - 11] = '/';
-+ file_size_format ( cProgressField[4] + iBarLength - 9, file_size, 0 );
-+
-+ int iCountDown = 1;
-+ char * sProgressBar = cProgressField[5];
-+ sProgressBar[0] = '[';
-+ sProgressBar[iBarLength - 8] = ']';
-+ sProgressBar[iBarLength - 7] = ' ';
-+ sProgressBar[iBarLength - 1] = '%';
-+
-+ /* this will always save the time in between */
-+ struct timeval last_time;
-+ gettimeofday ( & last_time, NULL );
-+ int last_size = g_iTotalWritten;
-+ /* END progress mod */
-+
- *last_write_made_hole = false;
- *total_n_read = 0;
-
- while (max_n_read)
- {
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* update countdown */
-+ iCountDown--;
-+ if ( iCountDown < 0 )
-+ {
-+ /* average copy speed is assumed to be around 10 MiB/s, just to be safe.
-+ * the status should be updated about 10 times per second, or approximately
-+ * once per 1 MiB transferred. */
-+ iCountDown = 1024 * 1024 / buf_size;
-+ /* must be greater than 0 */
-+ if (iCountDown < 1)
-+ iCountDown = 1;
-+ /* limit */
-+ if (iCountDown > 100)
-+ iCountDown = 100;
-+ }
-+
-+ /* just print one line with the percentage, but not always */
-+ if ( iCountDown == 0 )
-+ {
-+ /* calculate current speed */
-+ struct timeval cur_time;
-+ gettimeofday ( & cur_time, NULL );
-+ int cur_size = g_iTotalWritten + *total_n_read / 1024;
-+ int usec_elapsed = cur_time.tv_usec - last_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( cur_time.tv_sec - last_time.tv_sec );
-+ int copy_speed = ( int ) ( ( double ) ( cur_size - last_size )
-+ / sec_elapsed );
-+ if (copy_speed < 0)
-+ copy_speed = 0;
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+ /* update vars */
-+ last_time = cur_time;
-+ last_size = cur_size;
-+
-+ /* how much time has passed since the start? */
-+ int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
-+ int sec_remaining = ( int ) ( ( double ) isec_elapsed / cur_size
-+ * g_iTotalSize ) - isec_elapsed;
-+ int min_remaining = sec_remaining / 60;
-+ sec_remaining -= min_remaining * 60;
-+ int hours_remaining = min_remaining / 60;
-+ min_remaining -= hours_remaining * 60;
-+ /* print out */
-+ sprintf ( cProgressField[3],
-+ "Copying at %s/s (about %dh %dm %ds remaining)", s_copy_speed,
-+ hours_remaining, min_remaining, sec_remaining );
-+
-+ int fs_len;
-+ if ( g_iTotalSize )
-+ {
-+ /* global progress bar */
-+ file_progress_bar ( cProgressField[2], iBarLength,
-+ g_iTotalWritten + *total_n_read / 1024, g_iTotalSize );
-+
-+ /* print the global status */
-+ fs_len = file_size_format ( cProgressField[1] + iBarLength - 21,
-+ g_iTotalWritten + *total_n_read / 1024, 1 );
-+ cProgressField[1][iBarLength - 21 + fs_len] = ' ';
-+ }
-+
-+ /* current progress bar */
-+ file_progress_bar ( sProgressBar, iBarLength, *total_n_read, file_size );
-+
-+ /* print the status */
-+ fs_len = file_size_format ( cProgressField[4] + iBarLength - 21, *total_n_read, 0 );
-+ cProgressField[4][iBarLength - 21 + fs_len] = ' ';
-+
-+ /* print the field */
-+ for ( it = g_iTotalSize ? 0 : 3; it < 6; it++ )
-+ {
-+ printf ( "\033[K%s\n", cProgressField[it] );
-+ if ( strlen ( cProgressField[it] ) < iBarLength )
-+ printf ( "" );
-+ }
-+ if ( g_iTotalSize )
-+ printf ( "\r\033[6A" );
-+ else
-+ printf ( "\r\033[3A" );
-+ fflush ( stdout );
-+ }
-+ }
-+ /* END progress mod */
-+
- bool make_hole = false;
-
- ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
-***************
-*** 215,220 ****
---- 421,439 ----
-
- *last_write_made_hole = make_hole;
- }
-+
-+ if (progress) {
-+ /* BEGIN progress mod */
-+ /* update total size */
-+ g_iTotalWritten += *total_n_read / 1024;
-+ g_iFilesCopied++;
-+
-+ int i;
-+ for ( i = 0; i < 6; i++ )
-+ free ( cProgressField[i] );
-+ free ( cProgressField );
-+ /* END progress mod */
-+ }
-
- return true;
- }
-diff -crB coreutils-8.21/src/copy.h coreutils-8.21-patch0.5/src/copy.h
-*** coreutils-8.21/src/copy.h 2013-01-31 01:46:24.000000000 +0100
---- coreutils-8.21-patch0.5/src/copy.h 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 227,232 ****
---- 227,235 ----
- /* If true, create symbolic links instead of copying files.
- Create destination directories as usual. */
- bool symbolic_link;
-+
-+ /* If true, draw a nice progress bar on screen */
-+ bool progress_bar;
-
- /* If true, do not copy a nondirectory that has an existing destination
- with the same or newer modification time. */
-***************
-*** 286,289 ****
---- 289,303 ----
- bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
- mode_t cached_umask (void);
-
-+ /* BEGIN progress mod */
-+ int file_size_format ( char * _cDst, int _iSize, int _iCounter );
-+
-+ long g_iTotalSize;
-+ long g_iTotalWritten;
-+ int g_iFilesCopied;
-+ struct timeval g_oStartTime;
-+ int g_iTotalFiles;
-+ bool progress;
-+ /* END progress mod */
-+
- #endif
-diff -crB coreutils-8.21/src/cp.c coreutils-8.21-patch0.5/src/cp.c
-*** coreutils-8.21/src/cp.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/cp.c 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 141,146 ****
---- 141,147 ----
- {"target-directory", required_argument, NULL, 't'},
- {"update", no_argument, NULL, 'u'},
- {"verbose", no_argument, NULL, 'v'},
-+ {"progress-bar", no_argument, NULL, 'g'},
- {GETOPT_HELP_OPTION_DECL},
- {GETOPT_VERSION_OPTION_DECL},
- {NULL, 0, NULL, 0}
-***************
-*** 178,183 ****
---- 179,185 ----
- -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\
-+ -g, --progress-bar add progress-bar\n\
- -i, --interactive prompt before overwrite (overrides a previous -n\
- \n\
- option)\n\
-***************
-*** 617,622 ****
---- 619,675 ----
- error (EXIT_FAILURE, 0, _("target %s is not a directory"),
- quote (file[n_files - 1]));
- }
-+
-+ /* BEGIN progress mod */
-+ struct timeval start_time;
-+ if (progress) {
-+ g_iTotalSize = 0;
-+ g_iFilesCopied = 0;
-+ g_iTotalWritten = 0;
-+
-+ /* save time */
-+ gettimeofday ( & start_time, NULL );
-+ g_oStartTime = start_time;
-+
-+ printf ( "Calculating total size... \r" );
-+ fflush ( stdout );
-+ long iTotalSize = 0;
-+ int iFiles = n_files;
-+ if ( ! target_directory )
-+ iFiles = n_files - 1;
-+ int j;
-+ for (j = 0; j < iFiles; j++)
-+ {
-+ /* call du -s for each file */
-+ /* create command */
-+ char command[1024];
-+ sprintf ( command, "du -s \"%s\"", file[j] );
-+ /* TODO: replace all quote signs in file[i] */
-+
-+ FILE *fp;
-+ char output[1024];
-+
-+ /* run command */
-+ fp = popen(command, "r");
-+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ printf("failed to run du.\n" );
-+ }
-+ else
-+ {
-+ /* isolate size */
-+ strchr ( output, '\t' )[0] = '\0';
-+ iTotalSize += atol ( output );
-+
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
-+ fflush ( stdout );
-+ }
-+
-+ /* close */
-+ pclose(fp);
-+ }
-+ g_iTotalSize = iTotalSize;
-+ }
-+ /* END progress mod */
-
- if (target_directory)
- {
-***************
-*** 759,764 ****
---- 812,857 ----
-
- ok = copy (source, new_dest, 0, x, &unused, NULL);
- }
-+
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* remove everything */
-+ int i;
-+ if ( g_iTotalSize )
-+ {
-+ for ( i = 0; i < 6; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[6A" );
-+ }
-+ else
-+ {
-+ for ( i = 0; i < 3; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[3A" );
-+ }
-+
-+ /* save time */
-+ struct timeval end_time;
-+ gettimeofday ( & end_time, NULL );
-+ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
-+
-+ /* get total size */
-+ char sTotalWritten[20];
-+ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
-+ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
-+
-+ /* calculate speed */
-+ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+
-+ /* good-bye message */
-+ printf ( "%d files (%s) copied in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
-+ sec_elapsed, s_copy_speed );
-+ }
-+ /* END progress mod */
-
- return ok;
- }
-***************
-*** 793,798 ****
---- 886,892 ----
- x->recursive = false;
- x->sparse_mode = SPARSE_AUTO;
- x->symbolic_link = false;
-+ x->progress_bar = false;
- x->set_mode = false;
- x->mode = 0;
-
-***************
-*** 933,939 ****
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
- long_opts, NULL))
- != -1)
- {
---- 1027,1033 ----
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:T",
- long_opts, NULL))
- != -1)
- {
-***************
-*** 990,995 ****
---- 1084,1093 ----
- x.unlink_dest_after_failed_open = true;
- break;
-
-+ case 'g':
-+ progress = true;
-+ break;
-+
- case 'H':
- x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
- break;
-diff -crB coreutils-8.21/src/mv.c coreutils-8.21-patch0.5/src/mv.c
-*** coreutils-8.21/src/mv.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/mv.c 2013-03-12 21:23:58.000000000 +0100
-***************
-*** 64,69 ****
---- 64,70 ----
- {"target-directory", required_argument, NULL, 't'},
- {"update", no_argument, NULL, 'u'},
- {"verbose", no_argument, NULL, 'v'},
-+ {"progress-bar", no_argument, NULL, 'g'},
- {GETOPT_HELP_OPTION_DECL},
- {GETOPT_VERSION_OPTION_DECL},
- {NULL, 0, NULL, 0}
-***************
-*** 165,171 ****
- bool copy_into_self;
- bool rename_succeeded;
- bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
-!
- if (ok)
- {
- char const *dir_to_remove;
---- 166,172 ----
- bool copy_into_self;
- bool rename_succeeded;
- bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
-!
- if (ok)
- {
- char const *dir_to_remove;
-***************
-*** 300,305 ****
---- 301,307 ----
- \n\
- -b like --backup but does not accept an argument\n\
- -f, --force do not prompt before overwriting\n\
-+ -g, --progress-bar add progress-bar\n\
- -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\
-***************
-*** 368,374 ****
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "bfint:uvS:T", long_options, NULL))
- != -1)
- {
- switch (c)
---- 370,376 ----
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "bfint:uvgS:T", long_options, NULL))
- != -1)
- {
- switch (c)
-***************
-*** 414,419 ****
---- 416,424 ----
- case 'v':
- x.verbose = true;
- break;
-+ case 'g':
-+ progress = true;
-+ break;
- case 'S':
- make_backups = true;
- backup_suffix_string = optarg;
-***************
-*** 476,481 ****
---- 481,537 ----
- : no_backups);
-
- hash_init ();
-+
-+ /* BEGIN progress mod */
-+ struct timeval start_time;
-+
-+ if(progress) {
-+ g_iTotalSize = 0;
-+ g_iFilesCopied = 0;
-+ g_iTotalWritten = 0;
-+
-+ gettimeofday (& start_time, NULL);
-+ g_oStartTime = start_time;
-+
-+ printf ("Calculating total size... \r");
-+ fflush (stdout);
-+ long iTotalSize = 0;
-+ int iFiles = n_files;
-+ if ( !target_directory )
-+ iFiles = 1;
-+ int j;
-+ for (j = 0; j < iFiles; j++)
-+ {
-+ /* call du -s for each file */
-+ /* create command */
-+ char command[1024];
-+ sprintf ( command, "du -s \"%s\"", file[j] );
-+ /* TODO: replace all quote signs in file[i] */
-+
-+ FILE *fp;
-+ char output[1024];
-+
-+ /* run command */
-+ fp = popen(command, "r");
-+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ printf("failed to run du.\n" );
-+ }
-+ else
-+ {
-+ /* isolate size */
-+ strchr ( output, '\t' )[0] = '\0';
-+ iTotalSize += atol ( output );
-+
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
-+ fflush ( stdout );
-+ }
-+
-+ /* close */
-+ pclose(fp);
-+ }
-+ g_iTotalSize = iTotalSize;
-+ }
-+ /* END progress mod */
-
- if (target_directory)
- {
-***************
-*** 493,498 ****
---- 549,594 ----
- }
- else
- ok = movefile (file[0], file[1], false, &x);
-+
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* remove everything */
-+ int i;
-+ if ( g_iTotalSize )
-+ {
-+ for ( i = 0; i < 6; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[6A" );
-+ }
-+ else
-+ {
-+ for ( i = 0; i < 3; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[3A" );
-+ }
-+
-+ /* save time */
-+ struct timeval end_time;
-+ gettimeofday ( & end_time, NULL );
-+ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
-+
-+ /* get total size */
-+ char sTotalWritten[20];
-+ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
-+ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
-+
-+ /* calculate speed */
-+ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+
-+ /* good-bye message */
-+ printf ( "%d files (%s) moved in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
-+ sec_elapsed, s_copy_speed );
-+ }
-+ /* END progress mod */
-
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
- }
+diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
+--- coreutils-8.32/src/copy.c 2020-01-01 19:43:12.000000000 +0530
++++ coreutils-8.32-patched/src/copy.c 2020-12-06 22:25:53.076852462 +0530
+@@ -129,6 +129,72 @@
+ dev_t dev;
+ };
+
++struct progress_status {
++ int iCountDown;
++ char ** cProgressField;
++ struct timeval last_time;
++ int last_size, iBarLength;
++ struct stat src_open_sb;
++};
++
++/* Begin progress Mod*/
++static void file_progress_bar ( char * _cDest, int _iBarLength, long _lProgress, long _lTotal )
++{
++ double dPercent = (double) _lProgress / (double) _lTotal * 100.f;
++ sprintf( _cDest + ( _iBarLength - 6), "%4.1f", dPercent );
++ _cDest[_iBarLength - 2] = ' ';
++
++ int i;
++ for ( i=1; i<=_iBarLength - 9; i++)
++ {
++ if ( dPercent > (double) (i-1) / (_iBarLength - 10) * 100.f )
++ {
++ _cDest[i] = '=';
++ }
++ else
++ {
++ _cDest[i] = ' ';
++ }
++ }
++ for ( i=1; i<_iBarLength - 9; i++)
++ {
++ if ( ( _cDest[i+1] == ' ' ) && ( _cDest[i] == '=' ) )
++ _cDest[i] = '>' ;
++ }
++}
++
++int file_size_format ( char * _cDst, long _lSize, int _iCounter )
++{
++ int iCounter = _iCounter;
++ double dSize = ( double ) _lSize;
++ while ( dSize >= 1000. )
++ {
++ dSize /= 1024.;
++ iCounter++;
++ }
++
++ /* get unit */
++ char * sUnit;
++ if ( iCounter == 0 )
++ sUnit = "B";
++ else if ( iCounter == 1 )
++ sUnit = "KiB";
++ else if ( iCounter == 2 )
++ sUnit = "MiB";
++ else if ( iCounter == 3 )
++ sUnit = "GiB";
++ else if ( iCounter == 4 )
++ sUnit = "TiB";
++ else
++ sUnit = "N/A";
++
++ /* write number */
++ return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
++}
++/* END progress mod */
++
++
++
+ /* Initial size of the cp.dest_info hash table. */
+ #define DEST_INFO_INITIAL_CAPACITY 61
+
+@@ -258,10 +324,11 @@
+ 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,
++ 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,
++ struct progress_status *s_progress)
+ {
+ *last_write_made_hole = false;
+ *total_n_read = 0;
+@@ -270,6 +337,85 @@
+
+ while (max_n_read)
+ {
++
++ if (progress) {
++ /* BEGIN progress mod */
++ /* update countdown */
++ s_progress->iCountDown--;
++ char * sProgressBar = s_progress->cProgressField[5];
++ if ( s_progress->iCountDown < 0 )
++ s_progress->iCountDown = 100;
++
++ /* just print one line with the percentage, but not always */
++ if ( s_progress->iCountDown == 0 )
++ {
++ /* calculate current speed */
++ struct timeval cur_time;
++ gettimeofday ( & cur_time, NULL );
++ int cur_size = g_iTotalWritten + *total_n_read / 1024;
++ int usec_elapsed = cur_time.tv_usec - s_progress->last_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( cur_time.tv_sec - s_progress->last_time.tv_sec );
++ int copy_speed = ( int ) ( ( double ) ( cur_size - s_progress->last_size )
++ / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed >= 0 ? copy_speed : 0, 1 );
++ /* update vars */
++ s_progress->last_time = cur_time;
++ s_progress->last_size = cur_size;
++
++ /* how many time has passed since the start? */
++ int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
++ int sec_remaining = ( int ) ( ( double ) isec_elapsed / cur_size
++ * g_iTotalSize ) - isec_elapsed;
++ int min_remaining = sec_remaining / 60;
++ sec_remaining -= min_remaining * 60;
++ int hours_remaining = min_remaining / 60;
++ min_remaining -= hours_remaining * 60;
++ /* print out */
++ sprintf ( s_progress->cProgressField[3],
++ move_mode
++ ? "Moving at %s/s (about %uh %um %us remaining)"
++ : "Copying at %s/s (about %uh %um %us remaining)", s_copy_speed,
++ hours_remaining, min_remaining, sec_remaining );
++
++ int fs_len;
++ if ( g_iTotalFiles > 1 )
++ {
++ /* global progress bar */
++ file_progress_bar ( s_progress->cProgressField[2], s_progress->iBarLength,
++ g_iTotalWritten + *total_n_read / 1024, g_iTotalSize );
++
++ /* print the global status */
++ fs_len = file_size_format ( s_progress->cProgressField[1] + s_progress->iBarLength - 21,
++ g_iTotalWritten + *total_n_read / 1024, 1 );
++ s_progress->cProgressField[1][s_progress->iBarLength - 21 + fs_len] = ' ';
++ }
++
++ /* current progress bar */
++ file_progress_bar ( sProgressBar, s_progress->iBarLength, *total_n_read, s_progress->src_open_sb.st_size );
++
++ /* print the status */
++ fs_len = file_size_format ( s_progress->cProgressField[4] + s_progress->iBarLength - 21, *total_n_read, 0 );
++ s_progress->cProgressField[4][s_progress->iBarLength - 21 + fs_len] = ' ';
++
++ /* print the field */
++ int it;
++ for ( it = g_iTotalFiles>1 ? 0 : 3; it < 6; it++ )
++ {
++ printf ( "\033[K%s\n", s_progress->cProgressField[it] );
++ if ( strlen ( s_progress->cProgressField[it] ) < s_progress->iBarLength )
++ printf ( "" );
++ }
++ if ( g_iTotalFiles > 1 )
++ printf ( "\r\033[6A" );
++ else
++ printf ( "\r\033[3A" );
++ fflush ( stdout );
++ }
++ /* END progress mod */
++ }
++
+ ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
+ if (n_read < 0)
+ {
+@@ -354,6 +500,14 @@
+ certain files in /proc or /sys with linux kernels. */
+ }
+
++ /* BEGIN progress mod */
++ if (progress) {
++ /* update total size */
++ g_iTotalWritten += *total_n_read / 1024;
++ g_iFilesCopied++;
++ }
++ /* END progress mod */
++
+ /* 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))
+@@ -420,9 +574,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,
++ enum Sparse_type sparse_mode, bool move_mode,
+ char const *src_name, char const *dst_name,
+- bool *require_normal_copy)
++ 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 +709,16 @@
+ last_ext_len = ext_len;
+ bool read_hole;
+
++ struct timeval a;
++ struct stat b;
++
++ struct progress_status s_progress={iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
++
++
+ 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, move_mode, src_name, dst_name, ext_len,
++ &n_read, &read_hole,&s_progress))
+ goto fail;
+
+ dest_pos = ext_start + n_read;
+@@ -1305,6 +1467,71 @@
+ buf_alloc = xmalloc (buf_size + buf_alignment);
+ buf = ptr_align (buf_alloc, buf_alignment);
+
++ /* BEGIN progress mod */
++ /* create a field of 6 lines */
++ char ** cProgressField = ( char ** ) calloc ( 6, sizeof ( char * ) );
++ /* get console width */
++ int iBarLength = 80;
++ struct winsize win;
++ if ( ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0 )
++ if (win.ws_col > iBarLength) /* String printed may be longer on smaller screens */
++ iBarLength = win.ws_col;
++ /* create rows */
++ int it;
++ for ( it = 0; it < 6; it++ )
++ {
++ cProgressField[it] = ( char * ) malloc ( iBarLength + 1 );
++ /* init with spaces */
++ int j;
++ for ( j = 0; j < iBarLength; j++ )
++ cProgressField[it][j] = ' ';
++ cProgressField[it][iBarLength] = '\0';
++ }
++
++ /* global progress bar? */
++ if ( g_iTotalFiles > 1 )
++ {
++ /* init global progress bar */
++ cProgressField[2][0] = '[';
++ cProgressField[2][iBarLength - 8] = ']';
++ cProgressField[2][iBarLength - 7] = ' ';
++ cProgressField[2][iBarLength - 1] = '%';
++
++ /* total size */
++ cProgressField[1][iBarLength - 11] = '/';
++ file_size_format ( cProgressField[1] + iBarLength - 9, g_iTotalSize, 1 );
++
++ /* show how many files were written */
++ int sum_length = sprintf ( cProgressField[1], "%d files copied so far...", g_iFilesCopied );
++ cProgressField[1][sum_length] = ' ';
++ }
++
++ /* truncate filename? */
++ int fn_length;
++ if ( strlen ( src_name ) > iBarLength - 22 )
++ fn_length =
++ sprintf ( cProgressField[4], "...%s", src_name + ( strlen ( src_name ) - iBarLength + 25 ) );
++ else
++ fn_length = sprintf ( cProgressField[4], "%s", src_name );
++ cProgressField[4][fn_length] = ' ';
++
++ /* filesize */
++ cProgressField[4][iBarLength - 11] = '/';
++ file_size_format ( cProgressField[4] + iBarLength - 9, src_open_sb.st_size, 0 );
++
++ int iCountDown = 1;
++ char * sProgressBar = cProgressField[5];
++ sProgressBar[0] = '[';
++ sProgressBar[iBarLength - 8] = ']';
++ sProgressBar[iBarLength - 7] = ' ';
++ sProgressBar[iBarLength - 1] = '%';
++
++ /* this will always save the time in between */
++ struct timeval last_time;
++ gettimeofday ( & last_time, NULL );
++ int last_size = g_iTotalWritten;
++ /* END progress mod */
++
+ if (sparse_src)
+ {
+ bool normal_copy_required;
+@@ -1316,7 +1543,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))
++ 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 +1557,12 @@
+
+ off_t n_read;
+ bool wrote_hole_at_eof;
++ struct progress_status s_progress = { iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
+ if (! sparse_copy (source_desc, dest_desc, buf, buf_size,
+ make_holes ? hole_size : 0,
+- x->sparse_mode == SPARSE_ALWAYS, src_name, dst_name,
+- UINTMAX_MAX, &n_read,
+- &wrote_hole_at_eof))
++ 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 +1573,14 @@
+ 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:
+diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched/src/copy.h
+--- coreutils-8.32/src/copy.h 2020-01-01 19:43:12.000000000 +0530
++++ coreutils-8.32-patched/src/copy.h 2020-12-06 22:24:03.488405684 +0530
+@@ -234,6 +234,9 @@
+ Create destination directories as usual. */
+ bool symbolic_link;
+
++ /* If true, draw a nice progress bar on screen */
++ bool progress_bar;
++
+ /* If true, do not copy a nondirectory that has an existing destination
+ with the same or newer modification time. */
+ bool update;
+@@ -304,4 +307,15 @@
+ bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
+ mode_t cached_umask (void);
+
++/* BEGIN OF PROGRESS MOD */
++int file_size_format ( char * _cDst, long _lSize, int _iCounter );
++
++__attribute__((__common__)) long g_iTotalSize;
++__attribute__((__common__)) long g_iTotalWritten;
++__attribute__((__common__)) int g_iFilesCopied;
++__attribute__((__common__)) struct timeval g_oStartTime;
++__attribute__((__common__)) int g_iTotalFiles;
++__attribute__((__common__)) bool progress;
++/* END OF PROGRESS MOD */
++
+ #endif
+diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
+--- coreutils-8.32/src/cp.c 2020-01-01 19:43:12.000000000 +0530
++++ coreutils-8.32-patched/src/cp.c 2020-12-06 22:24:03.488405684 +0530
+@@ -131,6 +131,7 @@
+ {"symbolic-link", no_argument, NULL, 's'},
+ {"target-directory", required_argument, NULL, 't'},
+ {"update", no_argument, NULL, 'u'},
++ {"progress-bar", no_argument, NULL, 'g'},
+ {"verbose", no_argument, NULL, 'v'},
+ {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
+ {GETOPT_HELP_OPTION_DECL},
+@@ -170,6 +171,7 @@
+ -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\
++ -g, --progress-bar add a progress bar\n\
+ -i, --interactive prompt before overwrite (overrides a previous -n\
+ \n\
+ option)\n\
+@@ -635,6 +637,70 @@
+ die (EXIT_FAILURE, 0, _("target %s is not a directory"),
+ quoteaf (file[n_files - 1]));
+ }
++ struct timeval start_time;
++ if (progress) {
++ /* BEGIN progress mod */
++ g_iTotalSize = 0;
++ g_iTotalFiles = 0;
++ g_iFilesCopied = 0;
++ g_iTotalWritten = 0;
++
++ /* save time */
++ gettimeofday ( & start_time, NULL );
++ g_oStartTime = start_time;
++
++ printf ( "Calculating total size... \r" );
++ fflush ( stdout );
++ long iTotalSize = 0;
++ int iFiles = n_files;
++ if ( ! target_directory )
++ iFiles = n_files - 1;
++ int j;
++
++ /* how many files are we copying */
++ char command[1024];
++ sprintf( command, "find \"%s\" -type f | wc -l", file[0]);
++ FILE *fp ;
++ char output[1024];
++ fp = popen(command,"r");
++ if ( fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL)
++ printf("failed to run find.\n");
++ else
++ g_iTotalFiles = atoi( output ) ;
++
++ for (j = 0; j < iFiles; j++)
++ {
++ /* call du -s for each file */
++ /* create command */
++ char command[1024];
++ sprintf ( command, "du -s \"%s\"", file[j] );
++ /* TODO: replace all quote signs in file[i] */
++
++ FILE *fp;
++ char output[1024];
++
++ /* run command */
++ fp = popen(command, "r");
++ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++ printf("failed to run du.\n" );
++ }
++ else
++ {
++ /* isolate size */
++ strchr ( output, '\t' )[0] = '\0';
++ iTotalSize += atol ( output );
++
++ printf ( "Calculating total size... %ld\r", iTotalSize );
++ fflush ( stdout );
++ }
++
++ /* close */
++ pclose(fp);
++ }
++ g_iTotalSize = iTotalSize;
++ /* END progress mod */
++ }
++
+
+ if (target_directory)
+ {
+@@ -777,6 +843,46 @@
+ ok = copy (source, new_dest, 0, x, &unused, NULL);
+ }
+
++ if (progress) {
++ /* BEGIN progress mod */
++ /* remove everything */
++ int i;
++ if ( g_iTotalFiles > 1 )
++ {
++ for ( i = 0; i < 6; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[6A" );
++ }
++ else
++ {
++ for ( i = 0; i < 3; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[3A" );
++ }
++
++ /* save time */
++ struct timeval end_time;
++ gettimeofday ( & end_time, NULL );
++ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++ /* get total size */
++ char sTotalWritten[20];
++ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++ /* calculate speed */
++ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed, 1 );
++
++ /* good-bye message */
++ printf ( "%d files (%s) copied in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
++ sec_elapsed, s_copy_speed );
++ /* END progress mod */
++ }
++
+ return ok;
+ }
+
+@@ -812,6 +918,7 @@
+ x->recursive = false;
+ x->sparse_mode = SPARSE_AUTO;
+ x->symbolic_link = false;
++ x->progress_bar = false;
+ x->set_mode = false;
+ x->mode = 0;
+
+@@ -950,7 +1057,7 @@
+ selinux_enabled = (0 < is_selinux_enabled ());
+ cp_option_init (&x);
+
+- while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
++ while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:TZ",
+ long_opts, NULL))
+ != -1)
+ {
+@@ -1007,6 +1114,10 @@
+ x.unlink_dest_after_failed_open = true;
+ break;
+
++ case 'g':
++ progress = true;
++ break;
++
+ case 'H':
+ x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
+ break;
+diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched/src/mv.c
+--- coreutils-8.32/src/mv.c 2020-01-01 19:43:12.000000000 +0530
++++ coreutils-8.32-patched/src/mv.c 2020-12-06 22:24:03.488405684 +0530
+@@ -66,6 +66,7 @@
+ {"target-directory", required_argument, NULL, 't'},
+ {"update", no_argument, NULL, 'u'},
+ {"verbose", no_argument, NULL, 'v'},
++ {"progress-ar", no_argument, NULL, 'g'},
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+ {NULL, 0, NULL, 0}
+@@ -168,10 +169,86 @@
+ static bool
+ do_move (const char *source, const char *dest, const struct cp_options *x)
+ {
++ struct timeval start_time;
++
+ bool copy_into_self;
+ bool rename_succeeded;
++ if(progress && x->rename_errno != 0) {
++ /* BEGIN progress mod */
++ g_iTotalSize = 0;
++ g_iFilesCopied = 0;
++ g_iTotalWritten = 0;
++
++ gettimeofday (& start_time, NULL);
++ g_oStartTime = start_time;
++
++ printf ("Calculating total size... \r");
++ fflush (stdout);
++ long iTotalSize = 0;
++ /* call du -s for each file */
++ /* create command */
++ char command[1024];
++ sprintf ( command, "du -s '%s'", source );
++ /* TODO: replace all quote signs in file[i] */
++
++ FILE *fp;
++ char output[1024];
++
++ /* run command */
++ fp = popen(command, "r");
++ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++ //printf("failed to run du.\n" );
++ }
++ else
++ {
++ /* isolate size */
++ strchr ( output, '\t' )[0] = '\0';
++ iTotalSize += atol ( output );
++ printf ( "Calculating total size... %ld\r", iTotalSize );
++ fflush ( stdout );
++ }
++
++ /* close */
++ pclose(fp);
++ g_iTotalSize = iTotalSize;
++ /* END progress mod */
++
++ }
++
+ bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
+
++ if (progress && (x->rename_errno != 0 && ok)) {
++ /* BEGIN progress mod */
++ /* remove everything */
++ int i;
++ int limit = (g_iTotalFiles > 1 ? 6 : 3);
++ for ( i = 0; i < limit; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[3A" );
++
++ /* save time */
++ struct timeval end_time;
++ gettimeofday ( & end_time, NULL );
++ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++ /* get total size */
++ char sTotalWritten[20];
++ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++ /* calculate speed */
++ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed, 1 );
++
++ /* good-bye message */
++ printf ( "%d files (%s) moved in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
++ sec_elapsed, s_copy_speed );
++ /* END progress mod */
++ }
++
+ if (ok)
+ {
+ char const *dir_to_remove;
+@@ -306,6 +383,7 @@
+ \n\
+ -b like --backup but does not accept an argument\n\
+ -f, --force do not prompt before overwriting\n\
++ -g, --progress-bar add progress-bar\n\
+ -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 +439,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))
++ while ((c = getopt_long (argc, argv, "bfint:uvgS:TZ", long_options, NULL))
+ != -1)
+ {
+ switch (c)
+@@ -407,6 +485,11 @@
+ case 'v':
+ x.verbose = true;
+ break;
++
++ case 'g':
++ progress = true;
++ break;
++
+ case 'S':
+ make_backups = true;
+ backup_suffix = optarg;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/coreutils.git/commitdiff/e79174a7c949d284722a95fe576bca2bedce6f5b
More information about the pld-cvs-commit
mailing list