Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
d1d0a705
Commit
d1d0a705
authored
Aug 01, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't output a negative time-remaining value if the file has grown.
parent
444f9f7b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
progress.c
progress.c
+11
-8
No files found.
progress.c
View file @
d1d0a705
...
...
@@ -59,12 +59,11 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
static
void
rprint_progress
(
OFF_T
ofs
,
OFF_T
size
,
struct
timeval
*
now
,
int
is_last
)
{
char
eol
[
256
];
char
rembuf
[
64
],
eol
[
128
];
const
char
*
units
;
int
pct
=
ofs
==
size
?
100
:
(
int
)
(
100
.
0
*
ofs
/
size
);
unsigned
long
diff
;
double
rate
,
remain
;
int
remain_h
,
remain_m
,
remain_s
;
if
(
is_last
)
{
/* Compute stats based on the starting info. */
...
...
@@ -93,9 +92,14 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
units
=
"kB/s"
;
}
remain_s
=
(
int
)
remain
%
60
;
remain_m
=
(
int
)
(
remain
/
60
.
0
)
%
60
;
remain_h
=
(
int
)
(
remain
/
3600
.
0
);
if
(
remain
<
0
)
strlcpy
(
rembuf
,
" ??:??:??"
,
sizeof
rembuf
);
else
{
snprintf
(
rembuf
,
sizeof
rembuf
,
"%4d:%02d:%02d"
,
(
int
)
(
remain
/
3600
.
0
),
(
int
)
(
remain
/
60
.
0
)
%
60
,
(
int
)
remain
%
60
);
}
if
(
is_last
)
{
snprintf
(
eol
,
sizeof
eol
,
" (xfer#%d, to-check=%d/%d)
\n
"
,
...
...
@@ -104,9 +108,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
stats
.
num_files
);
}
else
strlcpy
(
eol
,
"
\r
"
,
sizeof
eol
);
rprintf
(
FCLIENT
,
"%12s %3d%% %7.2f%s %4d:%02d:%02d%s"
,
human_num
(
ofs
),
pct
,
rate
,
units
,
remain_h
,
remain_m
,
remain_s
,
eol
);
rprintf
(
FCLIENT
,
"%12s %3d%% %7.2f%s %s%s"
,
human_num
(
ofs
),
pct
,
rate
,
units
,
rembuf
,
eol
);
}
void
end_progress
(
OFF_T
size
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment