add get_sha1_with_mode
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>
Martin Koegler committed
Apr 23, 2007 at 22:55 UTC
a0cd87a57044efa8aef39b476fd9240af57a1853
2 files changed
+10
-2
cache.h
+1
@@ -342,6 +342,7 @@ static inline unsigned int hexval(unsigned int c)
342
#define DEFAULT_ABBREV 7
343
344
extern int get_sha1(const char *str, unsigned char *sha1);
345
+extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
346
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
347
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
348
extern int read_ref(const char *filename, unsigned char *sha1);
sha1_name.c
+9
-2
@@ -643,11 +643,17 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
643
*/
644
int get_sha1(const char *name, unsigned char *sha1)
645
{
646
- int ret, bracket_depth;
646
unsigned unused;
647
+ return get_sha1_with_mode(name, sha1, &unused);
648
+}
649
+
650
+int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
651
+{
652
+ int ret, bracket_depth;
653
int namelen = strlen(name);
654
const char *cp;
655
656
+ *mode = S_IFINVALID;
657
prepare_alt_odb();
658
ret = get_sha1_1(name, namelen, sha1);
659
if (!ret)
@@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
691
break;
692
if (ce_stage(ce) == stage) {
693
hashcpy(sha1, ce->sha1);
694
+ *mode = ntohl(ce->ce_mode);
695
return 0;
696
}
697
pos++;
@@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
710
unsigned char tree_sha1[20];
711
if (!get_sha1_1(name, cp-name, tree_sha1))
712
return get_tree_entry(tree_sha1, cp+1, sha1,
706
- &unused);
713
+ mode);
714
}
715
return ret;
716
}