Fossil SCM

Create parents of empty-dirs if they don't already exist.

andygoth 2015-05-17 17:43 UTC trunk
Commit 1ab80be485603cc44570445369c838e1882eb534
Parent b824b3e7f7ec7f2…
4 files changed +1 -1 +12 -5 +1 -1 +2
~ src/blob.c ~ src/file.c ~ src/update.c ~ www/changes.wiki
M src/blob.c
+1 -1
--- src/blob.c
+++ src/blob.c
@@ -839,11 +839,11 @@
839839
 #if defined(_WIN32)
840840
 fflush(stdout);
841841
 _setmode(_fileno(stdout), _O_TEXT);
842842
 #endif
843843
 }else{
844
- file_mkfolder(zFilename, 1);
844
+ file_mkfolder(zFilename, 1, 0);
845845
 out = fossil_fopen(zFilename, "wb");
846846
 if( out==0 ){
847847
 fossil_fatal_recursive("unable to open file \"%s\" for writing",
848848
 zFilename);
849849
 return 0;
850850
--- src/blob.c
+++ src/blob.c
@@ -839,11 +839,11 @@
839 #if defined(_WIN32)
840 fflush(stdout);
841 _setmode(_fileno(stdout), _O_TEXT);
842 #endif
843 }else{
844 file_mkfolder(zFilename, 1);
845 out = fossil_fopen(zFilename, "wb");
846 if( out==0 ){
847 fossil_fatal_recursive("unable to open file \"%s\" for writing",
848 zFilename);
849 return 0;
850
--- src/blob.c
+++ src/blob.c
@@ -839,11 +839,11 @@
839 #if defined(_WIN32)
840 fflush(stdout);
841 _setmode(_fileno(stdout), _O_TEXT);
842 #endif
843 }else{
844 file_mkfolder(zFilename, 1, 0);
845 out = fossil_fopen(zFilename, "wb");
846 if( out==0 ){
847 fossil_fatal_recursive("unable to open file \"%s\" for writing",
848 zFilename);
849 return 0;
850
M src/file.c
+12 -5
--- src/file.c
+++ src/file.c
@@ -386,11 +386,11 @@
386386
 FILE *in, *out;
387387
 int got;
388388
 char zBuf[8192];
389389
 in = fossil_fopen(zFrom, "rb");
390390
 if( in==0 ) fossil_fatal("cannot open \"%s\" for reading", zFrom);
391
- file_mkfolder(zTo, 0);
391
+ file_mkfolder(zTo, 0, 0);
392392
 out = fossil_fopen(zTo, "wb");
393393
 if( out==0 ) fossil_fatal("cannot open \"%s\" for writing", zTo);
394394
 while( (got=fread(zBuf, 1, sizeof(zBuf), in))>0 ){
395395
 fwrite(zBuf, 1, got, out);
396396
 }
@@ -530,13 +530,16 @@
530530
 }
531531
532532
 /*
533533
 ** Create the tree of directories in which zFilename belongs, if that sequence
534534
 ** of directories does not already exist.
535
+**
536
+** On success, return zero. On error, return errorReturn if positive, otherwise
537
+** print an error message and abort.
535538
 */
536
-void file_mkfolder(const char *zFilename, int forceFlag){
537
- int i, nName;
539
+int file_mkfolder(const char *zFilename, int forceFlag, int errorReturn){
540
+ int i, nName, rc = 0;
538541
 char *zName;
539542
540543
 nName = strlen(zFilename);
541544
 zName = mprintf("%s", zFilename);
542545
 nName = file_simplify_name(zName, nName, 0);
@@ -550,20 +553,24 @@
550553
 ** C: in this example.
551554
 */
552555
 if( !(i==2 && zName[1]==':') ){
553556
 #endif
554557
 if( file_mkdir(zName, forceFlag) && file_isdir(zName)!=1 ){
555
- fossil_fatal_recursive("unable to create directory %s", zName);
556
- return;
558
+ if (errorReturn <= 0) {
559
+ fossil_fatal_recursive("unable to create directory %s", zName);
560
+ }
561
+ rc = errorReturn;
562
+ break;
557563
 }
558564
 #if defined(_WIN32) || defined(__CYGWIN__)
559565
 }
560566
 #endif
561567
 zName[i] = '/';
562568
 }
563569
 }
564570
 free(zName);
571
+ return rc;
565572
 }
566573
567574
 /*
568575
 ** Removes the directory named in the argument, if it exists. The directory
569576
 ** must be empty and cannot be the current directory or the root directory.
570577
--- src/file.c
+++ src/file.c
@@ -386,11 +386,11 @@
386 FILE *in, *out;
387 int got;
388 char zBuf[8192];
389 in = fossil_fopen(zFrom, "rb");
390 if( in==0 ) fossil_fatal("cannot open \"%s\" for reading", zFrom);
391 file_mkfolder(zTo, 0);
392 out = fossil_fopen(zTo, "wb");
393 if( out==0 ) fossil_fatal("cannot open \"%s\" for writing", zTo);
394 while( (got=fread(zBuf, 1, sizeof(zBuf), in))>0 ){
395 fwrite(zBuf, 1, got, out);
396 }
@@ -530,13 +530,16 @@
530 }
531
532 /*
533 ** Create the tree of directories in which zFilename belongs, if that sequence
534 ** of directories does not already exist.
 
 
 
535 */
536 void file_mkfolder(const char *zFilename, int forceFlag){
537 int i, nName;
538 char *zName;
539
540 nName = strlen(zFilename);
541 zName = mprintf("%s", zFilename);
542 nName = file_simplify_name(zName, nName, 0);
@@ -550,20 +553,24 @@
550 ** C: in this example.
551 */
552 if( !(i==2 && zName[1]==':') ){
553 #endif
554 if( file_mkdir(zName, forceFlag) && file_isdir(zName)!=1 ){
555 fossil_fatal_recursive("unable to create directory %s", zName);
556 return;
 
 
 
557 }
558 #if defined(_WIN32) || defined(__CYGWIN__)
559 }
560 #endif
561 zName[i] = '/';
562 }
563 }
564 free(zName);
 
565 }
566
567 /*
568 ** Removes the directory named in the argument, if it exists. The directory
569 ** must be empty and cannot be the current directory or the root directory.
570
--- src/file.c
+++ src/file.c
@@ -386,11 +386,11 @@
386 FILE *in, *out;
387 int got;
388 char zBuf[8192];
389 in = fossil_fopen(zFrom, "rb");
390 if( in==0 ) fossil_fatal("cannot open \"%s\" for reading", zFrom);
391 file_mkfolder(zTo, 0, 0);
392 out = fossil_fopen(zTo, "wb");
393 if( out==0 ) fossil_fatal("cannot open \"%s\" for writing", zTo);
394 while( (got=fread(zBuf, 1, sizeof(zBuf), in))>0 ){
395 fwrite(zBuf, 1, got, out);
396 }
@@ -530,13 +530,16 @@
530 }
531
532 /*
533 ** Create the tree of directories in which zFilename belongs, if that sequence
534 ** of directories does not already exist.
535 **
536 ** On success, return zero. On error, return errorReturn if positive, otherwise
537 ** print an error message and abort.
538 */
539 int file_mkfolder(const char *zFilename, int forceFlag, int errorReturn){
540 int i, nName, rc = 0;
541 char *zName;
542
543 nName = strlen(zFilename);
544 zName = mprintf("%s", zFilename);
545 nName = file_simplify_name(zName, nName, 0);
@@ -550,20 +553,24 @@
553 ** C: in this example.
554 */
555 if( !(i==2 && zName[1]==':') ){
556 #endif
557 if( file_mkdir(zName, forceFlag) && file_isdir(zName)!=1 ){
558 if (errorReturn <= 0) {
559 fossil_fatal_recursive("unable to create directory %s", zName);
560 }
561 rc = errorReturn;
562 break;
563 }
564 #if defined(_WIN32) || defined(__CYGWIN__)
565 }
566 #endif
567 zName[i] = '/';
568 }
569 }
570 free(zName);
571 return rc;
572 }
573
574 /*
575 ** Removes the directory named in the argument, if it exists. The directory
576 ** must be empty and cannot be the current directory or the root directory.
577
M src/update.c
+1 -1
--- src/update.c
+++ src/update.c
@@ -618,11 +618,11 @@
618618
 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
619619
 zPath = blob_str(&path);
620620
 /* Handle various cases of existence of the directory */
