Skip to content

Commit f8117f5

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 835c4d3 commit f8117f5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

http.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ static int http_request(const char *url,
12051205
curl_easy_setopt(slot->curl, CURLOPT_FILE, result);
12061206

12071207
if (target == HTTP_REQUEST_FILE) {
1208-
long posn = ftell(result);
1208+
off_t posn = ftello(result);
12091209
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION,
12101210
fwrite);
12111211
if (posn > 0)
@@ -1581,7 +1581,7 @@ int finish_http_pack_request(struct http_pack_request *preq)
15811581
struct http_pack_request *new_http_pack_request(
15821582
struct packed_git *target, const char *base_url)
15831583
{
1584-
long prev_posn = 0;
1584+
off_t prev_posn = 0;
15851585
struct strbuf buf = STRBUF_INIT;
15861586
struct http_pack_request *preq;
15871587

@@ -1613,7 +1613,7 @@ struct http_pack_request *new_http_pack_request(
16131613
* If there is data present from a previous transfer attempt,
16141614
* resume where it left off
16151615
*/
1616-
prev_posn = ftell(preq->packfile);
1616+
prev_posn = ftello(preq->packfile);
16171617
if (prev_posn>0) {
16181618
if (http_is_verbose)
16191619
fprintf(stderr,
@@ -1668,7 +1668,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
16681668
int prevlocal;
16691669
char prev_buf[PREV_BUF_SIZE];
16701670
ssize_t prev_read = 0;
1671-
long prev_posn = 0;
1671+
off_t prev_posn = 0;
16721672
struct http_object_request *freq;
16731673

16741674
freq = xcalloc(1, sizeof(*freq));

0 commit comments

Comments
 (0)