Fossil SCM

Do not assume that the method is CGI just because the GATEWAY_INTERFACE environment variable is set. Only do CGI if GATEWAY_INTERFACE is set and there either is no argument specified, or the specified argument is not a valid command. Ticket [e49f245975f89a8a9]

drh 2010-11-04 19:58 UTC trunk
Commit dcf839e4a6cd787eda162f5d8b803850cf714f99
1 file changed +15 -8
+15 -8
--- src/main.c
+++ src/main.c
@@ -223,32 +223,39 @@
223223
*/
224224
int main(int argc, char **argv){
225225
const char *zCmdName = "unknown";
226226
int idx;
227227
int rc;
228
+ int mightBeCgi;
228229
229230
sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
230231
g.now = time(0);
231232
g.argc = argc;
232233
g.argv = argv;
233
- if( getenv("GATEWAY_INTERFACE")!=0 ){
234
- zCmdName = "cgi";
235
- }else if( argc<2 ){
236
- fprintf(stderr, "Usage: %s COMMAND ...\n"
237
- "\"%s help\" for a list of available commands\n"
238
- "\"%s help COMMAND\" for specific details\n",
239
- argv[0], argv[0], argv[0]);
240
- fossil_exit(1);
234
+ mightBeCgi = getenv("GATEWAY_INTERFACE")!=0;
235
+ if( argc<2 ){
236
+ if( mightBeCgi ){
237
+ zCmdName = "cgi";
238
+ }else{
239
+ fprintf(stderr, "Usage: %s COMMAND ...\n"
240
+ "\"%s help\" for a list of available commands\n"
241
+ "\"%s help COMMAND\" for specific details\n",
242
+ argv[0], argv[0], argv[0]);
243
+ fossil_exit(1);
244
+ }
241245
}else{
242246
g.fQuiet = find_option("quiet", 0, 0)!=0;
243247
g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
244248
g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
245249
g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
246250
g.zLogin = find_option("user", "U", 1);
247251
zCmdName = argv[1];
248252
}
249253
rc = name_search(zCmdName, aCommand, count(aCommand), &idx);
254
+ if( rc==1 && mightBeCgi ){
255
+ rc = name_search("cgi", aCommand, count(aCommand), &idx);
256
+ }
250257
if( rc==1 ){
251258
fprintf(stderr,"%s: unknown command: %s\n"
252259
"%s: use \"help\" for more information\n",
253260
argv[0], zCmdName, argv[0]);
254261
fossil_exit(1);
255262
--- src/main.c
+++ src/main.c
@@ -223,32 +223,39 @@
223 */
224 int main(int argc, char **argv){
225 const char *zCmdName = "unknown";
226 int idx;
227 int rc;
 
228
229 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
230 g.now = time(0);
231 g.argc = argc;
232 g.argv = argv;
233 if( getenv("GATEWAY_INTERFACE")!=0 ){
234 zCmdName = "cgi";
235 }else if( argc<2 ){
236 fprintf(stderr, "Usage: %s COMMAND ...\n"
237 "\"%s help\" for a list of available commands\n"
238 "\"%s help COMMAND\" for specific details\n",
239 argv[0], argv[0], argv[0]);
240 fossil_exit(1);
 
 
 
241 }else{
242 g.fQuiet = find_option("quiet", 0, 0)!=0;
243 g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
244 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
245 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
246 g.zLogin = find_option("user", "U", 1);
247 zCmdName = argv[1];
248 }
249 rc = name_search(zCmdName, aCommand, count(aCommand), &idx);
 
 
 
250 if( rc==1 ){
251 fprintf(stderr,"%s: unknown command: %s\n"
252 "%s: use \"help\" for more information\n",
253 argv[0], zCmdName, argv[0]);
254 fossil_exit(1);
255
--- src/main.c
+++ src/main.c
@@ -223,32 +223,39 @@
223 */
224 int main(int argc, char **argv){
225 const char *zCmdName = "unknown";
226 int idx;
227 int rc;
228 int mightBeCgi;
229
230 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
231 g.now = time(0);
232 g.argc = argc;
233 g.argv = argv;
234 mightBeCgi = getenv("GATEWAY_INTERFACE")!=0;
235 if( argc<2 ){
236 if( mightBeCgi ){
237 zCmdName = "cgi";
238 }else{
239 fprintf(stderr, "Usage: %s COMMAND ...\n"
240 "\"%s help\" for a list of available commands\n"
241 "\"%s help COMMAND\" for specific details\n",
242 argv[0], argv[0], argv[0]);
243 fossil_exit(1);
244 }
245 }else{
246 g.fQuiet = find_option("quiet", 0, 0)!=0;
247 g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
248 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
249 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
250 g.zLogin = find_option("user", "U", 1);
251 zCmdName = argv[1];
252 }
253 rc = name_search(zCmdName, aCommand, count(aCommand), &idx);
254 if( rc==1 && mightBeCgi ){
255 rc = name_search("cgi", aCommand, count(aCommand), &idx);
256 }
257 if( rc==1 ){
258 fprintf(stderr,"%s: unknown command: %s\n"
259 "%s: use \"help\" for more information\n",
260 argv[0], zCmdName, argv[0]);
261 fossil_exit(1);
262

Keyboard Shortcuts

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