X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=a4f253ec2576fa5e48f00282342c9291f963f6d2;hb=cfa24e184a67cc36f414d913cf705d31e70a7a1a;hp=255e6b5cc7aa799eee892dcd3632cd0656e6dd1e;hpb=8ff8eea016f27d22d0264b140843470c7f14e004;p=git.git

diff --git a/cache.h b/cache.h
index 255e6b5c..a4f253ec 100644
--- a/cache.h
+++ b/cache.h
@@ -106,6 +106,9 @@ static inline unsigned int create_ce_mode(unsigned int mode)
 		return htonl(S_IFLNK);
 	return htonl(S_IFREG | ce_permissions(mode));
 }
+#define canon_mode(mode) \
+	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
 
 #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
 
@@ -131,6 +134,8 @@ extern const char *setup_git_directory_gently(int *);
 extern const char *setup_git_directory(void);
 extern const char *prefix_path(const char *prefix, int len, const char *path);
 extern const char *prefix_filename(const char *prefix, int len, const char *path);
+extern void verify_filename(const char *prefix, const char *name);
+extern void verify_non_filename(const char *prefix, const char *name);
 
 #define alloc_nr(x) (((x)+16)*3/2)