Attachment #94962 for bug #132291

View | Details | Raw Unified | Return to bug 132291
Collapse All | Expand All




  /* If true, display the name of each file removed.  */
  bool verbose;

  /* If true, display a progress bar when the following conditions are
   * met:
     - pbar_delay defines how many seconds to wait before considering to
       display the progress bar
     - pbar_min_est defines how many seconds estimated operation complete
       time should be at least to show the progress bar. */
  bool pbar_show;
  int pbar_delay;
  int pbar_min_est;

  /* If true, treat the failure by the rm function to restore the
     current working directory as a fatal error.  I.e., if this field
     is true and the rm function cannot restore cwd, it must exit with

Lines 81-86 Link Here

(-)coreutils-5.97/src/cp.c.orig (-1 / +21 lines)
81	/* Initial number of entries in the inode hash table. */	81	/* Initial number of entries in the inode hash table. */
82	#define INITIAL_ENTRY_TAB_SIZE 70	82	#define INITIAL_ENTRY_TAB_SIZE 70
83		83
		84	/* Initial settings for progress bar when it's enabled.
		85	PROGRESS_DELAY defines how many seconds to wait before even
		86	considering to display a proggress bar.
		87	PROGRESS_MIN_EST defines how many seconds estimated operation
		88	complete time should be at least to show the progress bar. */
		89	#define PROGRESS_DELAY 5
		90	#define PROGRESS_MIN_EST 5
		91
84	/* The invocation name of this program. */	92	/* The invocation name of this program. */
85	char *program_name;	93	char *program_name;
86		94
Lines 120-125 Link Here
120	{"copy-contents", no_argument, NULL, COPY_CONTENTS_OPTION},	128	{"copy-contents", no_argument, NULL, COPY_CONTENTS_OPTION},
121	{"dereference", no_argument, NULL, 'L'},	129	{"dereference", no_argument, NULL, 'L'},
122	{"force", no_argument, NULL, 'f'},	130	{"force", no_argument, NULL, 'f'},
		131	{"progress", no_argument, NULL, 'g'},
123	{"interactive", no_argument, NULL, 'i'},	132	{"interactive", no_argument, NULL, 'i'},
124	{"link", no_argument, NULL, 'l'},	133	{"link", no_argument, NULL, 'l'},
125	{"no-dereference", no_argument, NULL, 'P'},	134	{"no-dereference", no_argument, NULL, 'P'},
Lines 176-181 Link Here
176	fputs (_("\	185	fputs (_("\
177	-f, --force if an existing destination file cannot be\n\	186	-f, --force if an existing destination file cannot be\n\
178	opened, remove it and try again\n\	187	opened, remove it and try again\n\
		188	-g, --progress show a progress bar if operation is going to\n\
		189	take a long time\n\
179	-i, --interactive prompt before overwrite\n\	190	-i, --interactive prompt before overwrite\n\
180	-H follow command-line symbolic links\n\	191	-H follow command-line symbolic links\n\
181	"), stdout);	192	"), stdout);
Lines 705-710 Link Here
705		716
706	x->update = false;	717	x->update = false;
707	x->verbose = false;	718	x->verbose = false;
		719
		720	x->pbar_show = false;
		721	x->pbar_delay = PROGRESS_DELAY;
		722	x->pbar_min_est = PROGRESS_MIN_EST;
		723
