Fossil SCM

When trying to create a directory, if mkdir fails, make sure the directory doesn't already exist before giving up and reporting an error.

drh 2012-11-06 18:31 trunk
Commit bc74a8171d478a4e01ba2dbec4f1908aaeec5fef
1 file changed +1 -1
+1 -1
--- src/blob.c
+++ src/blob.c
@@ -800,11 +800,11 @@
800800
** The if stops us from trying to create a directory of a drive letter
801801
** C: in this example.
802802
*/
803803
if( !(i==2 && zName[1]==':') ){
804804
#endif
805
- if( file_mkdir(zName, 1) ){
805
+ if( file_mkdir(zName, 1) && file_isdir(zName)!=1 ){
806806
fossil_fatal_recursive("unable to create directory %s", zName);
807807
return 0;
808808
}
809809
#if defined(_WIN32)
810810
}
811811
--- src/blob.c
+++ src/blob.c
@@ -800,11 +800,11 @@
800 ** The if stops us from trying to create a directory of a drive letter
801 ** C: in this example.
802 */
803 if( !(i==2 && zName[1]==':') ){
804 #endif
805 if( file_mkdir(zName, 1) ){
806 fossil_fatal_recursive("unable to create directory %s", zName);
807 return 0;
808 }
809 #if defined(_WIN32)
810 }
811
--- src/blob.c
+++ src/blob.c
@@ -800,11 +800,11 @@
800 ** The if stops us from trying to create a directory of a drive letter
801 ** C: in this example.
802 */
803 if( !(i==2 && zName[1]==':') ){
804 #endif
805 if( file_mkdir(zName, 1) && file_isdir(zName)!=1 ){
806 fossil_fatal_recursive("unable to create directory %s", zName);
807 return 0;
808 }
809 #if defined(_WIN32)
810 }
811

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button