@matheusbsbs / matheus-bagliano / commits / 67d42212ff
Fork 0

stat() for existence in safe_create_leading_directories()

Use stat() to explicitly check for existence rather than relying on the non-portable EEXIST error in sha1_file.c's safe_create_leading_directories(). There certainly are optimizations possible, but then the code becomes almost the same as that in coreutil's lib/mkdir-p.c. Other uses of EEXIST seem ok. Tested on Solaris 8, AIX 5.2L, and a few Linux versions. AIX has some unrelated (I think) failures right now; I haven't tried many recent gits there. Anyone have an old Ultrix box to break everything? ;) Also remove extraneous #includes. Everything's already in git-compat-util.h, included through cache.h. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jason Riedy committed Feb 9, 2006 at 17:56 UTC 67d42212ff104aaafa97b943cb369b8444f61581
1 file changed +10 -5
sha1_file.c
+10 -5
@@ -6,8 +6,6 @@
6 * This handles basic git sha1 object files - packing, unpacking,
7 * creation etc.
8 */
9 -#include <sys/types.h>
10 -#include <dirent.h>
9 #include "cache.h"
10 #include "delta.h"
11 #include "pack.h"
@@ -74,6 +72,8 @@ int adjust_shared_perm(const char *path)
72 int safe_create_leading_directories(char *path)
73 {
74 char *pos = path;
75 + struct stat st;
76 +
77 if (*pos == '/')
78 pos++;
79
@@ -82,12 +82,17 @@ int safe_create_leading_directories(char *path)
82 if (!pos)
83 break;
84 *pos = 0;
85 - if (mkdir(path, 0777) < 0) {
86 - if (errno != EEXIST) {
85 + if (!stat(path, &st)) {
86 + /* path exists */
87 + if (!S_ISDIR(st.st_mode)) {
88 *pos = '/';
88 - return -1;
89 + return -3;
90 }
91 }
92 + else if (mkdir(path, 0777)) {
93 + *pos = '/';
94 + return -1;
95 + }
96 else if (adjust_shared_perm(path)) {
97 *pos = '/';
98 return -2;