Fossil SCM
Change a couple of unlink()'s to file_delete().
Commit
61d49d92bb50fabf3acfa47115bf4ea573e37640
Parent
1d54dce41e1455f…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -218,11 +218,11 @@ | ||
| 218 | 218 | } |
| 219 | 219 | content_get(rid, &a); |
| 220 | 220 | blob_delta_apply(&a, &delta, &b); |
| 221 | 221 | if( blob_compare(&disk, &a)==0 && isLink == isNewLink ){ |
| 222 | 222 | if( isLink || isNewLink ){ |
| 223 | - unlink(zNPath); | |
| 223 | + file_delete(zNPath); | |
| 224 | 224 | } |
| 225 | 225 | if( isLink ){ |
| 226 | 226 | create_symlink(blob_str(&b), zNPath); |
| 227 | 227 | }else{ |
| 228 | 228 | blob_write_to_file(&b, zNPath); |
| 229 | 229 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -218,11 +218,11 @@ | |
| 218 | } |
| 219 | content_get(rid, &a); |
| 220 | blob_delta_apply(&a, &delta, &b); |
| 221 | if( blob_compare(&disk, &a)==0 && isLink == isNewLink ){ |
| 222 | if( isLink || isNewLink ){ |
| 223 | unlink(zNPath); |
| 224 | } |
| 225 | if( isLink ){ |
| 226 | create_symlink(blob_str(&b), zNPath); |
| 227 | }else{ |
| 228 | blob_write_to_file(&b, zNPath); |
| 229 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -218,11 +218,11 @@ | |
| 218 | } |
| 219 | content_get(rid, &a); |
| 220 | blob_delta_apply(&a, &delta, &b); |
| 221 | if( blob_compare(&disk, &a)==0 && isLink == isNewLink ){ |
| 222 | if( isLink || isNewLink ){ |
| 223 | file_delete(zNPath); |
| 224 | } |
| 225 | if( isLink ){ |
| 226 | create_symlink(blob_str(&b), zNPath); |
| 227 | }else{ |
| 228 | blob_write_to_file(&b, zNPath); |
| 229 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -669,11 +669,11 @@ | ||
| 669 | 669 | db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile); |
| 670 | 670 | }else{ |
| 671 | 671 | sqlite3_int64 mtime; |
| 672 | 672 | undo_save(zFile); |
| 673 | 673 | if( file_size(zFull)>=0 && (isLink || file_islink(zFull)) ){ |
| 674 | - unlink(zFull); | |
| 674 | + file_delete(zFull); | |
| 675 | 675 | } |
| 676 | 676 | if( isLink ){ |
| 677 | 677 | create_symlink(blob_str(&record), zFull); |
| 678 | 678 | }else{ |
| 679 | 679 | blob_write_to_file(&record, zFull); |
| 680 | 680 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -669,11 +669,11 @@ | |
| 669 | db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile); |
| 670 | }else{ |
| 671 | sqlite3_int64 mtime; |
| 672 | undo_save(zFile); |
| 673 | if( file_size(zFull)>=0 && (isLink || file_islink(zFull)) ){ |
| 674 | unlink(zFull); |
| 675 | } |
| 676 | if( isLink ){ |
| 677 | create_symlink(blob_str(&record), zFull); |
| 678 | }else{ |
| 679 | blob_write_to_file(&record, zFull); |
| 680 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -669,11 +669,11 @@ | |
| 669 | db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile); |
| 670 | }else{ |
| 671 | sqlite3_int64 mtime; |
| 672 | undo_save(zFile); |
| 673 | if( file_size(zFull)>=0 && (isLink || file_islink(zFull)) ){ |
| 674 | file_delete(zFull); |
| 675 | } |
| 676 | if( isLink ){ |
| 677 | create_symlink(blob_str(&record), zFull); |
| 678 | }else{ |
| 679 | blob_write_to_file(&record, zFull); |
| 680 |