708	x->dest_info = NULL;	724	x->dest_info = NULL;
709	x->src_info = NULL;	725	x->src_info = NULL;
710	}	726	}
Lines 811-817 Link Here
811	we'll actually use backup_suffix_string. */	827	we'll actually use backup_suffix_string. */
812	backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");	828	backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
813		829
814	while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T",	830	while ((c = getopt_long (argc, argv, "abdfgHilLprst:uvxPRS:T",
815	long_opts, NULL))	831	long_opts, NULL))
816	!= -1)	832	!= -1)
817	{	833	{
Lines 871-876 Link Here
871	x.dereference = DEREF_NEVER;	887	x.dereference = DEREF_NEVER;
872	break;	888	break;
873		889
		890	case 'g':
		891	x.pbar_show = true;
		892	break;
		893
874	case NO_PRESERVE_ATTRIBUTES_OPTION:	894	case NO_PRESERVE_ATTRIBUTES_OPTION:
875	decode_preserve_arg (optarg, &x, false);	895	decode_preserve_arg (optarg, &x, false);
876	break;	896	break;

Lines 17-22 Link Here

(-)coreutils-5.97/src/copy.c.orig (+161 lines)
17		17
18	/* Extracted from cp.c and librarified by Jim Meyering. */	18	/* Extracted from cp.c and librarified by Jim Meyering. */
19		19
		20	/* Progress bar support added by Miika Pekkarinen. miipekk@ihme.org */
		21
20	#include <config.h>	22	#include <config.h>
21	#include <stdio.h>	23	#include <stdio.h>
22	#include <assert.h>	24	#include <assert.h>
Lines 29-34 Link Here
29	# include <priv.h>	31	# include <priv.h>
30	#endif	32	#endif
31		33
		34	#ifdef GWINSZ_IN_SYS_IOCTL
		35	# include <sys/ioctl.h>
		36	#endif
		37
32	#include "system.h"	38	#include "system.h"
33	#include "backupfile.h"	39	#include "backupfile.h"
34	#include "copy.h"	40	#include "copy.h"
Lines 50-55 Link Here
50	#include "utimens.h"	56	#include "utimens.h"
51	#include "xreadlink.h"	57	#include "xreadlink.h"
52	#include "yesno.h"	58	#include "yesno.h"
		59	#include "xstrtol.h"
		60	#include "human.h"
		61	#include "quotearg.h"
53		62
54	#ifndef HAVE_FCHMOD	63	#ifndef HAVE_FCHMOD
55	# define HAVE_FCHMOD false	64	# define HAVE_FCHMOD false
Lines 85-90 Link Here
85	/* Initial size of the above hash table. */	94	/* Initial size of the above hash table. */
86	#define DEST_INFO_INITIAL_CAPACITY 61	95	#define DEST_INFO_INITIAL_CAPACITY 61
87		96
		97	#define SAMPLE_MAX 10
		98
88	static bool copy_internal (char const src_name, char const dst_name,	99	static bool copy_internal (char const src_name, char const dst_name,
89	bool new_dst, dev_t device,	100	bool new_dst, dev_t device,
90	struct dir_list *ancestors,	101	struct dir_list *ancestors,
Lines 191-196 Link Here
191	return ok;	202	return ok;
192	}	203	}
193		204
		205	/* Shorten a string '/long path/long file' to 'long fi...'
		206	Also adds padding bytes to end of the string if necessary */
		207	char shorten_name(const char str, size_t max_width)
		208	{
		209	char *shortname;
		210	const char *filename;
		211	size_t len;
		212
		213	filename = base_name (str);
		214	len = strlen(filename);
		215	shortname = (char *) xmalloc (max_width + 1);
		216	strncpy (shortname, filename, max_width);
		217	shortname[max_width] = '\0';
		218	if (len > max_width)
		219	{
		220	memset(shortname + max_width - 3, '.', 3);
		221	}
		222	else
		223	{
		224	memset(shortname + len, ' ', max_width - len);
		225	}
		226
		227	return shortname;
		228	}
		229
194	/* Copy a regular file from SRC_NAME to DST_NAME.	230	/* Copy a regular file from SRC_NAME to DST_NAME.
195	If the source file contains holes, copies holes and blocks of zeros	231	If the source file contains holes, copies holes and blocks of zeros
196	in the source file as holes in the destination file.	232	in the source file as holes in the destination file.
Lines 222-227 Link Here
222	off_t n_read_total = 0;	258	off_t n_read_total = 0;
223	bool last_write_made_hole = false;	259	bool last_write_made_hole = false;
224	bool make_holes = false;	260	bool make_holes = false;
		261	time_t t_start;
		262	time_t t_last;
		263	time_t t_now;
		264	off_t last_bytes = 0;
		265	int progress_bar_printed = 0;
		266	char *shortname = NULL;
		267	off_t sample_window[SAMPLE_MAX];
		268	off_t sample_sum = 0;
		269	int sample_count = 0;
		270	long int line_length = 0;
		271	#ifdef TIOCGWINSZ
		272	struct winsize ws;
		273	#endif
225		274
226	source_desc = open (src_name, O_RDONLY \| O_BINARY);	275	source_desc = open (src_name, O_RDONLY \| O_BINARY);
227	if (source_desc < 0)	276	if (source_desc < 0)
Lines 326-331 Link Here
326	buf = alloca (buf_size + sizeof (int) + buf_alignment - 1);	375	buf = alloca (buf_size + sizeof (int) + buf_alignment - 1);
327	buf = ptr_align (buf, buf_alignment);	376	buf = ptr_align (buf, buf_alignment);
328		377
		378	time (&t_start);
		379	t_last = t_start;
		380
329	for (;;)	381	for (;;)
330	{	382	{
331	ssize_t n_read = read (source_desc, buf, buf_size);	383	ssize_t n_read = read (source_desc, buf, buf_size);
Lines 390-395 Link Here
390	}	442	}
391	last_write_made_hole = false;	443	last_write_made_hole = false;
392	}	444	}
		445
		446	time (&t_now);
		447
		448	/* Progress bar stuff */
		449	if (! x->pbar_show \|\| t_now - t_start < x->pbar_delay)
		450	{
		451	continue;
		452	}
		453
		454	if (! progress_bar_printed)
		455	{
		456	/* Column width check code copied from ls.c */
		457	char const *p = getenv ("COLUMNS");
		458	if (p && *p)
		459	{
		460	long int tmp_long;
		461	if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK
		462	&& 0 < tmp_long && tmp_long <= INT_MAX)
		463	{
		464	line_length = tmp_long;
		465	}
		466	else
		467	{
		468	error (0, 0,
		469	_("ignoring invalid width in environment \
		470	variable COLUMNS: %s"),
		471	quotearg (p));
		472	}
		473	}
		474
		475	#ifdef TIOCGWINSZ
		476	if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col != 0)
		477	{
		478	line_length = ws.ws_col;
		479	}
		480	#endif
		481	if (line_length < 50)
		482	{
		483	continue;
		484	}
		485
		486	/* Take a short filename for progress bar */
		487	shortname = shorten_name(src_name, line_length - 48);
		488	progress_bar_printed = 1;
		489	}
		490
		491	if (t_now == t_last)
		492	{
		493	continue;
		494	}
		495
		496	if (sample_count == SAMPLE_MAX)
		497	{
		498	int i;
		499
		500	sample_sum -= sample_window[0];
		501	for (i = 0; i < SAMPLE_MAX - 1; i++)
		502	{
		503	sample_window[i] = sample_window[i + 1];
		504	}
		505	}
		506	else
		507	{
		508	sample_count++;
509	}
510
511	{
512	char str_size[LONGEST_HUMAN_READABLE + 1];
513	char str_speed[LONGEST_HUMAN_READABLE + 1];
514	char etabuf[64];
515	time_t t_temp;
516
517	sample_window[sample_count - 1] = (n_read_total - last_bytes) /
518	(t_now - t_last);
519	sample_sum += sample_window[sample_count - 1];
520
521	/* Calculate the remaining time */
522	t_temp = (src_open_sb.st_size - n_read_total) / (sample_sum / sample_count);
523
524	/* Don't print the progress bar if the estimated remaining
525	time is low. */
526	if (progress_bar_printed == 1 && t_temp < x->pbar_min_est)
527	{
528	continue;
529	}
530	progress_bar_printed = 2;
531
532	strftime(etabuf, sizeof etabuf, "%H:%M.%S",
533	gmtime(&t_temp));
534	printf (_("%s \| %3lu%% \| %9s \| %9s/s \| ETA %s\r"), shortname,
535	(unsigned long)(n_read_total * 100 / src_open_sb.st_size),
536	human_readable(src_open_sb.st_size, str_size, human_autoscale\|human_base_1024\|human_space_before_unit\|human_SI\|human_B, 1, 1),
537	human_readable(sample_sum / sample_count, str_speed, human_autoscale\|human_base_1024\|human_space_before_unit\|human_SI\|human_B, 1, 1),
538	etabuf);
539	fflush (stdout);
540	t_last = t_now;
541	last_bytes = n_read_total;
542	}
543	}
544
545	/* Print a newline if progress bar is enabled and has been shown */
546	if (progress_bar_printed == 2)
547	{
548	printf ("%s \| 100%%\n", shortname);
393	}	549	}
394		550
395	/* If the file ends with a `hole', something needs to be written at	551	/* If the file ends with a `hole', something needs to be written at
Lines 488-493 Link Here
488	return_val = false;	644	return_val = false;
489	}	645	}
490		646
		647	if (shortname != NULL)
		648	{
		649	free (shortname);
		650	}
		651
491	return return_val;	652	return return_val;
492	}	653	}
493		654




  /* If true, display the names of the files before copying them. */
  bool verbose;

  /* If true, display a progress bar when the following conditions are
   * met:
     - pbar_delay defines how many seconds to wait before considering to
       display the progress bar
     - pbar_min_est defines how many seconds estimated operation complete
       time should be at least to show the progress bar. */
  bool pbar_show;
  int pbar_delay;
  int pbar_min_est;

  /* If true, stdin is a tty.  */
  bool stdin_tty;


