[PATCH] Return CURL error message when object transfer fails

[git.git] / http-fetch.c

diff --git a/http-fetch.c b/http-fetch.c
index 77f530c..0caec10 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -15,6 +15,7 @@
 
 static CURL *curl;
 static struct curl_slist *no_pragma_header;
+static char curl_errorstr[CURL_ERROR_SIZE];
 
 static char *initial_base;
 
@@ -112,10 +113,12 @@ static int fetch_index(struct alt_base *repo, unsigned char *sha1)
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
        curl_easy_setopt(curl, CURLOPT_URL, url);
        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, no_pragma_header);
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
        
        if (curl_easy_perform(curl)) {
                fclose(indexfile);
-               return error("Unable to get pack index %s", url);
+               return error("Unable to get pack index %s\n%s", url,
+                            curl_errorstr);
        }
 
        fclose(indexfile);
@@ -264,10 +267,10 @@ static int fetch_indices(struct alt_base *repo)
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
        curl_easy_setopt(curl, CURLOPT_URL, url);
        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
        
-       if (curl_easy_perform(curl)) {
-               return -1;
-       }
+       if (curl_easy_perform(curl))
+               return error("%s", curl_errorstr);
 
        while (i < buffer.posn) {
                switch (data[i]) {
@@ -327,10 +330,12 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
        curl_easy_setopt(curl, CURLOPT_URL, url);
        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, no_pragma_header);
-       
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
+
        if (curl_easy_perform(curl)) {
                fclose(packfile);
-               return error("Unable to get pack file %s", url);
+               return error("Unable to get pack file %s\n%s", url,
+                            curl_errorstr);
        }
 
        fclose(packfile);
@@ -350,13 +355,18 @@ int fetch_object(struct alt_base *repo, unsigned char *sha1)
        char *hex = sha1_to_hex(sha1);
        char *filename = sha1_file_name(sha1);
        unsigned char real_sha1[20];
+       char tmpfile[PATH_MAX];
+       int ret;
        char *url;
        char *posn;
 
-       local = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
+       snprintf(tmpfile, sizeof(tmpfile), "%s/obj_XXXXXX",
+                get_object_directory());
 
+       local = mkstemp(tmpfile);
        if (local < 0)
-               return error("Couldn't open local object %s\n", filename);
+               return error("Couldn't create temporary file %s for %s: %s\n",
+                            tmpfile, filename, strerror(errno));
 
        memset(&stream, 0, sizeof(stream));
 
@@ -368,6 +378,7 @@ int fetch_object(struct alt_base *repo, unsigned char *sha1)
        curl_easy_setopt(curl, CURLOPT_FILE, NULL);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, no_pragma_header);
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
        url = xmalloc(strlen(repo->base) + 50);
        strcpy(url, repo->base);
@@ -383,21 +394,35 @@ int fetch_object(struct alt_base *repo, unsigned char *sha1)
 
        if (curl_easy_perform(curl)) {
                unlink(filename);
-               return -1;
+               return error("%s", curl_errorstr);
        }
 
+       fchmod(local, 0444);
        close(local);
        inflateEnd(&stream);
        SHA1_Final(real_sha1, &c);
        if (zret != Z_STREAM_END) {
-               unlink(filename);
+               unlink(tmpfile);
                return error("File %s (%s) corrupt\n", hex, url);
        }
        if (memcmp(sha1, real_sha1, 20)) {
-               unlink(filename);
+               unlink(tmpfile);
                return error("File %s has bad hash\n", hex);
        }
-       
+       ret = link(tmpfile, filename);
+       if (ret < 0) {
+               /* Same Coda hack as in write_sha1_file(sha1_file.c) */
+               ret = errno;
+               if (ret == EXDEV && !rename(tmpfile, filename))
+                       goto out;
+       }
+       unlink(tmpfile);
+       if (ret) {
+               if (ret != EEXIST)
+                       return error("unable to write sha1 filename %s: %s",
+                                    filename, strerror(ret));
+       }
+ out:
        pull_say("got %s\n", hex);
        return 0;
 }
@@ -434,6 +459,7 @@ int fetch_ref(char *ref, unsigned char *sha1)
         curl_easy_setopt(curl, CURLOPT_FILE, &buffer);
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
         url = xmalloc(strlen(base) + 6 + strlen(ref));
         strcpy(url, base);
@@ -445,7 +471,8 @@ int fetch_ref(char *ref, unsigned char *sha1)
         curl_easy_setopt(curl, CURLOPT_URL, url);
 
         if (curl_easy_perform(curl))
-                return error("Couldn't get %s for %s\n", url, ref);
+                return error("Couldn't get %s for %s\n%s",
+                            url, ref, curl_errorstr);
 
         hex[40] = '\0';
         get_sha1_hex(hex, sha1);
@@ -472,6 +499,8 @@ int main(int argc, char **argv)
                } else if (argv[arg][1] == 'w') {
                        write_ref = argv[arg + 1];
                        arg++;
+               } else if (!strcmp(argv[arg], "--recover")) {
+                       get_recover = 1;
                }
                arg++;
        }