http: use off_t to store partial file size
When we try to resume transfer of a partially-downloaded object or pack, we fopen() the existing file for append, then use ftell() to get the current position. We use a "long", which can hold only 2GB on a 32-bit system, even though packfiles may be larger than that. Let's switch to using off_t, which should hold any file size our system is capable of storing. We need to use ftello() to get the off_t. This is in POSIX and hopefully available everywhere; if not, we should be able to wrap it by falling back to ftell(), which would presumably return "-1" on such a large file (and we would simply skip resuming in that case). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Nov 2, 2015 at 17:10 UTC
f8117f550b900b0bc93364ecadbed237b0ffe25e
1 file changed
+4
-4
http.c
+4
-4
@@ -1205,7 +1205,7 @@ static int http_request(const char *url,
1205
curl_easy_setopt(slot->curl, CURLOPT_FILE, result);
1206
1207
if (target == HTTP_REQUEST_FILE) {
1208
- long posn = ftell(result);
1208
+ off_t posn = ftello(result);
1209
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION,
1210
fwrite);
1211
if (posn > 0)
@@ -1581,7 +1581,7 @@ int finish_http_pack_request(struct http_pack_request *preq)
1581
struct http_pack_request *new_http_pack_request(
1582
struct packed_git *target, const char *base_url)
1583
{
1584
- long prev_posn = 0;
1584
+ off_t prev_posn = 0;
1585
struct strbuf buf = STRBUF_INIT;
1586
struct http_pack_request *preq;
1587
@@ -1613,7 +1613,7 @@ struct http_pack_request *new_http_pack_request(
1613
* If there is data present from a previous transfer attempt,
1614
* resume where it left off
1615
*/
1616
- prev_posn = ftell(preq->packfile);
1616
+ prev_posn = ftello(preq->packfile);
1617
if (prev_posn>0) {
1618
if (http_is_verbose)
1619
fprintf(stderr,
@@ -1668,7 +1668,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
1668
int prevlocal;
1669
char prev_buf[PREV_BUF_SIZE];
1670
ssize_t prev_read = 0;
1671
- long prev_posn = 0;
1671
+ off_t prev_posn = 0;
1672
struct http_object_request *freq;
1673
1674
freq = xcalloc(1, sizeof(*freq));