diff options
Diffstat (limited to 'src/LYMain.c')
| -rw-r--r-- | src/LYMain.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/src/LYMain.c b/src/LYMain.c index b0cf33d9..b823eef3 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMain.c,v 1.185 2008/09/10 11:58:28 tom Exp $ + * $LynxId: LYMain.c,v 1.186 2008/09/10 23:05:36 tom Exp $ */ #include <HTUtils.h> #include <HTTP.h> @@ -1090,11 +1090,33 @@ int main(int argc, } /* + * Set up trace, the anonymous account defaults, validate restrictions, + * and/or the nosocks flag, if requested, and an alternate configuration + * file, if specified, NOW. Also, if we only want the help menu, output + * that and exit. - FM + */ +#ifndef NO_LYNX_TRACE + if (LYGetEnv("LYNX_TRACE") != 0) { + WWW_TraceFlag = TRUE; + } +#endif + + /* + * Set up the TRACE log path, and logging if appropriate. - FM + */ + if ((cp = LYGetEnv("LYNX_TRACE_FILE")) == 0) + cp = FNAME_LYNX_TRACE; + LYTraceLogPath = typeMallocn(char, LY_MAXPATH); + + LYAddPathToHome(LYTraceLogPath, LY_MAXPATH, cp); + + /* * Act on -help NOW, so we only output the help and exit. - FM */ for (i = 1; i < argc; i++) { parse_arg(&argv[i], 1, &i); } + LYOpenTraceLog(); #ifdef LY_FIND_LEAKS /* @@ -1289,17 +1311,6 @@ int main(int argc, no_newspost = (BOOL) (LYNewsPosting == FALSE); #endif - /* - * Set up trace, the anonymous account defaults, validate restrictions, - * and/or the nosocks flag, if requested, and an alternate configuration - * file, if specified, NOW. Also, if we only want the help menu, output - * that and exit. - FM - */ -#ifndef NO_LYNX_TRACE - if (LYGetEnv("LYNX_TRACE") != 0) { - WWW_TraceFlag = TRUE; - } -#endif for (i = 1; i < argc; i++) { parse_arg(&argv[i], 2, &i); } @@ -1390,18 +1401,6 @@ int main(int argc, LYRestricted = TRUE; LYUseTraceLog = FALSE; } - - /* - * Set up the TRACE log path, and logging if appropriate. - FM - */ - if ((cp = LYGetEnv("LYNX_TRACE_FILE")) == 0) - cp = FNAME_LYNX_TRACE; - LYTraceLogPath = typeMallocn(char, LY_MAXPATH); - - LYAddPathToHome(LYTraceLogPath, LY_MAXPATH, cp); - - LYOpenTraceLog(); - #ifdef EXP_CMD_LOGGING /* * Open command-script, if specified @@ -3921,11 +3920,11 @@ bug which treated '>' as a co-terminator for\ndouble-quotes and tags" #endif #ifndef NO_LYNX_TRACE PARSE_SET( - "trace", 2|SET_ARG, WWW_TraceFlag, + "trace", 1|SET_ARG, WWW_TraceFlag, "turns on Lynx trace mode" ), PARSE_INT( - "trace_mask", 2|INT_ARG, WWW_TraceMask, + "trace_mask", 1|INT_ARG, WWW_TraceMask, "customize Lynx trace mode" ), #endif |