Honor user's umask.

diff --git a/http-fetch.c b/http-fetch.c
index 57141a8a295dbabee74df4af1f8fd2a41b311130..0566a9125cd698a79f99a44ab9a64e9bd7c30c7d 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;
 
@@ -26,7 +27,7 @@ struct alt_base
        struct alt_base *next;
 };
 
-struct alt_base *alt = NULL;
+static struct alt_base *alt = NULL;
 
 static SHA_CTX c;
 static z_stream stream;
@@ -35,6 +36,10 @@ static int local;
 static int zret;
 
 static int curl_ssl_verify;
+static char *ssl_cert;
+static char *ssl_key;
+static char *ssl_capath;
+static char *ssl_cainfo;
 
 struct buffer
 {
@@ -112,10 +117,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 +271,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 +334,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);
@@ -345,7 +354,7 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
        return 0;
 }
 
-int fetch_object(struct alt_base *repo, unsigned char *sha1)
+static int fetch_object(struct alt_base *repo, unsigned char *sha1)
 {
        char *hex = sha1_to_hex(sha1);
        char *filename = sha1_file_name(sha1);
@@ -373,6 +382,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);
@@ -388,7 +398,7 @@ 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);
@@ -453,6 +463,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);
@@ -464,7 +475,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);
@@ -491,6 +503,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++;
        }
@@ -512,6 +526,23 @@ int main(int argc, char **argv)
        curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
 #endif
 
+       if ((ssl_cert = getenv("GIT_SSL_CERT")) != NULL) {
+               curl_easy_setopt(curl, CURLOPT_SSLCERT, ssl_cert);
+       }
+#if LIBCURL_VERSION_NUM >= 0x070902
+       if ((ssl_key = getenv("GIT_SSL_KEY")) != NULL) {
+               curl_easy_setopt(curl, CURLOPT_SSLKEY, ssl_key);
+       }
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070908
+       if ((ssl_capath = getenv("GIT_SSL_CAPATH")) != NULL) {
+               curl_easy_setopt(curl, CURLOPT_CAPATH, ssl_capath);
+       }
+#endif
+       if ((ssl_cainfo = getenv("GIT_SSL_CAINFO")) != NULL) {
+               curl_easy_setopt(curl, CURLOPT_CAINFO, ssl_cainfo);
+       }
+
        alt = xmalloc(sizeof(*alt));
        alt->base = url;
        alt->got_indices = 0;