From owner-svn-src-head@FreeBSD.ORG  Tue Sep 27 17:11:31 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1809106566C;
	Tue, 27 Sep 2011 17:11:31 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A15548FC1B;
	Tue, 27 Sep 2011 17:11:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8RHBVqx032977;
	Tue, 27 Sep 2011 17:11:31 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8RHBVII032975;
	Tue, 27 Sep 2011 17:11:31 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201109271711.p8RHBVII032975@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 27 Sep 2011 17:11:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225805 - head/usr.bin/fetch
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2011 17:11:31 -0000

Author: des
Date: Tue Sep 27 17:11:31 2011
New Revision: 225805
URL: http://svn.freebsd.org/changeset/base/225805

Log:
  Use fseeko() instead of fseek().  The rest of the code is off_t-aware,
  but the use of fseek() means fetch(1) can't correctly resume a transfer
  that was interrupted past the 2 GB mark.
  
  Pointed out by:	ache@
  MFC after:	3 weeks

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

Modified: head/usr.bin/fetch/fetch.c
==============================================================================
--- head/usr.bin/fetch/fetch.c	Tue Sep 27 17:11:09 2011	(r225804)
+++ head/usr.bin/fetch/fetch.c	Tue Sep 27 17:11:31 2011	(r225805)
@@ -561,8 +561,8 @@ fetch(char *URL, const char *path)
 			}
 		}
 		/* seek to where we left off */
-		if (of != NULL && fseek(of, url->offset, SEEK_SET) != 0) {
-			warn("%s: fseek()", path);
+		if (of != NULL && fseeko(of, url->offset, SEEK_SET) != 0) {
+			warn("%s: fseeko()", path);
 			fclose(of);
 			of = NULL;
 			/* picked up again later */