GNU Coreutils 8.13

processed: 24 directories, 1584 files, 18953496 bytes written, 75 seconds
current: 1485 bytes of `testdir/READ ME!.txt'

patch -p1 <cp_progress__coreutils-8.13.patch

diff -Naur a/lib/full-write.c b/lib/full-write.c
--- a/lib/full-write.c	2011-04-24 21:21:45.000000000 +0400
+++ b/lib/full-write.c	2011-09-17 23:28:54.000000000 +0400
@@ -48,6 +48,8 @@
 # define ZERO_BYTE_TRANSFER_ERRNO ENOSPC
 #endif
 
+size_t full_bytes_counter;
+
 /* Write(read) COUNT bytes at BUF to(from) descriptor FD, retrying if
    interrupted or if a partial write(read) occurs.  Return the number
    of bytes transferred.
@@ -73,6 +75,7 @@
       total += n_rw;
       ptr += n_rw;
       count -= n_rw;
+      full_bytes_counter += n_rw;
     }
 
   return total;
diff -Naur a/lib/full-write.h b/lib/full-write.h
--- a/lib/full-write.h	2011-04-24 21:21:45.000000000 +0400
+++ b/lib/full-write.h	2011-09-17 23:28:54.000000000 +0400
@@ -22,6 +22,7 @@
 extern "C" {
 #endif
 
+extern size_t full_bytes_counter;
 
 /* Write COUNT bytes at BUF to descriptor FD, retrying if interrupted
    or if partial writes occur.  Return the number of bytes successfully
diff -Naur a/src/copy.c b/src/copy.c
--- a/src/copy.c	2011-07-28 14:38:27.000000000 +0400
+++ b/src/copy.c	2011-09-18 09:09:26.000000000 +0400
@@ -119,6 +119,69 @@
 static char const *top_level_src_name;
 static char const *top_level_dst_name;
 
+/* Statistics related declarations. */
+#define PROGRESS_CUR	progress.page[progress.current]
+#define PROGRESS_ACT	progress.page[progress.current ^ 1]
+
+static struct
+{
+  struct
+  {
+    char src_name[PATH_MAX+1], dst_name[PATH_MAX+1];
+    size_t size;
+  } page[2];
+  int current;
+  unsigned dirs, files;
+  unsigned long long total_size;
+} progress = {0};
+
+void
+progress_sig (int sig)
+{
+    fprintf (stderr,
+             "processed: %u directories, %u files, %llu bytes written. "
+             "copying: %s to %s. %ld out of %ld bytes copied.\n",
+             progress.dirs, progress.files, progress.total_size,
+             quote(PROGRESS_ACT.src_name), quote(PROGRESS_ACT.dst_name),
+             full_bytes_counter, PROGRESS_ACT.size);
+}
+
+void
+progress_init ()
+{
+  memset (&progress, 0, sizeof (progress));
+  full_bytes_counter = 0;
+}
+
+void
+progress_next (const char* src_name, const char* dst_name)
+{
+  PROGRESS_CUR.size = -1;
+
+  strncpy (PROGRESS_CUR.src_name, src_name, PATH_MAX);
+  strncpy (PROGRESS_CUR.dst_name, dst_name, PATH_MAX);
+
+  progress.current ^= 1;
+
+  ++progress.files;
+  progress.total_size += full_bytes_counter;
+
+  full_bytes_counter = 0;
+}
+
+void
+progress_set_size (size_t size)
+{
+  PROGRESS_ACT.size = size;
+  full_bytes_counter = 0;
+}
+
+void
+progress_advance_dir ()
+{
+  ++progress.dirs;
+}
+
 /* Set the timestamp of symlink, FILE, to TIMESPEC.
    If this system lacks support for that, simply return 0.  */
 static inline int
@@ -590,6 +653,8 @@
   struct cp_options non_command_line_options = *x;
   bool ok = true;
 
+  progress_advance_dir ();
+
   name_space = savedir (src_name_in);
   if (name_space == NULL)
     {
@@ -991,6 +1056,8 @@
     {
       typedef uintptr_t word;
 
+      progress_set_size (src_open_sb.st_size);
+
       /* Choose a suitable buffer size; it may be adjusted later.  */
       size_t buf_alignment = lcm (getpagesize (), sizeof (word));
       size_t buf_alignment_slop = sizeof (word) + buf_alignment - 1;
@@ -1565,6 +1632,8 @@
   bool dest_is_symlink = false;
   bool have_dst_lstat = false;
 
+  progress_next (src_name, dst_name);
+
   if (x->move_mode && rename_succeeded)
     *rename_succeeded = false;
 
diff -Naur a/src/copy.h b/src/copy.h
--- a/src/copy.h	2011-07-28 14:38:27.000000000 +0400
+++ b/src/copy.h	2011-09-17 23:28:54.000000000 +0400
@@ -285,4 +285,7 @@
 bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
 mode_t cached_umask (void);
 
+void progress_sig (int);
+void progress_init ();
+
 #endif
diff -Naur a/src/cp.c b/src/cp.c
--- a/src/cp.c	2011-07-28 14:38:27.000000000 +0400
+++ b/src/cp.c	2011-09-18 01:49:35.000000000 +0400
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <getopt.h>
 #include <selinux/selinux.h>
+#include <signal.h>
 
 #include "system.h"
 #include "argmatch.h"
@@ -918,6 +919,8 @@
   char *target_directory = NULL;
   bool no_target_directory = false;
 
+  sigignore (SIGUSR1);
+
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
@@ -1166,6 +1169,9 @@
 
   hash_init ();
 
+  progress_init ();
+  sigset (SIGUSR1, progress_sig);
+
   ok = do_copy (argc - optind, argv + optind,
                 target_directory, no_target_directory, &x);