summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-09 16:24:55 -0500
committerDan McGee <dan@archlinux.org>2011-08-09 16:24:55 -0500
commit82d45d66ca36f48dd89867e817d198bd9e055829 (patch)
tree03ec009cf8557ff1f4f8f4805f4ccbff29170859
parent5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b (diff)
parent4885a7fa3a54e9a81831916c7925b2996b695f50 (diff)
downloadpacman-82d45d66ca36f48dd89867e817d198bd9e055829.tar.xz
Merge branch 'maint'
Conflicts: src/pacman/callback.c
-rw-r--r--src/pacman/callback.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index a8163d0a..873e3fc9 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -27,6 +27,7 @@
#include <sys/types.h> /* off_t */
#include <unistd.h>
#include <wchar.h>
+#include <limits.h> /* UINT_MAX */
#include <alpm.h>
@@ -568,10 +569,13 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
diff_sec = current_time.tv_sec - initial_time.tv_sec;
diff_usec = current_time.tv_usec - initial_time.tv_usec;
timediff = diff_sec + (diff_usec / 1000000.0);
- rate = xfered / timediff;
-
- /* round elapsed time to the nearest second */
- eta_s = (int)(timediff + 0.5);
+ if(timediff > 0.0) {
+ rate = xfered / timediff;
+ /* round elapsed time to the nearest second */
+ eta_s = (unsigned int)(timediff + 0.5);
+ } else {
+ eta_s = 0;
+ }
} else {
/* compute current average values */
timediff = get_update_timediff(0);
@@ -583,12 +587,20 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
rate = (xfered - xfered_last) / timediff;
/* average rate to reduce jumpiness */
rate = (rate + 2 * rate_last) / 3;
- eta_s = (total - xfered) / rate;
+ if(rate > 0.0) {
+ eta_s = (total - xfered) / rate;
+ } else {
+ eta_s = UINT_MAX;
+ }
rate_last = rate;
xfered_last = xfered;
}
- file_percent = (file_xfered * 100) / file_total;
+ if(file_total) {
+ file_percent = (file_xfered * 100) / file_total;
+ } else {
+ file_percent = 100;
+ }
if(totaldownload) {
total_percent = ((list_xfered + file_xfered) * 100) /
@@ -648,6 +660,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
xfered_human = humanize_size(xfered, '\0', 0, &xfered_label);
/* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */
+ /* TODO: if eta_h > 99, formatting gets all messed up */
printf(" %ls%-*s %6.1f%s %#6.1f%s/s %02u:%02u:%02u", wcfname,
padwid, "", xfered_human, xfered_label, rate_human, rate_label,
eta_h, eta_m, eta_s);