advcpmv-8.21_0.5.4.patch

Only in coreutils-8.21-patched/src: [
Only in coreutils-8.21-patched/src: base64
Only in coreutils-8.21-patched/src: base64.o
Only in coreutils-8.21-patched/src: basename
Only in coreutils-8.21-patched/src: basename.o
Only in coreutils-8.21-patched/src: cat
Only in coreutils-8.21-patched/src: cat.o
Only in coreutils-8.21-patched/src: chcon
Only in coreutils-8.21-patched/src: chcon.o
Only in coreutils-8.21-patched/src: chgrp
Only in coreutils-8.21-patched/src: chgrp.o
Only in coreutils-8.21-patched/src: chmod
Only in coreutils-8.21-patched/src: chmod.o
Only in coreutils-8.21-patched/src: chown
Only in coreutils-8.21-patched/src: chown-core.o
Only in coreutils-8.21-patched/src: chown.o
Only in coreutils-8.21-patched/src: chroot
Only in coreutils-8.21-patched/src: chroot.o
Only in coreutils-8.21-patched/src: cksum
Only in coreutils-8.21-patched/src: cksum.o
Only in coreutils-8.21-patched/src: comm
Only in coreutils-8.21-patched/src: comm.o
diff -u coreutils-8.21-orig/src/copy.c coreutils-8.21-patched/src/copy.c
--- coreutils-8.21-orig/src/copy.c	2014-01-17 13:32:52.491341505 +0100
+++ coreutils-8.21-patched/src/copy.c	2014-01-20 09:55:29.540558235 +0100
@@ -103,6 +103,71 @@
   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
 
@@ -151,13 +216,92 @@
              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)
+             bool *last_write_made_hole,
+             struct progress_status *s_progress)
 {
   *last_write_made_hole = false;
   *total_n_read = 0;
 
   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, 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],
+              "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 */
+      }
+ 
+
       bool make_hole = false;
 
       ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
@@ -216,6 +360,14 @@
       *last_write_made_hole = make_hole;
     }
 
+    /* BEGIN progress mod */
+    if (progress) {
+          /* update total size */
+          g_iTotalWritten += *total_n_read / 1024;
+          g_iFilesCopied++;
+    }
+    /* END progress mod */
+
   return true;
 }
 
@@ -282,7 +434,9 @@
 extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
              off_t src_total_size, enum Sparse_type sparse_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;
@@ -399,10 +553,14 @@
               empty_extent = false;
               last_ext_len = ext_len;
 
+              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,
                                   src_name, dst_name, ext_len, &n_read,
-                                  &wrote_hole_at_eof))
+                                  &wrote_hole_at_eof, &s_progress))
                 goto fail;
 
               dest_pos = ext_start + n_read;
@@ -765,7 +923,6 @@
           && ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE);
 }
 
-
 /* Copy a regular file from SRC_NAME to DST_NAME.
    If the source file contains holes, copies holes and blocks of zeros
    in the source file as holes in the destination file.
@@ -1050,6 +1207,72 @@
       buf_alloc = xmalloc (buf_size + buf_alignment_slop);
       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 )
+         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;
@@ -1061,7 +1284,9 @@
           if (extent_copy (source_desc, dest_desc, buf, buf_size,
                            src_open_sb.st_size,
                            S_ISREG (sb.st_mode) ? x->sparse_mode : SPARSE_NEVER,
-                           src_name, dst_name, &normal_copy_required))
+                           src_name, dst_name, &normal_copy_required,
+                           iCountDown, cProgressField, last_time, last_size, 
+                           iBarLength, src_open_sb))
             goto preserve_metadata;
 
           if (! normal_copy_required)
@@ -1073,10 +1298,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, src_name, dst_name,
                           UINTMAX_MAX, &n_read,
-                          &wrote_hole_at_eof)
+                          &wrote_hole_at_eof, &s_progress)
            || (wrote_hole_at_eof
                && ftruncate (dest_desc, n_read) < 0))
         {
@@ -1084,6 +1311,15 @@
           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:
@@ -1184,6 +1420,7 @@
 
   free (buf_alloc);
   free (name_alloc);
+
   return return_val;
 }
 
diff -u coreutils-8.21-orig/src/copy.h coreutils-8.21-patched/src/copy.h
--- coreutils-8.21-orig/src/copy.h	2014-01-17 13:32:52.508008062 +0100
+++ coreutils-8.21-patched/src/copy.h	2014-01-17 13:32:59.301296115 +0100
@@ -228,6 +228,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;
@@ -286,4 +289,16 @@
 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 );
+
+long g_iTotalSize; 
+long g_iTotalWritten; 
+int g_iFilesCopied; 
+struct timeval g_oStartTime; 
+int g_iTotalFiles; 
+bool progress; 
+/* END OF PROGRESS MOD */ 
+
 #endif
