mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add get_sha1_with_mode

Browse Source 
get_sha1_with_mode basically behaves as get_sha1. It has an additional
parameter for storing the mode of the object.

If the mode can not be determined, it stores S_IFINVALID.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Koegler
2007-04-23 22:55:05 +02:00
committed by Junio C Hamano
parent 40689ae1ef
commit a0cd87a570
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -342,6 +342,7 @@ static inline unsigned int hexval(unsigned int c)
#define DEFAULT_ABBREV 7 #define DEFAULT_ABBREV 7
extern int get_sha1(const char *str, unsigned char *sha1); extern int get_sha1(const char *str, unsigned char *sha1);
extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
extern int get_sha1_hex(const char *hex, unsigned char *sha1); extern int get_sha1_hex(const char *hex, unsigned char *sha1);
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */ extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
extern int read_ref(const char *filename, unsigned char *sha1); extern int read_ref(const char *filename, unsigned char *sha1);

11
sha1_name.c
View File

@ -643,11 +643,17 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
*/ */
int get_sha1(const char *name, unsigned char *sha1) int get_sha1(const char *name, unsigned char *sha1)
{ {
int ret, bracket_depth;
unsigned unused; unsigned unused;
return get_sha1_with_mode(name, sha1, &unused);
}
int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
{
int ret, bracket_depth;
int namelen = strlen(name); int namelen = strlen(name);
const char *cp; const char *cp;
*mode = S_IFINVALID;
prepare_alt_odb(); prepare_alt_odb();
ret = get_sha1_1(name, namelen, sha1); ret = get_sha1_1(name, namelen, sha1);
if (!ret) if (!ret)
@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
break; break;
if (ce_stage(ce) == stage) { if (ce_stage(ce) == stage) {
hashcpy(sha1, ce->sha1); hashcpy(sha1, ce->sha1);
*mode = ntohl(ce->ce_mode);
return 0; return 0;
} }
pos++; pos++;
@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
unsigned char tree_sha1[20]; unsigned char tree_sha1[20];
if (!get_sha1_1(name, cp-name, tree_sha1)) if (!get_sha1_1(name, cp-name, tree_sha1))
return get_tree_entry(tree_sha1, cp+1, sha1, return get_tree_entry(tree_sha1, cp+1, sha1,
&unused); mode);
} }
return ret; return ret;
} }