http.c: Don't store destination name in request structures

The destination name within the object store is easily computed
on demand, reusing a static buffer held by sha1_file.c.  We don't
need to copy the entire path into the request structure for safe
keeping, when it can be easily reformatted after the download has
been completed.

This reduces the size of the per-request structure, and removes
yet another PATH_MAX based limit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-walker.c b/http-walker.c
index 700bc13112d65dfe8cf89af17522e28cf0d76e26..3a726dea0864878644d34fdc5f0afa8e6e633c95 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -510,7 +510,7 @@ static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned c
                ret = error("File %s has bad hash", hex);
        } else if (req->rename < 0) {
                ret = error("unable to write sha1 filename %s",
                ret = error("File %s has bad hash", hex);
        } else if (req->rename < 0) {
                ret = error("unable to write sha1 filename %s",

-                           req->filename);
+                           sha1_file_name(req->sha1));

        }
 
        release_http_object_request(req);
        }
 
        release_http_object_request(req);

diff --git a/http.c b/http.c
index 7942eea5d829bd172f141c056cf83bdfcf83546b..7ee1ba5a0007042f6e89594d3f4cb7b268663c90 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1014,7 +1014,7 @@ int finish_http_pack_request(struct http_pack_request *preq)
                lst = &((*lst)->next);
        *lst = (*lst)->next;
 
                lst = &((*lst)->next);
        *lst = (*lst)->next;
 

-       ret = move_temp_to_file(preq->tmpfile, preq->filename);
+       ret = move_temp_to_file(preq->tmpfile, sha1_pack_name(p->sha1));

        if (ret)
                return ret;
        if (verify_pack(p))
        if (ret)
                return ret;
        if (verify_pack(p))


@@ -1043,7 +1043,6 @@ struct http_pack_request *new_http_pack_request(
        preq->url = strbuf_detach(&buf, NULL);
 
        filename = sha1_pack_name(target->sha1);
        preq->url = strbuf_detach(&buf, NULL);
 
        filename = sha1_pack_name(target->sha1);

-       snprintf(preq->filename, sizeof(preq->filename), "%s", filename);

        snprintf(preq->tmpfile, sizeof(preq->tmpfile), "%s.temp", filename);
        preq->packfile = fopen(preq->tmpfile, "a");
        if (!preq->packfile) {
        snprintf(preq->tmpfile, sizeof(preq->tmpfile), "%s.temp", filename);
        preq->packfile = fopen(preq->tmpfile, "a");
        if (!preq->packfile) {


@@ -1133,7 +1132,6 @@ struct http_object_request *new_http_object_request(const char *base_url,
        freq->localfile = -1;
 
        filename = sha1_file_name(sha1);
        freq->localfile = -1;
 
        filename = sha1_file_name(sha1);

-       snprintf(freq->filename, sizeof(freq->filename), "%s", filename);

        snprintf(freq->tmpfile, sizeof(freq->tmpfile),
                 "%s.temp", filename);
 
        snprintf(freq->tmpfile, sizeof(freq->tmpfile),
                 "%s.temp", filename);
 


@@ -1162,8 +1160,8 @@ struct http_object_request *new_http_object_request(const char *base_url,
        }
 
        if (freq->localfile < 0) {
        }
 
        if (freq->localfile < 0) {

-               error("Couldn't create temporary file %s for %s: %s",
-                     freq->tmpfile, freq->filename, strerror(errno));
+               error("Couldn't create temporary file %s: %s",
+                     freq->tmpfile, strerror(errno));

                goto abort;
        }
 
                goto abort;
        }
 


@@ -1210,8 +1208,8 @@ struct http_object_request *new_http_object_request(const char *base_url,
                        prev_posn = 0;
                        lseek(freq->localfile, 0, SEEK_SET);
                        if (ftruncate(freq->localfile, 0) < 0) {
                        prev_posn = 0;
                        lseek(freq->localfile, 0, SEEK_SET);
                        if (ftruncate(freq->localfile, 0) < 0) {

-                               error("Couldn't truncate temporary file %s for %s: %s",
-                                         freq->tmpfile, freq->filename, strerror(errno));
+                               error("Couldn't truncate temporary file %s: %s",
+                                         freq->tmpfile, strerror(errno));

                                goto abort;
                        }
                }
                                goto abort;
                        }
                }


@@ -1287,7 +1285,7 @@ int finish_http_object_request(struct http_object_request *freq)
                return -1;
        }
        freq->rename =
                return -1;
        }
        freq->rename =

-               move_temp_to_file(freq->tmpfile, freq->filename);
+               move_temp_to_file(freq->tmpfile, sha1_file_name(freq->sha1));

 
        return freq->rename;
 }
 
        return freq->rename;
 }

diff --git a/http.h b/http.h
index 5c9441c10ce708be426afe7424d63dcbb68a49e2..84bdbd0f76787090a1ec511a006b1c9885521d71 100644 (file)
--- a/http.h
+++ b/http.h
@@ -152,7 +152,6 @@ struct http_pack_request
        struct packed_git *target;
        struct packed_git **lst;
        FILE *packfile;
        struct packed_git *target;
        struct packed_git **lst;
        FILE *packfile;

-       char filename[PATH_MAX];

        char tmpfile[PATH_MAX];
        struct curl_slist *range_header;
        struct active_request_slot *slot;
        char tmpfile[PATH_MAX];
        struct curl_slist *range_header;
        struct active_request_slot *slot;


@@ -167,7 +166,6 @@ extern void release_http_pack_request(struct http_pack_request *preq);
 struct http_object_request
 {
        char *url;
 struct http_object_request
 {
        char *url;

-       char filename[PATH_MAX];

        char tmpfile[PATH_MAX];
        int localfile;
        CURLcode curl_result;
        char tmpfile[PATH_MAX];
        int localfile;
        CURLcode curl_result;