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>

diff --git a/cache.h b/cache.h
index b1adbe7b6ed9df8c07d7db4c0a3d1517c4af53f9..23e8f24d5c408caf0026a5eef0102c95ca37231d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -342,6 +342,7 @@ static inline unsigned int hexval(unsigned int c)
 #define DEFAULT_ABBREV 7
 
 extern int get_sha1(const char *str, unsigned char *sha1);
 #define DEFAULT_ABBREV 7
 
 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 char *sha1_to_hex(const unsigned char *sha1);   /* static buffer result! */
 extern int read_ref(const char *filename, 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 int read_ref(const char *filename, unsigned char *sha1);

diff --git a/sha1_name.c b/sha1_name.c
index b0b12bbe9de11403c5965518026433c8851e092b..55f25a2d3b49b1d565a9840b7dcfb2e22687cdd3 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -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);
        const char *cp;
 
        int namelen = strlen(name);
        const char *cp;
 

+       *mode = S_IFINVALID;

        prepare_alt_odb();
        ret = get_sha1_1(name, namelen, sha1);
        if (!ret)
        prepare_alt_odb();
        ret = get_sha1_1(name, namelen, sha1);
        if (!ret)


@@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);

+                               *mode = ntohl(ce->ce_mode);

                                return 0;
                        }
                        pos++;
                                return 0;
                        }
                        pos++;


@@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                unsigned char tree_sha1[20];
                if (!get_sha1_1(name, cp-name, tree_sha1))
                        return get_tree_entry(tree_sha1, cp+1, sha1,
                unsigned char tree_sha1[20];
                if (!get_sha1_1(name, cp-name, tree_sha1))
                        return get_tree_entry(tree_sha1, cp+1, sha1,

-                                             &unused);
+                                             mode);

        }
        return ret;
 }
        }
        return ret;
 }