projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a hashtable for objects instead of a sorted list
[git.git]
/
sha1_file.c
diff --git
a/sha1_file.c
b/sha1_file.c
index
20f6419
..
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;