-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 @@
+diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
+--- coreutils-9.0/src/copy.c 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/copy.c 2022-03-27 05:54:15.840209369 +0530
+@@ -129,6 +129,133 @@
dev_t dev;
};
++/* BEGIN progress mod */
+struct progress_status {
+ int iCountDown;
+ char ** cProgressField;
+ struct stat src_open_sb;
+};
+
-+/* Begin progress Mod*/
++FILE * spawn( const char *cmd, char *const argv[] )
++{
++ FILE *ret = NULL;
++ int pfd_read[2];
++ pid_t pid;
++
++ if (cmd == NULL || argv == NULL)
++ return ret;
++
++ if (pipe(pfd_read) < 0) {
++ error(0, errno, "pipe: %s", cmd);
++ return ret;
++ }
++
++ if ((pid = fork()) == 0) {
++ int err = dup2(pfd_read[1], 1) < 0;
++ close(pfd_read[0]);
++ close(pfd_read[1]);
++
++ if (err)
++ error(EXIT_FAILURE, errno, "dup2: %s", cmd);
++ execvp(cmd, argv);
++ error(EXIT_FAILURE, errno, "exec: %s", cmd);
++ }
++
++ close(pfd_read[1]);
++
++ if (pid < 0) {
++ close(pfd_read[0]);
++ error(0, errno, "fork: %s", cmd);
++ return ret;
++ }
++
++ ret = fdopen(pfd_read[0], "r");
++ return ret;
++}
++
++void format_time ( char * _cDest, double seconds, bool showall )
++{
++ // hours
++ int hr = ( (int) seconds / (60 * 60)) % 24;
++ // minutes
++ int min = ( (int) seconds / 60) % 60;
++ // seconds
++ double sec = seconds - (hr * (60 * 60)) - (min * 60);
++ if ( showall )
++ {
++ if ( seconds < 0 )
++ sprintf(_cDest, "%2ch %2cm %2cs", '0', '0', '?');
++ else
++ sprintf(_cDest, "%2dh %2dm %2ds", hr, min, (int) sec);
++ } else if ( seconds >= 3600 )
++ {
++ sprintf(_cDest, "%2dh %2dm %4.1fs", hr, min, sec);
++ } else if ( seconds >= 60 )
++ {
++ sprintf(_cDest, "%2dm %4.1fs", min, sec);
++ } else
++ {
++ sprintf(_cDest, "%4.1fs", sec);
++ }
++}
++
+static void file_progress_bar ( char * _cDest, int _iBarLength, long _lProgress, long _lTotal )
+{
+ double dPercent = (double) _lProgress / (double) _lTotal * 100.f;
+ 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 @@
+@@ -299,14 +426,23 @@
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,
+- size_t hole_size, bool punch_holes, bool allow_reflink,
++ size_t hole_size, bool punch_holes, bool allow_reflink, 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)
{
*last_write_made_hole = false;
*total_n_read = 0;
-@@ -270,6 +337,85 @@
+
++ /* BEGIN progress mod */
++ gettimeofday ( & g_oFStartTime, NULL );
++ g_iFTotalWritten = 0;
++ struct stat st;
++ stat(src_name, &st);
++ g_iFTotalSize = st.st_size/1024;
++ /* END progress mod */
++
+ /* If not looking for holes, use copy_file_range if functional,
+ but don't use if reflink disallowed as that may be implicit. */
+ if ((! hole_size) && allow_reflink && functional_copy_file_range ())
+@@ -362,6 +498,103 @@
while (max_n_read)
{
+
++ /* BEGIN progress mod */
+ if (progress) {
-+ /* BEGIN progress mod */
+ /* update countdown */
+ s_progress->iCountDown--;
+ char * sProgressBar = s_progress->cProgressField[5];
+ struct timeval cur_time;
+ gettimeofday ( & cur_time, NULL );
+ int cur_size = g_iTotalWritten + *total_n_read / 1024;
++ int cur_fsize = g_iFTotalWritten + *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 );
+
+ /* how many time has passed since the start? */
+ int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
++ int isec_felapsed = cur_time.tv_sec - g_oFStartTime.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;
++ int sec_fremaining = ( int ) ( ( double ) isec_felapsed / cur_fsize
++ * g_iFTotalSize ) - isec_felapsed;
+ /* print out */
++
++ char f_ttime[20];
++ char f_ftime[20];
++ format_time(f_ttime, sec_remaining, true);
++ format_time(f_ftime, sec_fremaining, true);
++
++ sprintf ( s_progress->cProgressField[1],
++ move_mode
++ ? "%d of %d files moved (about %s remaining) "
++ : "%d of %d files copied (about %s remaining) ",
++ g_iFilesCopied, g_iTotalFiles, f_ttime );
++
++ char s_ftime[40] = "";
++
++ if (g_iTotalFiles > 1)
++ sprintf ( s_ftime, "(about %s remaining)", f_ftime );
++ else
++ sprintf ( s_ftime, "(about %s remaining)", f_ttime );
++
+ 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 );
++ ? "moving at %s/s %s"
++ : "copying at %s/s %s", s_copy_speed, s_ftime );
+
+ int fs_len;
+ if ( g_iTotalFiles > 1 )
+ {
+ printf ( "\033[K%s\n", s_progress->cProgressField[it] );
+ if ( strlen ( s_progress->cProgressField[it] ) < s_progress->iBarLength )
-+ printf ( "" );
++ printf ( "%s", "" );
+ }
+ if ( g_iTotalFiles > 1 )
+ printf ( "\r\033[6A" );
+ printf ( "\r\033[3A" );
+ fflush ( stdout );
+ }
-+ /* END progress mod */
+ }
++ /* 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 @@
+@@ -446,6 +679,14 @@
certain files in /proc or /sys with linux kernels. */
}
/* 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 @@
+@@ -516,9 +757,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)
+ 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,
++ enum Sparse_type sparse_mode, bool move_mode,
+ bool allow_reflink,
+- char const *src_name, char const *dst_name)
++ char const *src_name, char const *dst_name,
++ 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;
+ off_t last_ext_len = 0;
+@@ -590,10 +833,16 @@
+ is conservative and may miss some holes. */
+ off_t n_read;
+ bool read_hole;
+
-+ struct progress_status s_progress={iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
++ 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;
+ if ( ! sparse_copy (src_fd, dest_fd, buf, buf_size,
+ sparse_mode == SPARSE_NEVER ? 0 : hole_size,
+- true, allow_reflink, src_name, dst_name,
+- ext_len, &n_read, &read_hole))
++ true, allow_reflink, move_mode, src_name,
++ dst_name, ext_len, &n_read, &read_hole, &s_progress))
+ return false;
- dest_pos = ext_start + n_read;
-@@ -1305,6 +1467,71 @@
+ dest_pos = ext_start + n_read;
+@@ -1374,8 +1623,80 @@
buf_alloc = xmalloc (buf_size + buf_alignment);
buf = ptr_align (buf_alloc, buf_alignment);
+ 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 );
++ int sum_length = 0;
++ sum_length = sprintf ( cProgressField[1],
++ x->move_mode
++ ? "%d of %d files moved so far"
++ : "%d of %d files copied so far", g_iFilesCopied, g_iTotalFiles );
+ cProgressField[1][sum_length] = ' ';
+ }
+
+ 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;
+ bool wrote_hole_at_eof = false;
++
+ 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))
++
+ if (! (
+ #ifdef SEEK_HOLE
+ scantype == LSEEK_SCANTYPE
+@@ -1383,15 +1704,17 @@
+ scan_inference.ext_start, src_open_sb.st_size,
+ make_holes ? x->sparse_mode : SPARSE_NEVER,
+ x->reflink_mode != REFLINK_NEVER,
+- src_name, dst_name)
++ x->move_mode, src_name, dst_name,
++ iCountDown, cProgressField, last_time, last_size,
++ iBarLength, src_open_sb)
+ :
+ #endif
+ sparse_copy (source_desc, dest_desc, buf, buf_size,
+ make_holes ? hole_size : 0,
+ x->sparse_mode == SPARSE_ALWAYS,
+ x->reflink_mode != REFLINK_NEVER,
+- src_name, dst_name, UINTMAX_MAX, &n_read,
+- &wrote_hole_at_eof)))
++ 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 @@
+@@ -1402,6 +1725,14 @@
return_val = false;
goto close_src_and_dst_desc;
}
-+ /* BEGIN progress mod */
++ /* BEGIN progress mod */
+ if (progress) {
+ int i;
+ for ( i = 0; i < 6; i++ )
+ /* 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 @@
+ 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 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/copy.h 2022-03-27 05:54:15.844209471 +0530
+@@ -236,6 +236,9 @@
Create destination directories as usual. */
bool symbolic_link;
/* 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 @@
+@@ -308,4 +311,22 @@
bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
mode_t cached_umask (void);
-+/* BEGIN OF PROGRESS MOD */
++/* BEGIN progress mod */
++FILE * spawn( const char *cmd, char *const argv[] );
++void format_time ( char * _cDst, double seconds, bool showall );
++
+int file_size_format ( char * _cDst, long _lSize, int _iCounter );
+
+__attribute__((__common__)) long g_iTotalSize;
++__attribute__((__common__)) long g_iFTotalSize;
+__attribute__((__common__)) long g_iTotalWritten;
++__attribute__((__common__)) long g_iFTotalWritten;
+__attribute__((__common__)) int g_iFilesCopied;
++__attribute__((__common__)) int g_iDirectoriesCopied;
+__attribute__((__common__)) struct timeval g_oStartTime;
++__attribute__((__common__)) struct timeval g_oFStartTime;
+__attribute__((__common__)) int g_iTotalFiles;
+__attribute__((__common__)) bool progress;
-+/* END OF PROGRESS MOD */
++/* END 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
+diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c
+--- coreutils-9.0/src/cp.c 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/cp.c 2022-03-27 06:28:53.896713403 +0530
@@ -131,6 +131,7 @@
{"symbolic-link", no_argument, NULL, 's'},
{"target-directory", required_argument, NULL, 't'},
{"verbose", no_argument, NULL, 'v'},
{GETOPT_SELINUX_CONTEXT_OPTION_DECL},
{GETOPT_HELP_OPTION_DECL},
-@@ -170,6 +171,7 @@
+@@ -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\
-+ -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\
++ reflink will be automatically disabled\n\
-i, --interactive prompt before overwrite (overrides a previous -n\
\n\
option)\n\
-@@ -635,6 +637,70 @@
+@@ -634,6 +638,82 @@
die (EXIT_FAILURE, 0, _("target %s is not a directory"),
quoteaf (file[n_files - 1]));
}
++ /* BEGIN progress mod */
+ struct timeval start_time;
+ if (progress) {
-+ /* BEGIN progress mod */
-+ g_iTotalSize = 0;
-+ g_iTotalFiles = 0;
-+ g_iFilesCopied = 0;
-+ g_iTotalWritten = 0;
++ if (g_iTotalSize == 0)
++ g_iTotalSize = 0;
++ if (g_iTotalFiles == 0)
++ g_iTotalFiles = n_files;
++ if (g_iFilesCopied == 0)
++ g_iFilesCopied = 0;
++ if (g_iDirectoriesCopied == 0)
++ g_iDirectoriesCopied = 0;
++ if (g_iTotalWritten == 0)
++ g_iTotalWritten = 0;
++
++ if (target_directory_operand (file[0], &sb, &new_dst, forcing))
++ g_iDirectoriesCopied++;
+
+ /* save time */
+ gettimeofday ( & start_time, NULL );
+ g_oStartTime = start_time;
+
-+ printf ( "Calculating total size... \r" );
++ printf ( "calculating total size... \r" );
+ fflush ( stdout );
+ long iTotalSize = 0;
+ int iFiles = n_files;
+ 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");
++ fp = spawn("find", (char *[]){ "find", file[0], "-type", "f", NULL });
++ if ( fp == NULL)
++ printf("failed to run find\r");
+ else
-+ g_iTotalFiles = atoi( output ) ;
++ {
++ char *line_buf = NULL;
++ size_t line_buf_size = 0;
++ int line_count = 0;
++ ssize_t line_size;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ while (line_size > 0)
++ {
++ line_count++;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ }
++ free (line_buf);
++ if ( line_count > n_files )
++ g_iTotalFiles = line_count;
++ }
+
+ 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");
++ fp = spawn("du", (char *[]){ "du", "-s", file[j], NULL });
+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ printf("failed to run du.\n" );
++ printf("failed to run du\r" );
+ }
+ else
+ {
+ strchr ( output, '\t' )[0] = '\0';
+ iTotalSize += atol ( output );
+
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
++ printf ( "calculating total size... %ld\r", iTotalSize );
+ fflush ( stdout );
+ }
+
+ /* close */
+ pclose(fp);
+ }
-+ g_iTotalSize = iTotalSize;
-+ /* END progress mod */
++ g_iTotalSize += iTotalSize;
+ }
++ /* END progress mod */
+
if (target_directory)
{
-@@ -777,6 +843,46 @@
+@@ -781,6 +861,56 @@
ok = copy (source, new_dest, 0, x, &unused, NULL);
}
++ /* BEGIN progress mod */
+ if (progress) {
-+ /* BEGIN progress mod */
+ /* remove everything */
+ int i;
+ if ( g_iTotalFiles > 1 )
+ 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 */
++ char sFType[20];
++ if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied == g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)" );
++ else if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied < g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)/file(s)" );
++ else
++ sprintf ( sFType, "%s", "file(s)" );
++
++ char f_time[20];
++ format_time(f_time, sec_elapsed, false);
++ printf ( "%d %s (%s) copied in %s (%s/s).\n", g_iFilesCopied, sFType,
++ sTotalWritten, f_time, s_copy_speed );
+ }
++ /* END progress mod */
+
return ok;
}
-@@ -812,6 +918,7 @@
+@@ -816,6 +946,9 @@
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 @@
+@@ -954,7 +1087,8 @@
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 +1114,10 @@
+@@ -1011,6 +1145,10 @@
x.unlink_dest_after_failed_open = 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
+@@ -1171,6 +1309,9 @@
+ usage (EXIT_FAILURE);
+ }
+
++ if (progress)
++ x.reflink_mode = REFLINK_NEVER;
++
+ x.backup_type = (make_backups
+ ? xget_version (_("backup type"),
+ 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 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/mv.c 2022-03-27 06:38:49.800838574 +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'},
++ {"progress-bar", 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)
+@@ -170,8 +171,128 @@
{
-+ 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;
++
++ /* BEGIN progress mod */
++ struct timeval start_time;
++
++ if (progress && x->rename_errno != 0) {
++ if (g_iTotalSize == 0)
++ g_iTotalSize = 0;
++ if (g_iTotalFiles == 0)
++ g_iTotalFiles = 0;
++ if (g_iFilesCopied == 0)
++ g_iFilesCopied = 0;
++ if (g_iDirectoriesCopied == 0)
++ g_iDirectoriesCopied = 0;
++ if (g_iTotalWritten == 0)
++ g_iTotalWritten = 0;
++
++ if (target_directory_operand (source))
++ g_iDirectoriesCopied++;
+
+ 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;
++ /* how many files are we copying */
++ FILE *fp ;
+ char output[1024];
++ fp = spawn("find", (char *[]){ "find", (char *)source, "-type", "f", NULL });
++ if ( fp == NULL)
++ printf("failed to run find\r");
++ else
++ {
++ char *line_buf = NULL;
++ size_t line_buf_size = 0;
++ int line_count = 0;
++ ssize_t line_size;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ while (line_size > 0)
++ {
++ line_count++;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ }
++ free (line_buf);
++ g_iTotalFiles = line_count;
++ }
++ /* close */
++ pclose(fp);
+
-+ /* run command */
-+ fp = popen(command, "r");
++ printf ("calculating total size... \r");
++ fflush (stdout);
++ long iTotalSize = 0;
++ /* call du -s for source */
++ fp = spawn("du", (char *[]){ "du", "-s", (unsigned char *)(size_t)source, NULL });
+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ //printf("failed to run du.\n" );
++ printf("failed to run du\r" );
+ }
+ else
+ {
+ /* isolate size */
+ strchr ( output, '\t' )[0] = '\0';
+ iTotalSize += atol ( output );
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
++ printf ( "calculating total size... %ld\r", iTotalSize );
+ fflush ( stdout );
+ }
+
+ /* close */
+ pclose(fp);
-+ g_iTotalSize = iTotalSize;
-+ /* END progress mod */
-+
++ g_iTotalSize += iTotalSize;
+ }
++ /* END progress mod */
+
bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
++ /* BEGIN progress mod */
+ 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" );
++ if (!rename_succeeded)
++ {
++ for ( i = 0; i < limit; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[3A" );
++ }
+
+ /* save time */
+ struct timeval end_time;
+ char s_copy_speed[20];
+ file_size_format ( s_copy_speed, copy_speed, 1 );
+
++ /* increase counter */
++ g_iFilesCopied++;
++
+ /* 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 ( x->last_file )
++ {
++ char sFType[20];
++ if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied == g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)" );
++ else if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied < g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)/file(s)" );
++ else
++ sprintf ( sFType, "%s", "file(s)" );
++
++ char f_time[20];
++ format_time(f_time, sec_elapsed, false);
++ printf ( "%d %s (%s) moved in %s (%s/s).\n", g_iFilesCopied, sFType,
++ sTotalWritten, f_time, s_copy_speed );
++ }
+ }
++ /* END progress mod */
+
if (ok)
{
char const *dir_to_remove;
-@@ -306,6 +383,7 @@
+@@ -306,6 +427,7 @@
\n\
-b like --backup but does not accept an argument\n\
-f, --force do not prompt before overwriting\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 @@
+@@ -361,7 +483,7 @@
/* Try to disable the ability to unlink a directory. */
priv_set_remove_linkdir ();
!= -1)
{
switch (c)
-@@ -407,6 +485,11 @@
+@@ -407,6 +529,9 @@
case 'v':
x.verbose = true;
break;
-+
+ case 'g':
+ progress = true;
+ break;
-+
case 'S':
make_backups = true;
backup_suffix = optarg;
projects / packages / coreutils.git / commitdiff