621621
 switch( file_wd_isdir(zPath) ){
622622
 case 0: { /* doesn't exist */
623
- if( file_mkdir(zPath, 0)!=0 ) {
623
+ if( file_mkfolder(zPath, 0, 1) ) {
624624
 fossil_warning("couldn't create directory %s as "
625625
 "required by empty-dirs setting", zDir);
626626
 }
627627
 break;
628628
 }
629629
--- src/update.c
+++ src/update.c
@@ -618,11 +618,11 @@
618 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
619 zPath = blob_str(&path);
620 /* Handle various cases of existence of the directory */
621 switch( file_wd_isdir(zPath) ){
622 case 0: { /* doesn't exist */
623 if( file_mkdir(zPath, 0)!=0 ) {
624 fossil_warning("couldn't create directory %s as "
625 "required by empty-dirs setting", zDir);
626 }
627 break;
628 }
629
--- src/update.c
+++ src/update.c
@@ -618,11 +618,11 @@
618 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
619 zPath = blob_str(&path);
620 /* Handle various cases of existence of the directory */
621 switch( file_wd_isdir(zPath) ){
622 case 0: { /* doesn't exist */
623 if( file_mkfolder(zPath, 0, 1) ) {
624 fossil_warning("couldn't create directory %s as "
625 "required by empty-dirs setting", zDir);
626 }
627 break;
628 }
629
M www/changes.wiki
+2
--- www/changes.wiki
+++ www/changes.wiki
@@ -40,10 +40,12 @@
4040
 symlink. Additionally show the UUID for files whose types have changed
4141
 without changing contents or symlink target.
4242
 * Have [/help?cmd=changes|fossil changes] and
4343
 [/help?cmd=status|fossil status] report when executable or symlink status
4444
 changes on otherwise unmodified files.
45
+ * Create parent directories of [/help?cmd=settings|empty-dirs] if they don't
46
+ already exist.
4547
4648
 <h2>Changes for Version 1.32 (2015-03-14)</h2>
4749
 * When creating a new repository using [/help?cmd=init|fossil init], ensure
4850
 that the new repository is fully compatible with historical versions of
4951
 Fossil by having a valid manifest as RID 1.
5052
--- www/changes.wiki
+++ www/changes.wiki
@@ -40,10 +40,12 @@
40 symlink. Additionally show the UUID for files whose types have changed
41 without changing contents or symlink target.
42 * Have [/help?cmd=changes|fossil changes] and
43 [/help?cmd=status|fossil status] report when executable or symlink status
44 changes on otherwise unmodified files.
 
 
45
46 <h2>Changes for Version 1.32 (2015-03-14)</h2>
47 * When creating a new repository using [/help?cmd=init|fossil init], ensure
48 that the new repository is fully compatible with historical versions of
49 Fossil by having a valid manifest as RID 1.
50
--- www/changes.wiki
+++ www/changes.wiki
@@ -40,10 +40,12 @@
40 symlink. Additionally show the UUID for files whose types have changed
41 without changing contents or symlink target.
42 * Have [/help?cmd=changes|fossil changes] and
43 [/help?cmd=status|fossil status] report when executable or symlink status
44 changes on otherwise unmodified files.
45 * Create parent directories of [/help?cmd=settings|empty-dirs] if they don't
46 already exist.
47
48 <h2>Changes for Version 1.32 (2015-03-14)</h2>
49 * When creating a new repository using [/help?cmd=init|fossil init], ensure
50 that the new repository is fully compatible with historical versions of
51 Fossil by having a valid manifest as RID 1.
52

Keyboard Shortcuts

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