Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's try using egrep instead of grep since grep on Solaris
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
bd45ef1
..
73ad838
100644
(file)
--- a/
progress.c
+++ b/
progress.c
@@
-4,11
+4,11
@@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003
, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2003
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
2
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-17,8
+17,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-104,8
+103,8
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
stats.num_files - stats.current_file_index - 1,
stats.num_files);
} else
stats.num_files - stats.current_file_index - 1,
stats.num_files);
} else
- str
cpy(eol, "\r"
);
- rprintf(F
INFO
, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
+ str
lcpy(eol, "\r", sizeof eol
);
+ rprintf(F
CLIENT
, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
human_num(ofs), pct, rate, units,
remain_h, remain_m, remain_s, eol);
}
human_num(ofs), pct, rate, units,
remain_h, remain_m, remain_s, eol);
}