projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/diff-tree'
[git.git]
/
sha1_file.c
diff --git
a/sha1_file.c
b/sha1_file.c
index
8bebbb2
..
3d11a9b
100644
(file)
--- a/
sha1_file.c
+++ b/
sha1_file.c
@@
-6,8
+6,6
@@
* This handles basic git sha1 object files - packing, unpacking,
* creation etc.
*/
* This handles basic git sha1 object files - packing, unpacking,
* creation etc.
*/
-#include <sys/types.h>
-#include <dirent.h>
#include "cache.h"
#include "delta.h"
#include "pack.h"
#include "cache.h"
#include "delta.h"
#include "pack.h"
@@
-74,6
+72,8
@@
int adjust_shared_perm(const char *path)
int safe_create_leading_directories(char *path)
{
char *pos = path;
int safe_create_leading_directories(char *path)
{
char *pos = path;
+ struct stat st;
+
if (*pos == '/')
pos++;
if (*pos == '/')
pos++;
@@
-82,12
+82,17
@@
int safe_create_leading_directories(char *path)
if (!pos)
break;
*pos = 0;
if (!pos)
break;
*pos = 0;
- if (mkdir(path, 0777) < 0) {
- if (errno != EEXIST) {
+ if (!stat(path, &st)) {
+ /* path exists */
+ if (!S_ISDIR(st.st_mode)) {
*pos = '/';
*pos = '/';
- return -
1
;
+ return -
3
;
}
}
}
}
+ else if (mkdir(path, 0777)) {
+ *pos = '/';
+ return -1;
+ }
else if (adjust_shared_perm(path)) {
*pos = '/';
return -2;
else if (adjust_shared_perm(path)) {
*pos = '/';
return -2;
@@
-349,16
+354,12
@@
struct packed_git *packed_git;
static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
void **idx_map_)
{
static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
void **idx_map_)
{
- SHA_CTX ctx;
- unsigned char sha1[20];
void *idx_map;
unsigned int *index;
unsigned long idx_size;
int nr, i;
void *idx_map;
unsigned int *index;
unsigned long idx_size;
int nr, i;
- int fd;
+ int fd
= open(path, O_RDONLY)
;
struct stat st;
struct stat st;
-
- fd = open(path, O_RDONLY);
if (fd < 0)
return -1;
if (fstat(fd, &st)) {
if (fd < 0)
return -1;
if (fstat(fd, &st)) {
@@
-396,16
+397,6
@@
static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
if (idx_size != 4*256 + nr * 24 + 20 + 20)
return error("wrong index file size");
if (idx_size != 4*256 + nr * 24 + 20 + 20)
return error("wrong index file size");
- /*
- * File checksum.
- */
- SHA1_Init(&ctx);
- SHA1_Update(&ctx, idx_map, idx_size-20);
- SHA1_Final(sha1, &ctx);
-
- if (memcmp(sha1, idx_map + idx_size - 20, 20))
- return error("index checksum mismatch");
-
return 0;
}
return 0;
}