Fossil SCM
get to fossil_stat() via file_size(), and additionally protect 0-byte files in "clone"
Commit
45b060f08ea6845a5599c84d21c87dcb60590c5b
Parent
89cf250dda1face…
2 files changed
+1
-1
+2
-2
+1
-1
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -138,11 +138,11 @@ | ||
| 138 | 138 | |
| 139 | 139 | if( g.argc < 4 ){ |
| 140 | 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | 141 | } |
| 142 | 142 | db_open_config(0); |
| 143 | - if( file_size(g.argv[3])>0 ){ | |
| 143 | + if( -1 != file_size(g.argv[3]) ){ | |
| 144 | 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | url_parse(g.argv[2], urlFlags); |
| 148 | 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 | 149 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | |
| 139 | if( g.argc < 4 ){ |
| 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | } |
| 142 | db_open_config(0); |
| 143 | if( file_size(g.argv[3])>0 ){ |
| 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | } |
| 146 | |
| 147 | url_parse(g.argv[2], urlFlags); |
| 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | |
| 139 | if( g.argc < 4 ){ |
| 140 | usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY"); |
| 141 | } |
| 142 | db_open_config(0); |
| 143 | if( -1 != file_size(g.argv[3]) ){ |
| 144 | fossil_fatal("file already exists: %s", g.argv[3]); |
| 145 | } |
| 146 | |
| 147 | url_parse(g.argv[2], urlFlags); |
| 148 | if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user; |
| 149 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1685,12 +1685,12 @@ | ||
| 1685 | 1685 | |
| 1686 | 1686 | if( g.argc!=3 ){ |
| 1687 | 1687 | usage("REPOSITORY-NAME"); |
| 1688 | 1688 | } |
| 1689 | 1689 | |
| 1690 | - if (0 == stat(g.argv[2], &sb)) { | |
| 1691 | - fossil_fatal("[%s]: %s", g.argv[2], "File already exists."); | |
| 1690 | + if( -1 != file_size(g.argv[2]) ){ | |
| 1691 | + fossil_fatal("file already exists: %s", g.argv[2]); | |
| 1692 | 1692 | } |
| 1693 | 1693 | |
| 1694 | 1694 | db_create_repository(g.argv[2]); |
| 1695 | 1695 | db_open_repository(g.argv[2]); |
| 1696 | 1696 | db_open_config(0); |
| 1697 | 1697 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1685,12 +1685,12 @@ | |
| 1685 | |
| 1686 | if( g.argc!=3 ){ |
| 1687 | usage("REPOSITORY-NAME"); |
| 1688 | } |
| 1689 | |
| 1690 | if (0 == stat(g.argv[2], &sb)) { |
| 1691 | fossil_fatal("[%s]: %s", g.argv[2], "File already exists."); |
| 1692 | } |
| 1693 | |
| 1694 | db_create_repository(g.argv[2]); |
| 1695 | db_open_repository(g.argv[2]); |
| 1696 | db_open_config(0); |
| 1697 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1685,12 +1685,12 @@ | |
| 1685 | |
| 1686 | if( g.argc!=3 ){ |
| 1687 | usage("REPOSITORY-NAME"); |
| 1688 | } |
| 1689 | |
| 1690 | if( -1 != file_size(g.argv[2]) ){ |
| 1691 | fossil_fatal("file already exists: %s", g.argv[2]); |
| 1692 | } |
| 1693 | |
| 1694 | db_create_repository(g.argv[2]); |
| 1695 | db_open_repository(g.argv[2]); |
| 1696 | db_open_config(0); |
| 1697 |