Only in coreutils-8.21-patched/src: copy.o
Only in coreutils-8.21-patched/src: cp
diff -u coreutils-8.21-orig/src/cp.c coreutils-8.21-patched/src/cp.c
--- coreutils-8.21-orig/src/cp.c	2014-01-17 13:32:52.458008394 +0100
+++ coreutils-8.21-patched/src/cp.c	2014-01-17 13:32:57.721306674 +0100
@@ -140,6 +140,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_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
@@ -178,6 +179,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\
@@ -618,6 +620,72 @@
                quote (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)
     {
       /* cp file1...filen edir
@@ -760,6 +828,47 @@
       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;
 }
 
@@ -793,6 +902,7 @@
   x->recursive = false;
   x->sparse_mode = SPARSE_AUTO;
   x->symbolic_link = false;
+  x->progress_bar = false; 
   x->set_mode = false;
   x->mode = 0;
 
@@ -933,7 +1043,7 @@
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
+  while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:T",
                            long_opts, NULL))
          != -1)
     {
@@ -990,6 +1100,10 @@
           x.unlink_dest_after_failed_open = true;
           break;
 
+        case 'g': 
+          progress = true; 
+          break; 
+
         case 'H':
           x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
           break;
Only in coreutils-8.21-patched/src: cp-hash.o
Only in coreutils-8.21-patched/src: cp.o
Only in coreutils-8.21-patched/src: csplit
Only in coreutils-8.21-patched/src: csplit.o
Only in coreutils-8.21-patched/src: cut
Only in coreutils-8.21-patched/src: cut.o
Only in coreutils-8.21-patched/src: date
Only in coreutils-8.21-patched/src: date.o
Only in coreutils-8.21-patched/src: dd
Only in coreutils-8.21-patched/src: dd.o
Only in coreutils-8.21-patched/src: .deps
Only in coreutils-8.21-patched/src: df
Only in coreutils-8.21-patched/src: df.o
Only in coreutils-8.21-patched/src: dir
Only in coreutils-8.21-patched/src: dircolors
Only in coreutils-8.21-patched/src: dircolors.o
Only in coreutils-8.21-patched/src: dirname
Only in coreutils-8.21-patched/src: dirname.o
Only in coreutils-8.21-patched/src: .dirstamp
Only in coreutils-8.21-patched/src: du
Only in coreutils-8.21-patched/src: du.o
Only in coreutils-8.21-patched/src: echo
Only in coreutils-8.21-patched/src: echo.o
Only in coreutils-8.21-patched/src: env
Only in coreutils-8.21-patched/src: env.o
Only in coreutils-8.21-patched/src: expand
Only in coreutils-8.21-patched/src: expand.o
Only in coreutils-8.21-patched/src: expr
Only in coreutils-8.21-patched/src: expr.o
Only in coreutils-8.21-patched/src: extent-scan.o
Only in coreutils-8.21-patched/src: factor
Only in coreutils-8.21-patched/src: factor.o
Only in coreutils-8.21-patched/src: false
Only in coreutils-8.21-patched/src: false.o
Only in coreutils-8.21-patched/src: find-mount-point.o
Only in coreutils-8.21-patched/src: fmt
Only in coreutils-8.21-patched/src: fmt.o
Only in coreutils-8.21-patched/src: fold
Only in coreutils-8.21-patched/src: fold.o
Only in coreutils-8.21-patched/src: getlimits
Only in coreutils-8.21-patched/src: getlimits.o
Only in coreutils-8.21-patched/src: ginstall
Only in coreutils-8.21-patched/src: group-list.o
Only in coreutils-8.21-patched/src: groups
Only in coreutils-8.21-patched/src: groups.o
Only in coreutils-8.21-patched/src: head
Only in coreutils-8.21-patched/src: head.o
Only in coreutils-8.21-patched/src: hostid
Only in coreutils-8.21-patched/src: hostid.o
Only in coreutils-8.21-patched/src: id
Only in coreutils-8.21-patched/src: id.o
Only in coreutils-8.21-patched/src: join
Only in coreutils-8.21-patched/src: join.o
Only in coreutils-8.21-patched/src: kill
Only in coreutils-8.21-patched/src: kill.o
Only in coreutils-8.21-patched/src: lbracket.o
Only in coreutils-8.21-patched/src: libstdbuf.so
Only in coreutils-8.21-patched/src: libver.a
Only in coreutils-8.21-patched/src: link
Only in coreutils-8.21-patched/src: link.o
Only in coreutils-8.21-patched/src: ln
Only in coreutils-8.21-patched/src: ln.o
Only in coreutils-8.21-patched/src: logname
Only in coreutils-8.21-patched/src: logname.o
Only in coreutils-8.21-patched/src: ls
Only in coreutils-8.21-patched/src: ls-dir.o
Only in coreutils-8.21-patched/src: ls-ls.o
Only in coreutils-8.21-patched/src: ls.o
Only in coreutils-8.21-patched/src: ls-vdir.o
Only in coreutils-8.21-patched/src: make-prime-list
Only in coreutils-8.21-patched/src: make-prime-list.o
Only in coreutils-8.21-patched/src: md5sum
Only in coreutils-8.21-patched/src: mkdir
Only in coreutils-8.21-patched/src: mkdir.o
Only in coreutils-8.21-patched/src: mkfifo
Only in coreutils-8.21-patched/src: mkfifo.o
Only in coreutils-8.21-patched/src: mknod
Only in coreutils-8.21-patched/src: mknod.o
Only in coreutils-8.21-patched/src: mktemp
Only in coreutils-8.21-patched/src: mktemp.o
Only in coreutils-8.21-patched/src: mv
diff -u coreutils-8.21-orig/src/mv.c coreutils-8.21-patched/src/mv.c
--- coreutils-8.21-orig/src/mv.c	2014-01-17 13:32:52.508008062 +0100
+++ coreutils-8.21-patched/src/mv.c	2014-01-17 13:32:59.197963472 +0100
@@ -64,6 +64,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}
@@ -162,10 +163,98 @@
 static bool
 do_move (const char *source, const char *dest, const struct cp_options *x)
 {
+
+  struct timeval start_time;
+
+  if(progress) {
+    /* 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 copy_into_self;
   bool rename_succeeded;
   bool ok = copy (source, dest, false, x, &copy_into_self, &rename_succeeded);
 
+  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) 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;
@@ -300,6 +389,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\
@@ -368,7 +458,7 @@
      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))
+  while ((c = getopt_long (argc, argv, "bfint:uvgS:T", long_options, NULL))
          != -1)
     {
       switch (c)
@@ -414,6 +504,11 @@
         case 'v':
           x.verbose = true;
           break;
+
+        case 'g': 
+          progress = true; 
+          break; 
+
         case 'S':
           make_backups = true;
           backup_suffix_string = optarg;
Only in coreutils-8.21-patched/src: mv.o
Only in coreutils-8.21-patched/src: nice
Only in coreutils-8.21-patched/src: nice.o
Only in coreutils-8.21-patched/src: nl
Only in coreutils-8.21-patched/src: nl.o
Only in coreutils-8.21-patched/src: nohup
Only in coreutils-8.21-patched/src: nohup.o
Only in coreutils-8.21-patched/src: nproc
Only in coreutils-8.21-patched/src: nproc.o
Only in coreutils-8.21-patched/src: numfmt
Only in coreutils-8.21-patched/src: numfmt.o
Only in coreutils-8.21-patched/src: od
Only in coreutils-8.21-patched/src: od.o
Only in coreutils-8.21-patched/src: operand2sig.o
Only in coreutils-8.21-patched/src: paste
Only in coreutils-8.21-patched/src: paste.o
Only in coreutils-8.21-patched/src: pathchk
Only in coreutils-8.21-patched/src: pathchk.o
Only in coreutils-8.21-patched/src: pinky
Only in coreutils-8.21-patched/src: pinky.o
Only in coreutils-8.21-patched/src: pr
Only in coreutils-8.21-patched/src: printenv
Only in coreutils-8.21-patched/src: printenv.o
Only in coreutils-8.21-patched/src: printf
Only in coreutils-8.21-patched/src: printf.o
Only in coreutils-8.21-patched/src: pr.o
Only in coreutils-8.21-patched/src: prog-fprintf.o
Only in coreutils-8.21-patched/src: ptx
Only in coreutils-8.21-patched/src: ptx.o
Only in coreutils-8.21-patched/src: pwd
Only in coreutils-8.21-patched/src: pwd.o
Only in coreutils-8.21-patched/src: readlink
Only in coreutils-8.21-patched/src: readlink.o
Only in coreutils-8.21-patched/src: realpath
Only in coreutils-8.21-patched/src: realpath.o
Only in coreutils-8.21-patched/src: relpath.o
Only in coreutils-8.21-patched/src: remove.o
Only in coreutils-8.21-patched/src: rm
Only in coreutils-8.21-patched/src: rmdir
Only in coreutils-8.21-patched/src: rmdir.o
Only in coreutils-8.21-patched/src: rm.o
Only in coreutils-8.21-patched/src: runcon
Only in coreutils-8.21-patched/src: runcon.o
Only in coreutils-8.21-patched/src: seq
Only in coreutils-8.21-patched/src: seq.o
Only in coreutils-8.21-patched/src: setuidgid
Only in coreutils-8.21-patched/src: setuidgid.o
Only in coreutils-8.21-patched/src: sha1sum
Only in coreutils-8.21-patched/src: sha224sum
Only in coreutils-8.21-patched/src: sha256sum
Only in coreutils-8.21-patched/src: sha384sum
Only in coreutils-8.21-patched/src: sha512sum
Only in coreutils-8.21-patched/src: shred
Only in coreutils-8.21-patched/src: shred.o
Only in coreutils-8.21-patched/src: shuf
Only in coreutils-8.21-patched/src: shuf.o
Only in coreutils-8.21-patched/src: sleep
Only in coreutils-8.21-patched/src: sleep.o
Only in coreutils-8.21-patched/src: sort
Only in coreutils-8.21-patched/src: sort.o
Only in coreutils-8.21-patched/src: split
Only in coreutils-8.21-patched/src: split.o
Only in coreutils-8.21-patched/src: src_ginstall-copy.o
Only in coreutils-8.21-patched/src: src_ginstall-cp-hash.o
Only in coreutils-8.21-patched/src: src_ginstall-extent-scan.o
Only in coreutils-8.21-patched/src: src_ginstall-install.o
Only in coreutils-8.21-patched/src: src_ginstall-prog-fprintf.o
Only in coreutils-8.21-patched/src: src_libstdbuf_so-libstdbuf.o
Only in coreutils-8.21-patched/src: src_md5sum-md5sum.o
Only in coreutils-8.21-patched/src: src_sha1sum-md5sum.o
Only in coreutils-8.21-patched/src: src_sha224sum-md5sum.o
Only in coreutils-8.21-patched/src: src_sha256sum-md5sum.o
Only in coreutils-8.21-patched/src: src_sha384sum-md5sum.o
Only in coreutils-8.21-patched/src: src_sha512sum-md5sum.o
Only in coreutils-8.21-patched/src: stat
Only in coreutils-8.21-patched/src: stat.o
Only in coreutils-8.21-patched/src: stdbuf
Only in coreutils-8.21-patched/src: stdbuf.o
Only in coreutils-8.21-patched/src: stty
Only in coreutils-8.21-patched/src: stty.o
Only in coreutils-8.21-patched/src: sum
Only in coreutils-8.21-patched/src: sum.o
Only in coreutils-8.21-patched/src: sync
Only in coreutils-8.21-patched/src: sync.o
Only in coreutils-8.21-patched/src: tac
Only in coreutils-8.21-patched/src: tac.o
Only in coreutils-8.21-patched/src: tail
Only in coreutils-8.21-patched/src: tail.o
Only in coreutils-8.21-patched/src: tee
Only in coreutils-8.21-patched/src: tee.o
Only in coreutils-8.21-patched/src: test
Only in coreutils-8.21-patched/src: test.o
Only in coreutils-8.21-patched/src: timeout
Only in coreutils-8.21-patched/src: timeout.o
Only in coreutils-8.21-patched/src: touch
Only in coreutils-8.21-patched/src: touch.o
Only in coreutils-8.21-patched/src: tr
Only in coreutils-8.21-patched/src: tr.o
Only in coreutils-8.21-patched/src: true
Only in coreutils-8.21-patched/src: true.o
Only in coreutils-8.21-patched/src: truncate
Only in coreutils-8.21-patched/src: truncate.o
Only in coreutils-8.21-patched/src: tsort
Only in coreutils-8.21-patched/src: tsort.o
Only in coreutils-8.21-patched/src: tty
Only in coreutils-8.21-patched/src: tty.o
Only in coreutils-8.21-patched/src: uname
Only in coreutils-8.21-patched/src: uname.o
Only in coreutils-8.21-patched/src: uname-uname.o
Only in coreutils-8.21-patched/src: unexpand
Only in coreutils-8.21-patched/src: unexpand.o
Only in coreutils-8.21-patched/src: uniq
Only in coreutils-8.21-patched/src: uniq.o
Only in coreutils-8.21-patched/src: unlink
Only in coreutils-8.21-patched/src: unlink.o
Only in coreutils-8.21-patched/src: uptime
Only in coreutils-8.21-patched/src: uptime.o
Only in coreutils-8.21-patched/src: users
Only in coreutils-8.21-patched/src: users.o
Only in coreutils-8.21-patched/src: vdir
Only in coreutils-8.21-patched/src: version.c
Only in coreutils-8.21-patched/src: version.h
Only in coreutils-8.21-patched/src: version.o
Only in coreutils-8.21-patched/src: wc
Only in coreutils-8.21-patched/src: wc.o
Only in coreutils-8.21-patched/src: who
Only in coreutils-8.21-patched/src: whoami
Only in coreutils-8.21-patched/src: whoami.o
Only in coreutils-8.21-patched/src: who.o
Only in coreutils-8.21-patched/src: yes
Only in coreutils-8.21-patched/src: yes.o