X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=entry.c;h=88df7139477f94c236f93ca835c28ed4dd9543de;hb=2c039da804ee0542ff41d2f22a444d04a2d37856;hp=5d9aefd03fa4ff0e86d1212dc3354c9b50bba22a;hpb=64ecb6247f89783a53297436fa452478a83bda53;p=git.git diff --git a/entry.c b/entry.c index 5d9aefd03..88df71394 100644 --- a/entry.c +++ b/entry.c @@ -1,6 +1,5 @@ -#include -#include #include "cache.h" +#include "blob.h" static void create_directories(const char *path, struct checkout *state) { @@ -72,7 +71,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat char type[20]; new = read_sha1_file(ce->sha1, type, &size); - if (!new || strcmp(type, "blob")) { + if (!new || strcmp(type, blob_type)) { if (new) free(new); return error("git-checkout-index: unable to read sha1 file of %s (%s)", @@ -134,7 +133,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath) { - static char path[MAXPATHLEN+1]; + static char path[PATH_MAX + 1]; struct stat st; int len = state->base_dir_len; @@ -171,5 +170,3 @@ int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath) create_directories(path, state); return write_entry(ce, path, state, 0); } - -