Fossil SCM

Make sure that the "--nocgi" option gets removed from the command line (hint: short circuit evaluation of the && operator).

tsbg 2019-04-26 16:45 backoffice-win
Commit 417e2b4149e0d79f10343d07ee41693c99755c88fb06724cec0bfe0e564bbaa2
1 file changed +1 -1
+1 -1
--- src/main.c
+++ src/main.c
@@ -682,11 +682,11 @@
682682
sqlite3_vfs_register(pVfs, 1);
683683
}else{
684684
fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
685685
}
686686
}
687
- if( fossil_getenv("GATEWAY_INTERFACE")!=0 && !find_option("nocgi", 0, 0)){
687
+ if( !find_option("nocgi", 0, 0) && fossil_getenv("GATEWAY_INTERFACE")!=0 ){
688688
zCmdName = "cgi";
689689
g.isHTTP = 1;
690690
}else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
691691
fossil_print(
692692
"Usage: %s COMMAND ...\n"
693693
--- src/main.c
+++ src/main.c
@@ -682,11 +682,11 @@
682 sqlite3_vfs_register(pVfs, 1);
683 }else{
684 fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
685 }
686 }
687 if( fossil_getenv("GATEWAY_INTERFACE")!=0 && !find_option("nocgi", 0, 0)){
688 zCmdName = "cgi";
689 g.isHTTP = 1;
690 }else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
691 fossil_print(
692 "Usage: %s COMMAND ...\n"
693
--- src/main.c
+++ src/main.c
@@ -682,11 +682,11 @@
682 sqlite3_vfs_register(pVfs, 1);
683 }else{
684 fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
685 }
686 }
687 if( !find_option("nocgi", 0, 0) && fossil_getenv("GATEWAY_INTERFACE")!=0 ){
688 zCmdName = "cgi";
689 g.isHTTP = 1;
690 }else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
691 fossil_print(
692 "Usage: %s COMMAND ...\n"
693

Keyboard Shortcuts

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