2005-04-24 03:47:23 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
2005-09-30 09:07:39 +02:00
|
|
|
#include "pack.h"
|
2007-09-11 05:02:45 +02:00
|
|
|
#include "walker.h"
|
2005-11-18 20:02:58 +01:00
|
|
|
#include "http.h"
|
2005-10-15 20:10:46 +02:00
|
|
|
|
2005-09-28 19:14:04 +02:00
|
|
|
#define PREV_BUF_SIZE 4096
|
|
|
|
#define RANGE_HEADER_SIZE 30
|
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
struct alt_base
|
|
|
|
{
|
2007-03-28 11:46:15 +02:00
|
|
|
char *base;
|
2005-09-15 05:26:08 +02:00
|
|
|
int got_indices;
|
|
|
|
struct packed_git *packs;
|
|
|
|
struct alt_base *next;
|
|
|
|
};
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
enum object_request_state {
|
2005-10-11 08:22:01 +02:00
|
|
|
WAITING,
|
|
|
|
ABORTED,
|
|
|
|
ACTIVE,
|
|
|
|
COMPLETE,
|
|
|
|
};
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker *walker;
|
2005-10-11 08:22:01 +02:00
|
|
|
unsigned char sha1[20];
|
|
|
|
struct alt_base *repo;
|
|
|
|
char *url;
|
|
|
|
char filename[PATH_MAX];
|
|
|
|
char tmpfile[PATH_MAX];
|
|
|
|
int local;
|
2005-11-18 20:03:04 +01:00
|
|
|
enum object_request_state state;
|
2005-10-11 08:22:01 +02:00
|
|
|
CURLcode curl_result;
|
|
|
|
char errorstr[CURL_ERROR_SIZE];
|
|
|
|
long http_code;
|
|
|
|
unsigned char real_sha1[20];
|
|
|
|
SHA_CTX c;
|
|
|
|
z_stream stream;
|
|
|
|
int zret;
|
|
|
|
int rename;
|
|
|
|
struct active_request_slot *slot;
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *next;
|
2005-10-11 08:22:01 +02:00
|
|
|
};
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
struct alternates_request {
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker *walker;
|
2006-07-27 23:56:22 +02:00
|
|
|
const char *base;
|
2005-11-12 18:11:32 +01:00
|
|
|
char *url;
|
2007-12-09 20:30:59 +01:00
|
|
|
struct strbuf *buffer;
|
2005-11-12 18:11:32 +01:00
|
|
|
struct active_request_slot *slot;
|
|
|
|
int http_specific;
|
|
|
|
};
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data {
|
|
|
|
const char *url;
|
|
|
|
int got_alternates;
|
|
|
|
struct alt_base *alt;
|
|
|
|
struct curl_slist *no_pragma_header;
|
|
|
|
};
|
|
|
|
|
2006-08-15 19:23:48 +02:00
|
|
|
static struct object_request *object_queue_head;
|
2005-10-13 19:49:53 +02:00
|
|
|
|
2005-08-01 02:54:17 +02:00
|
|
|
static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
|
|
|
|
void *data)
|
|
|
|
{
|
2005-05-18 14:14:09 +02:00
|
|
|
unsigned char expn[4096];
|
2005-04-24 03:47:23 +02:00
|
|
|
size_t size = eltsize * nmemb;
|
|
|
|
int posn = 0;
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *obj_req = (struct object_request *)data;
|
2005-04-24 03:47:23 +02:00
|
|
|
do {
|
2007-01-08 16:58:23 +01:00
|
|
|
ssize_t retval = xwrite(obj_req->local,
|
2006-06-18 17:18:09 +02:00
|
|
|
(char *) ptr + posn, size - posn);
|
2005-04-24 03:47:23 +02:00
|
|
|
if (retval < 0)
|
|
|
|
return posn;
|
|
|
|
posn += retval;
|
|
|
|
} while (posn < size);
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->stream.avail_in = size;
|
|
|
|
obj_req->stream.next_in = ptr;
|
2005-04-24 03:47:23 +02:00
|
|
|
do {
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->stream.next_out = expn;
|
|
|
|
obj_req->stream.avail_out = sizeof(expn);
|
|
|
|
obj_req->zret = inflate(&obj_req->stream, Z_SYNC_FLUSH);
|
|
|
|
SHA1_Update(&obj_req->c, expn,
|
|
|
|
sizeof(expn) - obj_req->stream.avail_out);
|
|
|
|
} while (obj_req->stream.avail_in && obj_req->zret == Z_OK);
|
2005-10-11 08:22:01 +02:00
|
|
|
data_received++;
|
2005-04-24 03:47:23 +02:00
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static void fetch_alternates(struct walker *walker, const char *base);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
static void process_object_response(void *callback_data);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static void start_object_request(struct walker *walker,
|
|
|
|
struct object_request *obj_req)
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2005-11-18 20:03:04 +01:00
|
|
|
char *hex = sha1_to_hex(obj_req->sha1);
|
2005-10-11 08:22:01 +02:00
|
|
|
char prevfile[PATH_MAX];
|
|
|
|
char *url;
|
|
|
|
char *posn;
|
|
|
|
int prevlocal;
|
|
|
|
unsigned char prev_buf[PREV_BUF_SIZE];
|
|
|
|
ssize_t prev_read = 0;
|
|
|
|
long prev_posn = 0;
|
|
|
|
char range[RANGE_HEADER_SIZE];
|
|
|
|
struct curl_slist *range_header = NULL;
|
|
|
|
struct active_request_slot *slot;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename);
|
2005-10-11 08:22:01 +02:00
|
|
|
unlink(prevfile);
|
2005-11-18 20:03:04 +01:00
|
|
|
rename(obj_req->tmpfile, prevfile);
|
|
|
|
unlink(obj_req->tmpfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->local != -1)
|
|
|
|
error("fd leakage in start: %d", obj_req->local);
|
|
|
|
obj_req->local = open(obj_req->tmpfile,
|
2005-10-11 08:22:01 +02:00
|
|
|
O_WRONLY | O_CREAT | O_EXCL, 0666);
|
2005-10-11 08:22:01 +02:00
|
|
|
/* This could have failed due to the "lazy directory creation";
|
|
|
|
* try to mkdir the last path component.
|
|
|
|
*/
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->local < 0 && errno == ENOENT) {
|
|
|
|
char *dir = strrchr(obj_req->tmpfile, '/');
|
2005-10-11 08:22:01 +02:00
|
|
|
if (dir) {
|
|
|
|
*dir = 0;
|
2005-11-18 20:03:04 +01:00
|
|
|
mkdir(obj_req->tmpfile, 0777);
|
2005-10-11 08:22:01 +02:00
|
|
|
*dir = '/';
|
|
|
|
}
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->local = open(obj_req->tmpfile,
|
2005-10-11 08:22:01 +02:00
|
|
|
O_WRONLY | O_CREAT | O_EXCL, 0666);
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->local < 0) {
|
|
|
|
obj_req->state = ABORTED;
|
2006-02-23 02:47:10 +01:00
|
|
|
error("Couldn't create temporary file %s for %s: %s",
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->tmpfile, obj_req->filename, strerror(errno));
|
2005-10-11 08:22:01 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
memset(&obj_req->stream, 0, sizeof(obj_req->stream));
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
inflateInit(&obj_req->stream);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
SHA1_Init(&obj_req->c);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2007-03-28 11:46:15 +02:00
|
|
|
url = xmalloc(strlen(obj_req->repo->base) + 51);
|
|
|
|
obj_req->url = xmalloc(strlen(obj_req->repo->base) + 51);
|
2005-11-18 20:03:04 +01:00
|
|
|
strcpy(url, obj_req->repo->base);
|
|
|
|
posn = url + strlen(obj_req->repo->base);
|
2007-03-28 11:46:15 +02:00
|
|
|
strcpy(posn, "/objects/");
|
|
|
|
posn += 9;
|
2005-10-11 08:22:01 +02:00
|
|
|
memcpy(posn, hex, 2);
|
|
|
|
posn += 2;
|
|
|
|
*(posn++) = '/';
|
|
|
|
strcpy(posn, hex + 2);
|
2005-11-18 20:03:04 +01:00
|
|
|
strcpy(obj_req->url, url);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
|
|
|
/* If a previous temp file is present, process what was already
|
|
|
|
fetched. */
|
|
|
|
prevlocal = open(prevfile, O_RDONLY);
|
|
|
|
if (prevlocal != -1) {
|
|
|
|
do {
|
2007-01-08 16:58:08 +01:00
|
|
|
prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);
|
2005-10-11 08:22:01 +02:00
|
|
|
if (prev_read>0) {
|
|
|
|
if (fwrite_sha1_file(prev_buf,
|
|
|
|
1,
|
|
|
|
prev_read,
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req) == prev_read) {
|
2005-10-11 08:22:01 +02:00
|
|
|
prev_posn += prev_read;
|
|
|
|
} else {
|
|
|
|
prev_read = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while (prev_read > 0);
|
|
|
|
close(prevlocal);
|
|
|
|
}
|
|
|
|
unlink(prevfile);
|
|
|
|
|
|
|
|
/* Reset inflate/SHA1 if there was an error reading the previous temp
|
|
|
|
file; also rewind to the beginning of the local file. */
|
|
|
|
if (prev_read == -1) {
|
2005-11-18 20:03:04 +01:00
|
|
|
memset(&obj_req->stream, 0, sizeof(obj_req->stream));
|
|
|
|
inflateInit(&obj_req->stream);
|
|
|
|
SHA1_Init(&obj_req->c);
|
2005-10-11 08:22:01 +02:00
|
|
|
if (prev_posn>0) {
|
|
|
|
prev_posn = 0;
|
2007-04-05 21:05:57 +02:00
|
|
|
lseek(obj_req->local, 0, SEEK_SET);
|
2005-11-18 20:03:04 +01:00
|
|
|
ftruncate(obj_req->local, 0);
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
slot = get_active_slot();
|
2005-11-18 20:02:58 +01:00
|
|
|
slot->callback_func = process_object_response;
|
2005-11-18 20:03:04 +01:00
|
|
|
slot->callback_data = obj_req;
|
|
|
|
obj_req->slot = slot;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, obj_req);
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
|
2005-11-18 20:03:04 +01:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, obj_req->errorstr);
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
2007-09-11 05:02:45 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
|
|
|
/* If we have successfully processed data from a previous fetch
|
|
|
|
attempt, only fetch the data we don't already have. */
|
|
|
|
if (prev_posn>0) {
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-10-11 08:22:01 +02:00
|
|
|
fprintf(stderr,
|
|
|
|
"Resuming fetch of object %s at byte %ld\n",
|
|
|
|
hex, prev_posn);
|
|
|
|
sprintf(range, "Range: bytes=%ld-", prev_posn);
|
|
|
|
range_header = curl_slist_append(range_header, range);
|
|
|
|
curl_easy_setopt(slot->curl,
|
|
|
|
CURLOPT_HTTPHEADER, range_header);
|
|
|
|
}
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
/* Try to get the request started, abort the request on error */
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->state = ACTIVE;
|
2005-10-11 08:22:01 +02:00
|
|
|
if (!start_active_slot(slot)) {
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->state = ABORTED;
|
|
|
|
obj_req->slot = NULL;
|
|
|
|
close(obj_req->local); obj_req->local = -1;
|
|
|
|
free(obj_req->url);
|
|
|
|
return;
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
static void finish_object_request(struct object_request *obj_req)
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2005-11-04 02:54:52 +01:00
|
|
|
struct stat st;
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
fchmod(obj_req->local, 0444);
|
|
|
|
close(obj_req->local); obj_req->local = -1;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->http_code == 416) {
|
2005-10-11 08:22:01 +02:00
|
|
|
fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n");
|
2005-11-18 20:03:04 +01:00
|
|
|
} else if (obj_req->curl_result != CURLE_OK) {
|
|
|
|
if (stat(obj_req->tmpfile, &st) == 0)
|
2005-11-04 02:54:52 +01:00
|
|
|
if (st.st_size == 0)
|
2005-11-18 20:03:04 +01:00
|
|
|
unlink(obj_req->tmpfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
inflateEnd(&obj_req->stream);
|
|
|
|
SHA1_Final(obj_req->real_sha1, &obj_req->c);
|
|
|
|
if (obj_req->zret != Z_STREAM_END) {
|
|
|
|
unlink(obj_req->tmpfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-08-17 20:54:57 +02:00
|
|
|
if (hashcmp(obj_req->sha1, obj_req->real_sha1)) {
|
2005-11-18 20:03:04 +01:00
|
|
|
unlink(obj_req->tmpfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
return;
|
|
|
|
}
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->rename =
|
|
|
|
move_temp_to_file(obj_req->tmpfile, obj_req->filename);
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->rename == 0)
|
2007-09-11 05:02:45 +02:00
|
|
|
walker_say(obj_req->walker, "got %s\n", sha1_to_hex(obj_req->sha1));
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
static void process_object_response(void *callback_data)
|
|
|
|
{
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *obj_req =
|
|
|
|
(struct object_request *)callback_data;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker *walker = obj_req->walker;
|
|
|
|
struct walker_data *data = walker->data;
|
|
|
|
struct alt_base *alt = data->alt;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->curl_result = obj_req->slot->curl_result;
|
|
|
|
obj_req->http_code = obj_req->slot->http_code;
|
|
|
|
obj_req->slot = NULL;
|
|
|
|
obj_req->state = COMPLETE;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
/* Use alternates if necessary */
|
2006-09-16 19:58:20 +02:00
|
|
|
if (missing_target(obj_req)) {
|
2007-09-11 05:02:45 +02:00
|
|
|
fetch_alternates(walker, alt->base);
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->repo->next != NULL) {
|
|
|
|
obj_req->repo =
|
|
|
|
obj_req->repo->next;
|
|
|
|
close(obj_req->local);
|
|
|
|
obj_req->local = -1;
|
2007-09-11 05:02:45 +02:00
|
|
|
start_object_request(walker, obj_req);
|
2005-11-18 20:02:58 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
finish_object_request(obj_req);
|
2005-11-18 20:02:58 +01:00
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
static void release_object_request(struct object_request *obj_req)
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *entry = object_queue_head;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->local != -1)
|
|
|
|
error("fd leakage in release: %d", obj_req->local);
|
|
|
|
if (obj_req == object_queue_head) {
|
|
|
|
object_queue_head = obj_req->next;
|
2005-10-11 08:22:01 +02:00
|
|
|
} else {
|
2005-11-18 20:03:04 +01:00
|
|
|
while (entry->next != NULL && entry->next != obj_req)
|
2005-10-11 08:22:01 +02:00
|
|
|
entry = entry->next;
|
2005-11-18 20:03:04 +01:00
|
|
|
if (entry->next == obj_req)
|
2005-10-11 08:22:01 +02:00
|
|
|
entry->next = entry->next->next;
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
free(obj_req->url);
|
|
|
|
free(obj_req);
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fill_active_slot(struct walker *walker)
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2007-09-11 05:02:28 +02:00
|
|
|
struct object_request *obj_req;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2007-09-11 05:02:28 +02:00
|
|
|
for (obj_req = object_queue_head; obj_req; obj_req = obj_req->next) {
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->state == WAITING) {
|
|
|
|
if (has_sha1_file(obj_req->sha1))
|
2006-02-01 12:44:28 +01:00
|
|
|
obj_req->state = COMPLETE;
|
2007-09-11 05:02:28 +02:00
|
|
|
else {
|
2007-09-11 05:02:45 +02:00
|
|
|
start_object_request(walker, obj_req);
|
2007-09-11 05:02:28 +02:00
|
|
|
return 1;
|
|
|
|
}
|
2005-10-21 21:06:10 +02:00
|
|
|
}
|
2006-02-01 03:15:51 +01:00
|
|
|
}
|
2007-09-11 05:02:28 +02:00
|
|
|
return 0;
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
2005-10-11 08:22:01 +02:00
|
|
|
#endif
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static void prefetch(struct walker *walker, unsigned char *sha1)
|
2005-10-11 08:22:01 +02:00
|
|
|
{
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *newreq;
|
|
|
|
struct object_request *tail;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
2005-10-11 08:22:01 +02:00
|
|
|
char *filename = sha1_file_name(sha1);
|
|
|
|
|
|
|
|
newreq = xmalloc(sizeof(*newreq));
|
2007-09-11 05:02:45 +02:00
|
|
|
newreq->walker = walker;
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(newreq->sha1, sha1);
|
2007-09-11 05:02:45 +02:00
|
|
|
newreq->repo = data->alt;
|
2005-10-11 08:22:01 +02:00
|
|
|
newreq->url = NULL;
|
|
|
|
newreq->local = -1;
|
|
|
|
newreq->state = WAITING;
|
|
|
|
snprintf(newreq->filename, sizeof(newreq->filename), "%s", filename);
|
|
|
|
snprintf(newreq->tmpfile, sizeof(newreq->tmpfile),
|
|
|
|
"%s.temp", filename);
|
2006-06-07 07:22:35 +02:00
|
|
|
newreq->slot = NULL;
|
2005-10-11 08:22:01 +02:00
|
|
|
newreq->next = NULL;
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (object_queue_head == NULL) {
|
|
|
|
object_queue_head = newreq;
|
2005-10-11 08:22:01 +02:00
|
|
|
} else {
|
2005-11-18 20:03:04 +01:00
|
|
|
tail = object_queue_head;
|
2005-10-11 08:22:01 +02:00
|
|
|
while (tail->next != NULL) {
|
|
|
|
tail = tail->next;
|
|
|
|
}
|
|
|
|
tail->next = newreq;
|
|
|
|
}
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2005-11-18 20:02:58 +01:00
|
|
|
fill_active_slots();
|
|
|
|
step_active_slots();
|
2005-10-11 08:22:01 +02:00
|
|
|
#endif
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
|
2005-08-01 02:54:17 +02:00
|
|
|
{
|
2005-10-11 08:22:01 +02:00
|
|
|
char *hex = sha1_to_hex(sha1);
|
2005-08-01 02:54:17 +02:00
|
|
|
char *filename;
|
|
|
|
char *url;
|
2005-09-28 19:14:04 +02:00
|
|
|
char tmpfile[PATH_MAX];
|
|
|
|
long prev_posn = 0;
|
|
|
|
char range[RANGE_HEADER_SIZE];
|
|
|
|
struct curl_slist *range_header = NULL;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
2005-08-01 02:54:17 +02:00
|
|
|
|
|
|
|
FILE *indexfile;
|
2005-10-11 08:22:01 +02:00
|
|
|
struct active_request_slot *slot;
|
2006-02-01 03:00:37 +01:00
|
|
|
struct slot_results results;
|
2005-08-01 02:54:17 +02:00
|
|
|
|
|
|
|
if (has_pack_index(sha1))
|
|
|
|
return 0;
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-10-11 08:22:01 +02:00
|
|
|
fprintf(stderr, "Getting index for pack %s\n", hex);
|
2006-02-01 03:15:51 +01:00
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
url = xmalloc(strlen(repo->base) + 64);
|
2005-10-11 08:22:01 +02:00
|
|
|
sprintf(url, "%s/objects/pack/pack-%s.idx", repo->base, hex);
|
2006-02-01 03:15:51 +01:00
|
|
|
|
2005-08-01 02:54:17 +02:00
|
|
|
filename = sha1_pack_index_name(sha1);
|
2005-09-28 19:14:04 +02:00
|
|
|
snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
|
|
|
|
indexfile = fopen(tmpfile, "a");
|
2005-08-01 02:54:17 +02:00
|
|
|
if (!indexfile)
|
|
|
|
return error("Unable to open local file %s for pack index",
|
2007-11-21 21:59:14 +01:00
|
|
|
tmpfile);
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
slot = get_active_slot();
|
2006-01-31 20:06:55 +01:00
|
|
|
slot->results = &results;
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
2007-09-11 05:02:45 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header);
|
2005-10-11 08:22:01 +02:00
|
|
|
slot->local = indexfile;
|
|
|
|
|
2005-09-28 19:14:04 +02:00
|
|
|
/* If there is data present from a previous transfer attempt,
|
|
|
|
resume where it left off */
|
|
|
|
prev_posn = ftell(indexfile);
|
|
|
|
if (prev_posn>0) {
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-09-28 19:14:04 +02:00
|
|
|
fprintf(stderr,
|
|
|
|
"Resuming fetch of index for pack %s at byte %ld\n",
|
2005-10-11 08:22:01 +02:00
|
|
|
hex, prev_posn);
|
2005-09-28 19:14:04 +02:00
|
|
|
sprintf(range, "Range: bytes=%ld-", prev_posn);
|
|
|
|
range_header = curl_slist_append(range_header, range);
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header);
|
2005-09-28 19:14:04 +02:00
|
|
|
}
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
if (start_active_slot(slot)) {
|
|
|
|
run_active_slot(slot);
|
2006-01-31 20:06:55 +01:00
|
|
|
if (results.curl_result != CURLE_OK) {
|
2005-10-11 08:22:01 +02:00
|
|
|
fclose(indexfile);
|
|
|
|
return error("Unable to get pack index %s\n%s", url,
|
|
|
|
curl_errorstr);
|
|
|
|
}
|
|
|
|
} else {
|
2005-11-12 00:55:16 +01:00
|
|
|
fclose(indexfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
return error("Unable to start request");
|
2005-08-01 02:54:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fclose(indexfile);
|
2005-09-28 19:14:04 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
return move_temp_to_file(tmpfile, filename);
|
2005-08-01 02:54:17 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int setup_index(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
|
2005-08-01 02:54:17 +02:00
|
|
|
{
|
|
|
|
struct packed_git *new_pack;
|
|
|
|
if (has_pack_file(sha1))
|
2006-07-10 08:57:51 +02:00
|
|
|
return 0; /* don't list this as something we can get */
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (fetch_index(walker, repo, sha1))
|
2005-08-01 02:54:17 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
new_pack = parse_pack_index(sha1);
|
2008-07-18 09:11:40 +02:00
|
|
|
if (!new_pack)
|
|
|
|
return -1; /* parse_pack_index() already issued error message */
|
2005-09-15 05:26:08 +02:00
|
|
|
new_pack->next = repo->packs;
|
|
|
|
repo->packs = new_pack;
|
2005-08-01 02:54:17 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
static void process_alternates_response(void *callback_data)
|
2005-09-15 05:26:08 +02:00
|
|
|
{
|
2005-11-18 20:03:04 +01:00
|
|
|
struct alternates_request *alt_req =
|
|
|
|
(struct alternates_request *)callback_data;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker *walker = alt_req->walker;
|
|
|
|
struct walker_data *cdata = walker->data;
|
2005-11-12 18:11:32 +01:00
|
|
|
struct active_request_slot *slot = alt_req->slot;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct alt_base *tail = cdata->alt;
|
2006-07-27 23:56:22 +02:00
|
|
|
const char *base = alt_req->base;
|
2005-10-13 19:49:53 +02:00
|
|
|
static const char null_byte = '\0';
|
2005-11-12 18:11:32 +01:00
|
|
|
char *data;
|
|
|
|
int i = 0;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-11-12 18:11:32 +01:00
|
|
|
if (alt_req->http_specific) {
|
|
|
|
if (slot->curl_result != CURLE_OK ||
|
2007-12-09 20:30:59 +01:00
|
|
|
!alt_req->buffer->len) {
|
2005-11-12 18:11:32 +01:00
|
|
|
|
|
|
|
/* Try reusing the slot to get non-http alternates */
|
|
|
|
alt_req->http_specific = 0;
|
|
|
|
sprintf(alt_req->url, "%s/objects/info/alternates",
|
|
|
|
base);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL,
|
|
|
|
alt_req->url);
|
|
|
|
active_requests++;
|
|
|
|
slot->in_use = 1;
|
2006-03-15 17:59:52 +01:00
|
|
|
if (slot->finished != NULL)
|
|
|
|
(*slot->finished) = 0;
|
2006-02-01 12:44:39 +01:00
|
|
|
if (!start_active_slot(slot)) {
|
2007-09-11 05:02:45 +02:00
|
|
|
cdata->got_alternates = -1;
|
2005-11-18 20:02:58 +01:00
|
|
|
slot->in_use = 0;
|
2006-03-15 17:59:52 +01:00
|
|
|
if (slot->finished != NULL)
|
|
|
|
(*slot->finished) = 1;
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
2006-02-01 12:44:39 +01:00
|
|
|
return;
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
2005-11-12 18:11:32 +01:00
|
|
|
} else if (slot->curl_result != CURLE_OK) {
|
2006-09-16 19:58:20 +02:00
|
|
|
if (!missing_target(slot)) {
|
2007-09-11 05:02:45 +02:00
|
|
|
cdata->got_alternates = -1;
|
2005-11-12 18:11:32 +01:00
|
|
|
return;
|
|
|
|
}
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
fwrite_buffer(&null_byte, 1, 1, alt_req->buffer);
|
2007-12-09 20:30:59 +01:00
|
|
|
alt_req->buffer->len--;
|
|
|
|
data = alt_req->buffer->buf;
|
2005-09-18 20:14:19 +02:00
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
while (i < alt_req->buffer->len) {
|
2005-09-15 05:26:08 +02:00
|
|
|
int posn = i;
|
2007-12-09 20:30:59 +01:00
|
|
|
while (posn < alt_req->buffer->len && data[posn] != '\n')
|
2005-09-15 05:26:08 +02:00
|
|
|
posn++;
|
|
|
|
if (data[posn] == '\n') {
|
2005-09-18 20:14:19 +02:00
|
|
|
int okay = 0;
|
|
|
|
int serverlen = 0;
|
|
|
|
struct alt_base *newalt;
|
|
|
|
char *target = NULL;
|
2005-09-15 05:26:08 +02:00
|
|
|
if (data[i] == '/') {
|
2006-09-13 08:53:27 +02:00
|
|
|
/* This counts
|
|
|
|
* http://git.host/pub/scm/linux.git/
|
|
|
|
* -----------here^
|
|
|
|
* so memcpy(dst, base, serverlen) will
|
|
|
|
* copy up to "...git.host".
|
|
|
|
*/
|
|
|
|
const char *colon_ss = strstr(base,"://");
|
|
|
|
if (colon_ss) {
|
|
|
|
serverlen = (strchr(colon_ss + 3, '/')
|
|
|
|
- base);
|
|
|
|
okay = 1;
|
|
|
|
}
|
2005-09-18 20:14:19 +02:00
|
|
|
} else if (!memcmp(data + i, "../", 3)) {
|
2006-09-13 08:53:27 +02:00
|
|
|
/* Relative URL; chop the corresponding
|
|
|
|
* number of subpath from base (and ../
|
|
|
|
* from data), and concatenate the result.
|
|
|
|
*
|
|
|
|
* The code first drops ../ from data, and
|
|
|
|
* then drops one ../ from data and one path
|
|
|
|
* from base. IOW, one extra ../ is dropped
|
|
|
|
* from data than path is dropped from base.
|
|
|
|
*
|
|
|
|
* This is not wrong. The alternate in
|
|
|
|
* http://git.host/pub/scm/linux.git/
|
|
|
|
* to borrow from
|
|
|
|
* http://git.host/pub/scm/linus.git/
|
|
|
|
* is ../../linus.git/objects/. You need
|
|
|
|
* two ../../ to borrow from your direct
|
|
|
|
* neighbour.
|
|
|
|
*/
|
2005-09-18 20:14:19 +02:00
|
|
|
i += 3;
|
|
|
|
serverlen = strlen(base);
|
2006-02-01 03:15:51 +01:00
|
|
|
while (i + 2 < posn &&
|
2005-09-18 20:14:19 +02:00
|
|
|
!memcmp(data + i, "../", 3)) {
|
|
|
|
do {
|
|
|
|
serverlen--;
|
|
|
|
} while (serverlen &&
|
|
|
|
base[serverlen - 1] != '/');
|
|
|
|
i += 3;
|
|
|
|
}
|
2006-07-10 08:57:51 +02:00
|
|
|
/* If the server got removed, give up. */
|
2006-02-01 03:15:51 +01:00
|
|
|
okay = strchr(base, ':') - base + 3 <
|
2005-09-18 20:14:19 +02:00
|
|
|
serverlen;
|
2005-11-12 18:11:32 +01:00
|
|
|
} else if (alt_req->http_specific) {
|
2005-09-18 20:14:19 +02:00
|
|
|
char *colon = strchr(data + i, ':');
|
|
|
|
char *slash = strchr(data + i, '/');
|
|
|
|
if (colon && slash && colon < data + posn &&
|
|
|
|
slash < data + posn && colon < slash) {
|
|
|
|
okay = 1;
|
|
|
|
}
|
|
|
|
}
|
2006-09-13 08:53:27 +02:00
|
|
|
/* skip "objects\n" at end */
|
2005-09-18 20:14:19 +02:00
|
|
|
if (okay) {
|
|
|
|
target = xmalloc(serverlen + posn - i - 6);
|
2006-09-13 08:53:27 +02:00
|
|
|
memcpy(target, base, serverlen);
|
|
|
|
memcpy(target + serverlen, data + i,
|
|
|
|
posn - i - 7);
|
|
|
|
target[serverlen + posn - i - 7] = 0;
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2006-02-01 03:15:51 +01:00
|
|
|
fprintf(stderr,
|
2005-09-15 05:26:08 +02:00
|
|
|
"Also look at %s\n", target);
|
|
|
|
newalt = xmalloc(sizeof(*newalt));
|
2005-10-11 08:22:01 +02:00
|
|
|
newalt->next = NULL;
|
2005-09-15 05:26:08 +02:00
|
|
|
newalt->base = target;
|
|
|
|
newalt->got_indices = 0;
|
|
|
|
newalt->packs = NULL;
|
2006-04-04 14:33:18 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
while (tail->next != NULL)
|
|
|
|
tail = tail->next;
|
|
|
|
tail->next = newalt;
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
i = posn + 1;
|
|
|
|
}
|
2005-10-13 19:49:53 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
cdata->got_alternates = 1;
|
2005-11-12 18:11:32 +01:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static void fetch_alternates(struct walker *walker, const char *base)
|
2005-11-12 18:11:32 +01:00
|
|
|
{
|
2007-12-09 20:30:59 +01:00
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
2005-11-12 18:11:32 +01:00
|
|
|
char *url;
|
|
|
|
struct active_request_slot *slot;
|
2006-02-01 03:00:37 +01:00
|
|
|
struct alternates_request alt_req;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *cdata = walker->data;
|
2005-11-12 18:11:32 +01:00
|
|
|
|
|
|
|
/* If another request has already started fetching alternates,
|
|
|
|
wait for them to arrive and return to processing this request's
|
|
|
|
curl message */
|
2005-11-18 20:02:58 +01:00
|
|
|
#ifdef USE_CURL_MULTI
|
2007-09-11 05:02:45 +02:00
|
|
|
while (cdata->got_alternates == 0) {
|
2005-11-18 20:02:58 +01:00
|
|
|
step_active_slots();
|
2005-11-12 18:11:32 +01:00
|
|
|
}
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
2005-11-12 18:11:32 +01:00
|
|
|
|
|
|
|
/* Nothing to do if they've already been fetched */
|
2007-09-11 05:02:45 +02:00
|
|
|
if (cdata->got_alternates == 1)
|
2005-11-12 18:11:32 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Start the fetch */
|
2007-09-11 05:02:45 +02:00
|
|
|
cdata->got_alternates = 0;
|
2005-11-12 18:11:32 +01:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-11-12 18:11:32 +01:00
|
|
|
fprintf(stderr, "Getting alternates list for %s\n", base);
|
2006-02-01 03:15:51 +01:00
|
|
|
|
2005-11-12 18:11:32 +01:00
|
|
|
url = xmalloc(strlen(base) + 31);
|
|
|
|
sprintf(url, "%s/objects/info/http-alternates", base);
|
|
|
|
|
|
|
|
/* Use a callback to process the result, since another request
|
|
|
|
may fail and need to have alternates loaded before continuing */
|
|
|
|
slot = get_active_slot();
|
2005-11-18 20:03:04 +01:00
|
|
|
slot->callback_func = process_alternates_response;
|
2007-09-11 05:02:45 +02:00
|
|
|
alt_req.walker = walker;
|
2005-11-12 18:11:32 +01:00
|
|
|
slot->callback_data = &alt_req;
|
|
|
|
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
|
2005-11-18 20:02:58 +01:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
|
2005-11-12 18:11:32 +01:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
|
|
|
|
|
|
|
alt_req.base = base;
|
|
|
|
alt_req.url = url;
|
|
|
|
alt_req.buffer = &buffer;
|
|
|
|
alt_req.http_specific = 1;
|
|
|
|
alt_req.slot = slot;
|
|
|
|
|
|
|
|
if (start_active_slot(slot))
|
|
|
|
run_active_slot(slot);
|
|
|
|
else
|
2007-09-11 05:02:45 +02:00
|
|
|
cdata->got_alternates = -1;
|
2005-11-12 18:11:32 +01:00
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
strbuf_release(&buffer);
|
2005-11-12 18:11:32 +01:00
|
|
|
free(url);
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fetch_indices(struct walker *walker, struct alt_base *repo)
|
2005-08-01 02:54:17 +02:00
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
char *url;
|
2007-12-09 20:30:59 +01:00
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
2005-08-01 02:54:17 +02:00
|
|
|
char *data;
|
|
|
|
int i = 0;
|
2007-12-10 22:36:11 +01:00
|
|
|
int ret = 0;
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
struct active_request_slot *slot;
|
2006-02-01 03:00:37 +01:00
|
|
|
struct slot_results results;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
if (repo->got_indices)
|
2005-08-01 02:54:17 +02:00
|
|
|
return 0;
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-11-12 01:49:59 +01:00
|
|
|
fprintf(stderr, "Getting pack list for %s\n", repo->base);
|
2006-02-01 03:15:51 +01:00
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
url = xmalloc(strlen(repo->base) + 21);
|
|
|
|
sprintf(url, "%s/objects/info/packs", repo->base);
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
slot = get_active_slot();
|
2006-01-31 20:06:55 +01:00
|
|
|
slot->results = &results;
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
|
2005-11-18 20:02:58 +01:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
|
|
|
|
if (start_active_slot(slot)) {
|
|
|
|
run_active_slot(slot);
|
2006-01-31 20:06:55 +01:00
|
|
|
if (results.curl_result != CURLE_OK) {
|
2006-09-16 19:58:20 +02:00
|
|
|
if (missing_target(&results)) {
|
2005-11-18 20:03:11 +01:00
|
|
|
repo->got_indices = 1;
|
2007-12-10 22:36:11 +01:00
|
|
|
goto cleanup;
|
2005-11-18 20:03:11 +01:00
|
|
|
} else {
|
|
|
|
repo->got_indices = 0;
|
2007-12-10 22:36:11 +01:00
|
|
|
ret = error("%s", curl_errorstr);
|
|
|
|
goto cleanup;
|
2005-11-18 20:03:11 +01:00
|
|
|
}
|
2005-10-13 19:49:53 +02:00
|
|
|
}
|
2005-10-11 08:22:01 +02:00
|
|
|
} else {
|
2005-11-18 20:03:11 +01:00
|
|
|
repo->got_indices = 0;
|
2007-12-10 22:36:11 +01:00
|
|
|
ret = error("Unable to start request");
|
|
|
|
goto cleanup;
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
data = buffer.buf;
|
|
|
|
while (i < buffer.len) {
|
2005-08-01 02:54:17 +02:00
|
|
|
switch (data[i]) {
|
|
|
|
case 'P':
|
|
|
|
i++;
|
2007-12-09 20:30:59 +01:00
|
|
|
if (i + 52 <= buffer.len &&
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 10:53:29 +01:00
|
|
|
!prefixcmp(data + i, " pack-") &&
|
2007-02-20 10:55:07 +01:00
|
|
|
!prefixcmp(data + i + 46, ".pack\n")) {
|
2005-08-01 02:54:17 +02:00
|
|
|
get_sha1_hex(data + i + 6, sha1);
|
2007-09-11 05:02:45 +02:00
|
|
|
setup_index(walker, repo, sha1);
|
2005-08-01 02:54:17 +02:00
|
|
|
i += 51;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2007-12-09 20:30:59 +01:00
|
|
|
while (i < buffer.len && data[i] != '\n')
|
2005-08-01 02:54:17 +02:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
i++;
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
repo->got_indices = 1;
|
2007-12-10 22:36:11 +01:00
|
|
|
cleanup:
|
|
|
|
strbuf_release(&buffer);
|
|
|
|
free(url);
|
|
|
|
return ret;
|
2005-08-01 02:54:17 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
|
2005-08-01 02:54:17 +02:00
|
|
|
{
|
|
|
|
char *url;
|
|
|
|
struct packed_git *target;
|
|
|
|
struct packed_git **lst;
|
|
|
|
FILE *packfile;
|
|
|
|
char *filename;
|
2005-09-28 19:14:04 +02:00
|
|
|
char tmpfile[PATH_MAX];
|
|
|
|
int ret;
|
|
|
|
long prev_posn = 0;
|
|
|
|
char range[RANGE_HEADER_SIZE];
|
|
|
|
struct curl_slist *range_header = NULL;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
|
|
|
struct active_request_slot *slot;
|
2006-02-01 03:00:37 +01:00
|
|
|
struct slot_results results;
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (fetch_indices(walker, repo))
|
2005-08-01 02:54:17 +02:00
|
|
|
return -1;
|
2005-09-15 05:26:08 +02:00
|
|
|
target = find_sha1_pack(sha1, repo->packs);
|
2005-08-01 02:54:17 +02:00
|
|
|
if (!target)
|
2005-09-15 05:26:08 +02:00
|
|
|
return -1;
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely) {
|
2005-08-01 02:54:17 +02:00
|
|
|
fprintf(stderr, "Getting pack %s\n",
|
|
|
|
sha1_to_hex(target->sha1));
|
|
|
|
fprintf(stderr, " which contains %s\n",
|
|
|
|
sha1_to_hex(sha1));
|
|
|
|
}
|
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
url = xmalloc(strlen(repo->base) + 65);
|
2005-08-01 02:54:17 +02:00
|
|
|
sprintf(url, "%s/objects/pack/pack-%s.pack",
|
2005-09-15 05:26:08 +02:00
|
|
|
repo->base, sha1_to_hex(target->sha1));
|
2005-08-01 02:54:17 +02:00
|
|
|
|
|
|
|
filename = sha1_pack_name(target->sha1);
|
2005-09-28 19:14:04 +02:00
|
|
|
snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
|
|
|
|
packfile = fopen(tmpfile, "a");
|
2005-08-01 02:54:17 +02:00
|
|
|
if (!packfile)
|
|
|
|
return error("Unable to open local file %s for pack",
|
2007-11-21 21:59:14 +01:00
|
|
|
tmpfile);
|
2005-08-01 02:54:17 +02:00
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
slot = get_active_slot();
|
2006-01-31 20:06:55 +01:00
|
|
|
slot->results = &results;
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
2007-09-11 05:02:45 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header);
|
2005-10-11 08:22:01 +02:00
|
|
|
slot->local = packfile;
|
2005-09-26 19:52:11 +02:00
|
|
|
|
2005-09-28 19:14:04 +02:00
|
|
|
/* If there is data present from a previous transfer attempt,
|
|
|
|
resume where it left off */
|
|
|
|
prev_posn = ftell(packfile);
|
|
|
|
if (prev_posn>0) {
|
2007-09-11 05:02:45 +02:00
|
|
|
if (walker->get_verbosely)
|
2005-09-28 19:14:04 +02:00
|
|
|
fprintf(stderr,
|
|
|
|
"Resuming fetch of pack %s at byte %ld\n",
|
|
|
|
sha1_to_hex(target->sha1), prev_posn);
|
|
|
|
sprintf(range, "Range: bytes=%ld-", prev_posn);
|
|
|
|
range_header = curl_slist_append(range_header, range);
|
2005-10-11 08:22:01 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header);
|
2005-09-28 19:14:04 +02:00
|
|
|
}
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
if (start_active_slot(slot)) {
|
|
|
|
run_active_slot(slot);
|
2006-01-31 20:06:55 +01:00
|
|
|
if (results.curl_result != CURLE_OK) {
|
2005-10-11 08:22:01 +02:00
|
|
|
fclose(packfile);
|
|
|
|
return error("Unable to get pack file %s\n%s", url,
|
|
|
|
curl_errorstr);
|
|
|
|
}
|
|
|
|
} else {
|
2005-11-12 00:55:16 +01:00
|
|
|
fclose(packfile);
|
2005-10-11 08:22:01 +02:00
|
|
|
return error("Unable to start request");
|
2005-08-01 02:54:17 +02:00
|
|
|
}
|
|
|
|
|
2007-01-10 02:04:52 +01:00
|
|
|
target->pack_size = ftell(packfile);
|
2005-08-01 02:54:17 +02:00
|
|
|
fclose(packfile);
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
ret = move_temp_to_file(tmpfile, filename);
|
2005-09-28 19:14:04 +02:00
|
|
|
if (ret)
|
2005-10-11 08:22:01 +02:00
|
|
|
return ret;
|
2005-09-28 19:14:04 +02:00
|
|
|
|
2005-09-15 05:26:08 +02:00
|
|
|
lst = &repo->packs;
|
2005-08-01 02:54:17 +02:00
|
|
|
while (*lst != target)
|
|
|
|
lst = &((*lst)->next);
|
|
|
|
*lst = (*lst)->next;
|
|
|
|
|
2008-06-25 05:18:17 +02:00
|
|
|
if (verify_pack(target))
|
2005-09-30 09:07:39 +02:00
|
|
|
return -1;
|
2005-08-01 02:54:17 +02:00
|
|
|
install_packed_git(target);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-07 11:07:39 +01:00
|
|
|
static void abort_object_request(struct object_request *obj_req)
|
|
|
|
{
|
|
|
|
if (obj_req->local >= 0) {
|
|
|
|
close(obj_req->local);
|
|
|
|
obj_req->local = -1;
|
|
|
|
}
|
|
|
|
unlink(obj_req->tmpfile);
|
|
|
|
if (obj_req->slot) {
|
2007-06-07 09:04:01 +02:00
|
|
|
release_active_slot(obj_req->slot);
|
2006-02-07 11:07:39 +01:00
|
|
|
obj_req->slot = NULL;
|
|
|
|
}
|
|
|
|
release_object_request(obj_req);
|
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
|
2005-04-24 03:47:23 +02:00
|
|
|
{
|
|
|
|
char *hex = sha1_to_hex(sha1);
|
2005-11-18 20:02:58 +01:00
|
|
|
int ret = 0;
|
2005-11-18 20:03:04 +01:00
|
|
|
struct object_request *obj_req = object_queue_head;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2006-08-17 20:54:57 +02:00
|
|
|
while (obj_req != NULL && hashcmp(obj_req->sha1, sha1))
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req = obj_req->next;
|
|
|
|
if (obj_req == NULL)
|
2005-10-11 08:22:01 +02:00
|
|
|
return error("Couldn't find request for %s in the queue", hex);
|
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (has_sha1_file(obj_req->sha1)) {
|
2006-02-07 11:07:39 +01:00
|
|
|
abort_object_request(obj_req);
|
2005-10-11 08:22:01 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-10-11 08:22:01 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2005-11-18 20:03:04 +01:00
|
|
|
while (obj_req->state == WAITING) {
|
2005-11-18 20:02:58 +01:00
|
|
|
step_active_slots();
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
2005-10-11 08:22:01 +02:00
|
|
|
#else
|
2007-09-11 05:02:45 +02:00
|
|
|
start_object_request(walker, obj_req);
|
2005-10-11 08:22:01 +02:00
|
|
|
#endif
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
while (obj_req->state == ACTIVE) {
|
|
|
|
run_active_slot(obj_req->slot);
|
2005-10-11 08:22:01 +02:00
|
|
|
}
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->local != -1) {
|
|
|
|
close(obj_req->local); obj_req->local = -1;
|
2005-11-12 00:55:16 +01:00
|
|
|
}
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
if (obj_req->state == ABORTED) {
|
2005-11-18 20:02:58 +01:00
|
|
|
ret = error("Request for %s aborted", hex);
|
2005-11-18 20:03:04 +01:00
|
|
|
} else if (obj_req->curl_result != CURLE_OK &&
|
|
|
|
obj_req->http_code != 416) {
|
2006-09-16 19:58:20 +02:00
|
|
|
if (missing_target(obj_req))
|
2005-10-21 18:18:46 +02:00
|
|
|
ret = -1; /* Be silent, it is probably in a pack. */
|
|
|
|
else
|
|
|
|
ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)",
|
2005-11-18 20:03:04 +01:00
|
|
|
obj_req->errorstr, obj_req->curl_result,
|
|
|
|
obj_req->http_code, hex);
|
|
|
|
} else if (obj_req->zret != Z_STREAM_END) {
|
2007-09-11 05:02:45 +02:00
|
|
|
walker->corrupt_object_found++;
|
2006-02-23 02:47:10 +01:00
|
|
|
ret = error("File %s (%s) corrupt", hex, obj_req->url);
|
2006-08-17 20:54:57 +02:00
|
|
|
} else if (hashcmp(obj_req->sha1, obj_req->real_sha1)) {
|
2006-02-23 02:47:10 +01:00
|
|
|
ret = error("File %s has bad hash", hex);
|
2005-11-18 20:03:04 +01:00
|
|
|
} else if (obj_req->rename < 0) {
|
2006-02-01 12:44:35 +01:00
|
|
|
ret = error("unable to write sha1 filename %s",
|
|
|
|
obj_req->filename);
|
2005-04-24 03:47:23 +02:00
|
|
|
}
|
2005-09-28 19:14:04 +02:00
|
|
|
|
2005-11-18 20:03:04 +01:00
|
|
|
release_object_request(obj_req);
|
2005-11-18 20:02:58 +01:00
|
|
|
return ret;
|
2005-04-24 03:47:23 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static int fetch(struct walker *walker, unsigned char *sha1)
|
2005-09-15 05:26:08 +02:00
|
|
|
{
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
|
|
|
struct alt_base *altbase = data->alt;
|
2005-10-11 08:22:01 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
if (!fetch_object(walker, altbase, sha1))
|
2005-10-11 08:22:01 +02:00
|
|
|
return 0;
|
2005-09-15 05:26:08 +02:00
|
|
|
while (altbase) {
|
2007-09-11 05:02:45 +02:00
|
|
|
if (!fetch_pack(walker, altbase, sha1))
|
2005-09-15 05:26:08 +02:00
|
|
|
return 0;
|
2007-09-11 05:02:45 +02:00
|
|
|
fetch_alternates(walker, data->alt->base);
|
2005-09-15 05:26:08 +02:00
|
|
|
altbase = altbase->next;
|
|
|
|
}
|
2006-02-23 02:47:10 +01:00
|
|
|
return error("Unable to find %s under %s", sha1_to_hex(sha1),
|
2007-09-11 05:02:45 +02:00
|
|
|
data->alt->base);
|
2005-09-15 05:26:08 +02:00
|
|
|
}
|
|
|
|
|
Make walker.fetch_ref() take a struct ref.
This simplifies a few things, makes a few things slightly more
complicated, but, more importantly, allows that, when struct ref can
represent a symref, http_fetch_ref() can return one.
Incidentally makes the string that http_fetch_ref() gets include "refs/"
(if appropriate), because that's how the name field of struct ref works.
As far as I can tell, the usage in walker:interpret_target() wouldn't have
worked previously, if it ever would have been used, which it wouldn't
(since the fetch process uses the hash instead of the name of the ref
there).
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26 21:53:09 +02:00
|
|
|
static int fetch_ref(struct walker *walker, struct ref *ref)
|
2005-06-06 22:38:26 +02:00
|
|
|
{
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = walker->data;
|
Make walker.fetch_ref() take a struct ref.
This simplifies a few things, makes a few things slightly more
complicated, but, more importantly, allows that, when struct ref can
represent a symref, http_fetch_ref() can return one.
Incidentally makes the string that http_fetch_ref() gets include "refs/"
(if appropriate), because that's how the name field of struct ref works.
As far as I can tell, the usage in walker:interpret_target() wouldn't have
worked previously, if it ever would have been used, which it wouldn't
(since the fetch process uses the hash instead of the name of the ref
there).
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-26 21:53:09 +02:00
|
|
|
return http_fetch_ref(data->alt->base, ref);
|
2005-06-06 22:38:26 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
static void cleanup(struct walker *walker)
|
|
|
|
{
|
|
|
|
struct walker_data *data = walker->data;
|
|
|
|
http_cleanup();
|
|
|
|
|
|
|
|
curl_slist_free_all(data->no_pragma_header);
|
|
|
|
}
|
|
|
|
|
2008-02-27 21:35:50 +01:00
|
|
|
struct walker *get_http_walker(const char *url, struct remote *remote)
|
2005-04-24 03:47:23 +02:00
|
|
|
{
|
2007-03-28 11:47:35 +02:00
|
|
|
char *s;
|
2007-09-11 05:02:45 +02:00
|
|
|
struct walker_data *data = xmalloc(sizeof(struct walker_data));
|
|
|
|
struct walker *walker = xmalloc(sizeof(struct walker));
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2008-02-27 21:35:50 +01:00
|
|
|
http_init(remote);
|
2005-10-15 02:16:01 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
data->no_pragma_header = curl_slist_append(NULL, "Pragma:");
|
2005-07-13 04:12:40 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
data->alt = xmalloc(sizeof(*data->alt));
|
|
|
|
data->alt->base = xmalloc(strlen(url) + 1);
|
|
|
|
strcpy(data->alt->base, url);
|
|
|
|
for (s = data->alt->base + strlen(data->alt->base) - 1; *s == '/'; --s)
|
2007-03-28 11:47:35 +02:00
|
|
|
*s = 0;
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
data->alt->got_indices = 0;
|
|
|
|
data->alt->packs = NULL;
|
|
|
|
data->alt->next = NULL;
|
|
|
|
data->got_alternates = -1;
|
2007-09-11 05:02:34 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
walker->corrupt_object_found = 0;
|
|
|
|
walker->fetch = fetch;
|
|
|
|
walker->fetch_ref = fetch_ref;
|
|
|
|
walker->prefetch = prefetch;
|
|
|
|
walker->cleanup = cleanup;
|
|
|
|
walker->data = data;
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
add_fill_function(walker, (int (*)(void *)) fill_active_slot);
|
|
|
|
#endif
|
2006-07-27 23:56:22 +02:00
|
|
|
|
2007-09-11 05:02:45 +02:00
|
|
|
return walker;
|
2005-04-24 03:47:23 +02:00
|
|
|
}
|