From owner-svn-src-all@FreeBSD.ORG  Sun Dec  9 22:54:03 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C4C4378E;
 Sun,  9 Dec 2012 22:54:03 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AA1DB8FC13;
 Sun,  9 Dec 2012 22:54:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9Ms3ao052562;
 Sun, 9 Dec 2012 22:54:03 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9Ms3ge052561;
 Sun, 9 Dec 2012 22:54:03 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201212092254.qB9Ms3ge052561@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sun, 9 Dec 2012 22:54:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244058 - head/usr.bin/fetch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 22:54:03 -0000

Author: andre
Date: Sun Dec  9 22:54:03 2012
New Revision: 244058
URL: http://svnweb.freebsd.org/changeset/base/244058

Log:
  Fix bandwidth reporting when doing a restarted download with "-r".
  The offset is already accounted for in xs->lastrcvd and doesn't
  have to be subtracted again.
  
  Reported by:	Florian Smeets <flo@smeets.im>
  Submitted by:	Mateusz Guzik <mjguzik@gmail.com>
  Tested by:	Florian Smeets <flo@smeets.im>
  MFC after:	1 week

Modified:
  head/usr.bin/fetch/fetch.c

Modified: head/usr.bin/fetch/fetch.c
==============================================================================
--- head/usr.bin/fetch/fetch.c	Sun Dec  9 22:53:53 2012	(r244057)
+++ head/usr.bin/fetch/fetch.c	Sun Dec  9 22:54:03 2012	(r244058)
@@ -183,7 +183,7 @@ stat_bps(struct xferstat *xs)
 	if (delta == 0.0) {
 		snprintf(str, sizeof str, "?? Bps");
 	} else {
-		bps = (xs->rcvd - xs->lastrcvd - xs->offset) / delta;
+		bps = (xs->rcvd - xs->lastrcvd) / delta;
 		snprintf(str, sizeof str, "%sps", stat_bytes((off_t)bps));
 	}
 	return (str);