Allow parse_pack_index on temporary files

The easiest way to verify a pack index is to open it through the standard parse_pack_index function, permitting the header check to happen when the file is mapped. However, the dumb HTTP client needs to verify a pack index before its moved into its proper file name within the objects/pack directory, to prevent a corrupt index from being made available. So permit the caller to specify the exact path of the index file. For now we're still using the final destination name within the sole call site in http.c, but eventually we will start to parse the temporary path instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Shawn O. Pearce committed Apr 19, 2010 at 07:23 UTC 7b64469a363c10e9e875a73d32a220ba48694a28

3 files changed +3 -4

cache.h

+1 -1

@@ -900,7 +900,7 @@ struct extra_have_objects {

900 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);

901 extern int server_supports(const char *feature);

902

903 -extern struct packed_git *parse_pack_index(unsigned char *sha1);

903 +extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);

904

905 extern void prepare_packed_git(void);

906 extern void reprepare_packed_git(void);

http.c

+1 -1

@@ -932,7 +932,7 @@ static int fetch_and_setup_pack_index(struct packed_git **packs_head,

932 if (fetch_pack_index(sha1, base_url))

933 return -1;

934

935 - new_pack = parse_pack_index(sha1);

935 + new_pack = parse_pack_index(sha1, sha1_pack_index_name(sha1));

936 if (!new_pack)

937 return -1; /* parse_pack_index() already issued error message */

938 new_pack->next = *packs_head;

sha1_file.c

+1 -2

@@ -845,9 +845,8 @@ struct packed_git *add_packed_git(const char *path, int path_len, int local)

845 return p;

846 }

847

848 -struct packed_git *parse_pack_index(unsigned char *sha1)

848 +struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)

849 {

850 - const char *idx_path = sha1_pack_index_name(sha1);

850 const char *path = sha1_pack_name(sha1);

851 struct packed_git *p = alloc_packed_git(strlen(path) + 1);

852