X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=481f7c787040aadbbea877adbb3b9a4fd5f9b9d0;hb=5b86040679626e36c12345039f6df62f4622aef2;hp=a10243d192f5444a58a056ef5a21a4386af26fb3;hpb=9da3acfb1942ef28424ea58068faf6ac3a3fc2c8;p=git.git diff --git a/cache.h b/cache.h index a10243d1..481f7c78 100644 --- a/cache.h +++ b/cache.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -21,12 +22,25 @@ #define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) #endif +#ifdef DT_UNKNOWN +#define DTYPE(de) ((de)->d_type) +#else +#define DT_UNKNOWN 0 +#define DT_DIR 1 +#define DT_REG 2 +#define DT_LNK 3 +#define DTYPE(de) DT_UNKNOWN +#endif + +/* + * Environment variables transition. + * We accept older names for now but warn. + */ +extern char *gitenv_bc(const char *); +#define gitenv(e) (getenv(e) ? : gitenv_bc(e)) + /* * Basic data structures for the directory cache - * - * NOTE NOTE NOTE! This is all in the native CPU byte format. It's - * not even trying to be portable. It's trying to be efficient. It's - * just a cache, after all. */ #define CACHE_SIGNATURE 0x44495243 /* "DIRC" */ @@ -78,23 +92,27 @@ struct cache_entry { #define ce_stage(ce) ((CE_STAGEMASK & ntohs((ce)->ce_flags)) >> CE_STAGESHIFT) #define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644) -#define create_ce_mode(mode) htonl(S_IFREG | ce_permissions(mode)) +static inline unsigned int create_ce_mode(unsigned int mode) +{ + if (S_ISLNK(mode)) + return htonl(S_IFLNK); + return htonl(S_IFREG | ce_permissions(mode)); +} #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7) -const char *sha1_file_directory; -struct cache_entry **active_cache; -unsigned int active_nr, active_alloc; - -#define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY" -#define DEFAULT_DB_ENVIRONMENT ".git/objects" - -#define get_object_directory() (getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT) +extern struct cache_entry **active_cache; +extern unsigned int active_nr, active_alloc, active_cache_changed; +#define GIT_DIR_ENVIRONMENT "GIT_DIR" +#define DEFAULT_GIT_DIR_ENVIRONMENT ".git" +#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY" #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" -#define DEFAULT_INDEX_ENVIRONMENT ".git/index" -#define get_index_file() (getenv(INDEX_ENVIRONMENT) ? : DEFAULT_INDEX_ENVIRONMENT) +extern char *get_object_directory(void); +extern char *get_index_file(void); + +#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" #define alloc_nr(x) (((x)+16)*3/2) @@ -102,11 +120,23 @@ unsigned int active_nr, active_alloc; extern int read_cache(void); extern int write_cache(int newfd, struct cache_entry **cache, int entries); extern int cache_name_pos(const char *name, int namelen); -extern int add_cache_entry(struct cache_entry *ce, int ok_to_add); -extern int remove_entry_at(int pos); +#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ +#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ +extern int add_cache_entry(struct cache_entry *ce, int option); +extern int remove_cache_entry_at(int pos); extern int remove_file_from_cache(char *path); -extern int same_name(struct cache_entry *a, struct cache_entry *b); -extern int cache_match_stat(struct cache_entry *ce, struct stat *st); +extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); +extern int ce_match_stat(struct cache_entry *ce, struct stat *st); +extern int index_fd(unsigned char *sha1, int fd, struct stat *st); +extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); + +struct cache_file { + struct cache_file *next; + char lockfile[PATH_MAX]; +}; +extern int hold_index_file_for_update(struct cache_file *, const char *path); +extern int commit_index_file(struct cache_file *); +extern void rollback_index_file(struct cache_file *); #define MTIME_CHANGED 0x0001 #define CTIME_CHANGED 0x0002 @@ -114,18 +144,20 @@ extern int cache_match_stat(struct cache_entry *ce, struct stat *st); #define MODE_CHANGED 0x0008 #define INODE_CHANGED 0x0010 #define DATA_CHANGED 0x0020 +#define TYPE_CHANGED 0x0040 /* Return a statically allocated filename matching the sha1 signature */ extern char *sha1_file_name(const unsigned char *sha1); -/* Write a memory buffer out to the sha file */ -extern int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int size); - /* Read and unpack a sha1 file into memory, write memory to a sha1 file */ extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size); +extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size); +extern int parse_sha1_header(char *hdr, char *type, unsigned long *sizep); +extern int sha1_delta_base(const unsigned char *, unsigned char *); +extern int sha1_file_size(const unsigned char *, unsigned long *); extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size); extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size); -extern int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *return_sha1); +extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type); @@ -137,6 +169,7 @@ extern int write_sha1_from_fd(const unsigned char *sha1, int fd); extern int has_sha1_file(const unsigned char *sha1); /* Convert to/from hex/sha1 representation */ +extern int get_sha1(const char *str, 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! */ @@ -145,17 +178,19 @@ extern void usage(const char *err); extern void die(const char *err, ...); extern int error(const char *err, ...); +extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2); extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2); extern void *read_object_with_reference(const unsigned char *sha1, - const unsigned char *required_type, + const char *required_type, unsigned long *size, unsigned char *sha1_ret); +const char *show_date(unsigned long time, int timezone); void parse_date(char *date, char *buf, int bufsize); void datestamp(char *buf, int bufsize); -static inline void *xmalloc(int size) +static inline void *xmalloc(size_t size) { void *ret = malloc(size); if (!ret) @@ -163,7 +198,7 @@ static inline void *xmalloc(int size) return ret; } -static inline void *xrealloc(void *ptr, int size) +static inline void *xrealloc(void *ptr, size_t size) { void *ret = realloc(ptr, size); if (!ret) @@ -171,4 +206,12 @@ static inline void *xrealloc(void *ptr, int size) return ret; } +static inline void *xcalloc(size_t nmemb, size_t size) +{ + void *ret = calloc(nmemb, size); + if (!ret) + die("Out of memory, calloc failed"); + return ret; +} + #endif /* CACHE_H */