Earlydbg as new -v option for main prog
This commit is contained in:
+13
-4
@@ -102,6 +102,7 @@ static void usage(void)
|
||||
" -S <connect_str> connect string (for slave mode only)\n"
|
||||
" -p <port> override modem port (must be defined in config)\n"
|
||||
" -u binkp|ifcico|telnet protocol to use over TCP/IP\n"
|
||||
" -v display early debug info on stderr\n"
|
||||
" -h show this help message\n"
|
||||
"\n",
|
||||
conf_getconfname()
|
||||
@@ -257,7 +258,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||
|
||||
// parsing
|
||||
|
||||
while( (ch=getopt(argc, argv, "hfI:p:n:l:a:u:oiC:S:dq")) != (int)-1 )
|
||||
while( (ch=getopt(argc, argv, "hfI:p:n:l:a:u:oivC:S:dq")) != (int)-1 )
|
||||
{
|
||||
switch( ch ) {
|
||||
case 'h':
|
||||
@@ -308,6 +309,9 @@ int main(int argc, char *argv[], char *envp[])
|
||||
//if( opts.runmode != MODE_ANSWER || opts.inetd ) { usage(); exit(BFERR_FATALERROR); }
|
||||
opts.inetd = 1;
|
||||
break;
|
||||
case 'v':
|
||||
opts.earlydbg = TRUE;
|
||||
break;
|
||||
case 'C':
|
||||
if( opts.confname || !optarg ) { usage(); exit(BFERR_FATALERROR); }
|
||||
opts.confname = (char *)xstrcpy(optarg);
|
||||
@@ -435,15 +439,16 @@ int main(int argc, char *argv[], char *envp[])
|
||||
|
||||
/* Process primary config file */
|
||||
if( opts.confname && *opts.confname )
|
||||
rc = conf_readconf(opts.confname, 0);
|
||||
rc = conf_readconf(opts.confname, 0, opts.earlydbg);
|
||||
else
|
||||
rc = conf_readconf(conf_getconfname(), 0);
|
||||
rc = conf_readconf(conf_getconfname(), 0, opts.earlydbg);
|
||||
|
||||
if( rc ) gotoexit(BFERR_FATALERROR);
|
||||
|
||||
/* Process additional config file, ignore errors */
|
||||
if( opts.incname && *opts.incname )
|
||||
(void)conf_readconf(opts.incname, 1);
|
||||
if (conf_readconf(opts.incname, 1, opts.earlydbg))
|
||||
gotoexit(BFERR_FATALERROR);
|
||||
|
||||
/* Reopen log file if it was defined in config */
|
||||
if( log_reopen(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
|
||||
@@ -459,6 +464,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||
switch( opts.runmode )
|
||||
{
|
||||
case MODE_DAEMON:
|
||||
DEB((D_STATEM, "Daemon mode"));
|
||||
log("Daemon mode");
|
||||
rc = bforce_daemon(&opts);
|
||||
break;
|
||||
@@ -466,14 +472,17 @@ case MODE_CALL_DEFAULT:
|
||||
case MODE_CALL_IP:
|
||||
case MODE_CALL_MODEM:
|
||||
case MODE_CALL_STDIO:
|
||||
DEB((D_STATEM, "Outgoing call"));
|
||||
log("Outgoing call");
|
||||
rc = bforce_master(&opts);
|
||||
break;
|
||||
case MODE_ANSWER:
|
||||
DEB((D_STATEM, "Start answer"));
|
||||
log("Start answer");
|
||||
rc = bforce_slave(&opts);
|
||||
break;
|
||||
default:
|
||||
DEB((D_STATEM, "Could not determine run mode"));
|
||||
log("Could not determine run mode");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user