Lines 45-50 Link Here

(-)coreutils-5.97/src/mv.c.orig (-1 / +23 lines)
45	/* Initial number of entries in the inode hash table. */	45	/* Initial number of entries in the inode hash table. */
46	#define INITIAL_ENTRY_TAB_SIZE 70	46	#define INITIAL_ENTRY_TAB_SIZE 70
47		47
		48	/* Initial settings for progress bar when it's enabled.
		49	PROGRESS_DELAY defines how many seconds to wait before even
		50	considering to display a proggress bar.
		51	PROGRESS_MIN_EST defines how many seconds estimated operation
		52	complete time should be at least to show the progress bar. */
		53	#define PROGRESS_DELAY 5
		54	#define PROGRESS_MIN_EST 5
		55
48	/* For long options that have no equivalent short option, use a	56	/* For long options that have no equivalent short option, use a
49	non-character as a pseudo short option, starting with CHAR_MAX + 1. */	57	non-character as a pseudo short option, starting with CHAR_MAX + 1. */
50	enum	58	enum
Lines 75-80 Link Here
75	{	83	{
76	{"backup", optional_argument, NULL, 'b'},	84	{"backup", optional_argument, NULL, 'b'},
77	{"force", no_argument, NULL, 'f'},	85	{"force", no_argument, NULL, 'f'},
		86	{"progress", no_argument, NULL, 'g'},
78	{"interactive", no_argument, NULL, 'i'},	87	{"interactive", no_argument, NULL, 'i'},
79	{"no-target-directory", no_argument, NULL, 'T'},	88	{"no-target-directory", no_argument, NULL, 'T'},
80	{"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03,	89	{"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03,
Lines 104-109 Link Here
104		113
105	x->verbose = false;	114	x->verbose = false;
106		115
		116	x->pbar_show = false;
		117	x->pbar_delay = PROGRESS_DELAY;
		118	x->pbar_min_est = PROGRESS_MIN_EST;
		119
107	/* Since this program may well have to process additional command	120	/* Since this program may well have to process additional command
108	line arguments after any call to `rm', that function must preserve	121	line arguments after any call to `rm', that function must preserve
109	the initial working directory, in case one of those is a	122	the initial working directory, in case one of those is a
Lines 145-150 Link Here
145	x->verbose = false;	158	x->verbose = false;
146	x->dest_info = NULL;	159	x->dest_info = NULL;
147	x->src_info = NULL;	160	x->src_info = NULL;
		161
		162	x->pbar_show = false;
		163	x->pbar_delay = PROGRESS_DELAY;
		164	x->pbar_min_est = PROGRESS_MIN_EST;
148	}	165	}
149		166
150	/* FILE is the last operand of this command. Return true if FILE is a	167	/* FILE is the last operand of this command. Return true if FILE is a
Lines 312-317 Link Here
312	--backup[=CONTROL] make a backup of each existing destination file\n\	329	--backup[=CONTROL] make a backup of each existing destination file\n\
313	-b like --backup but does not accept an argument\n\	330	-b like --backup but does not accept an argument\n\
314	-f, --force do not prompt before overwriting\n\	331	-f, --force do not prompt before overwriting\n\
		332	-g, --progress show a progress bar if operation is going to\n\
		333	take a long time\n\
315	-i, --interactive prompt before overwrite\n\	334	-i, --interactive prompt before overwrite\n\
316	"), stdout);	335	"), stdout);
317	fputs (_("\	336	fputs (_("\
Lines 375-381 Link Here
375	we'll actually use backup_suffix_string. */	394	we'll actually use backup_suffix_string. */
376	backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");	395	backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
377		396
378	while ((c = getopt_long (argc, argv, "bfit:uvS:T", long_options, NULL))	397	while ((c = getopt_long (argc, argv, "bfgit:uvS:T", long_options, NULL))
379	!= -1)	398	!= -1)
380	{	399	{
381	switch (c)	400	switch (c)
Lines 388-393 Link Here
388	case 'f':	407	case 'f':
389	x.interactive = I_ALWAYS_YES;	408	x.interactive = I_ALWAYS_YES;
390	break;	409	break;
		410	case 'g':
		411	x.pbar_show = true;
		412	break;
391	case 'i':	413	case 'i':
392	x.interactive = I_ASK_USER;	414	x.interactive = I_ASK_USER;
393	break;	415	break;

Return to bug 132291

Lines 48-53 Link Here

(-)coreutils-5.97/src/remove.h.orig (+10 lines)
48	/* If true, display the name of each file removed. */	48	/* If true, display the name of each file removed. */
49	bool verbose;	49	bool verbose;
50		50
		51	/* If true, display a progress bar when the following conditions are
		52	* met:
		53	- pbar_delay defines how many seconds to wait before considering to
		54	display the progress bar
		55	- pbar_min_est defines how many seconds estimated operation complete
		56	time should be at least to show the progress bar. */
		57	bool pbar_show;
		58	int pbar_delay;
		59	int pbar_min_est;
		60
51	/* If true, treat the failure by the rm function to restore the	61	/* If true, treat the failure by the rm function to restore the
52	current working directory as a fatal error. I.e., if this field	62	current working directory as a fatal error. I.e., if this field
53	is true and the rm function cannot restore cwd, it must exit with	63	is true and the rm function cannot restore cwd, it must exit with

Lines 175-180 Link Here

(-)coreutils-5.97/src/copy.h.orig (+10 lines)
175	/* If true, display the names of the files before copying them. */	175	/* If true, display the names of the files before copying them. */
176	bool verbose;	176	bool verbose;
177		177
		178	/* If true, display a progress bar when the following conditions are
		179	* met:
		180	- pbar_delay defines how many seconds to wait before considering to
		181	display the progress bar
		182	- pbar_min_est defines how many seconds estimated operation complete
		183	time should be at least to show the progress bar. */
		184	bool pbar_show;
		185	int pbar_delay;
		186	int pbar_min_est;
		187
178	/* If true, stdin is a tty. */	188	/* If true, stdin is a tty. */
179	bool stdin_tty;	189	bool stdin_tty;
180		190