diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-17 18:43:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-17 18:43:36 -0700 |
| commit | 808239a7db1b4c04c5a9edcf9ee33ff33217fad2 (patch) | |
| tree | 1b9cfbe8113e9fedb21a8ae519c1b710d79164ce | |
| parent | 7f0f4fa4374edfe2050b3ab636f43ee80daa63f2 (diff) | |
| parent | 4adffc7b54e8c5d8fc7510007dd9b8235a67430f (diff) | |
| download | git-808239a7db1b4c04c5a9edcf9ee33ff33217fad2.tar.gz git-808239a7db1b4c04c5a9edcf9ee33ff33217fad2.tar.xz | |
Merge branch 'sk/ftp'
* sk/ftp:
Add ftp:// protocol support for git-http-fetch
http-fetch.c: consolidate code to detect missing fetch target
| -rw-r--r-- | http-fetch.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/http-fetch.c b/http-fetch.c index a113bb8c4..bc74f30f7 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -144,6 +144,19 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, return size; } +static int missing__target(int code, int result) +{ + return /* file:// URL -- do we ever use one??? */ + (result == CURLE_FILE_COULDNT_READ_FILE) || + /* http:// and https:// URL */ + (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) || + /* ftp:// URL */ + (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE) + ; +} + +#define missing_target(a) missing__target((a)->http_code, (a)->curl_result) + static void fetch_alternates(const char *base); static void process_object_response(void *callback_data); @@ -323,8 +336,7 @@ static void process_object_response(void *callback_data) obj_req->state = COMPLETE; /* Use alternates if necessary */ - if (obj_req->http_code == 404 || - obj_req->curl_result == CURLE_FILE_COULDNT_READ_FILE) { + if (missing_target(obj_req)) { fetch_alternates(alt->base); if (obj_req->repo->next != NULL) { obj_req->repo = @@ -537,8 +549,7 @@ static void process_alternates_response(void *callback_data) return; } } else if (slot->curl_result != CURLE_OK) { - if (slot->http_code != 404 && - slot->curl_result != CURLE_FILE_COULDNT_READ_FILE) { + if (!missing_target(slot)) { got_alternates = -1; return; } @@ -941,8 +952,7 @@ static int fetch_indices(struct alt_base *repo) if (start_active_slot(slot)) { run_active_slot(slot); if (results.curl_result != CURLE_OK) { - if (results.http_code == 404 || - results.curl_result == CURLE_FILE_COULDNT_READ_FILE) { + if (missing_target(&results)) { repo->got_indices = 1; free(buffer.buffer); return 0; @@ -1123,8 +1133,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1) ret = error("Request for %s aborted", hex); } else if (obj_req->curl_result != CURLE_OK && obj_req->http_code != 416) { - if (obj_req->http_code == 404 || - obj_req->curl_result == CURLE_FILE_COULDNT_READ_FILE) + if (missing_target(obj_req)) ret = -1; /* Be silent, it is probably in a pack. */ else ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)", |