Changes in conf.c [f4a5940:2a6ca4f]
Legend:
- Unmodified
- Added
- Removed
-
conf.c
rf4a5940 r2a6ca4f 64 64 conf->ping_interval = 180; 65 65 conf->ping_timeout = 300; 66 proxytype = 0;67 66 68 67 i = conf_loadini( conf, CONF_FILE ); … … 77 76 } 78 77 79 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 ) 80 /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ 78 while( ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 ) 81 79 { 82 80 if( opt == 'i' ) … … 94 92 } 95 93 else if( opt == 'n' ) 96 conf->nofork =1;94 conf->nofork=1; 97 95 else if( opt == 'v' ) 98 conf->verbose =1;96 conf->verbose=1; 99 97 else if( opt == 'I' ) 100 conf->runmode =RUNMODE_INETD;98 conf->runmode=RUNMODE_INETD; 101 99 else if( opt == 'D' ) 102 conf->runmode =RUNMODE_DAEMON;100 conf->runmode=RUNMODE_DAEMON; 103 101 else if( opt == 'F' ) 104 conf->runmode =RUNMODE_FORKDAEMON;102 conf->runmode=RUNMODE_FORKDAEMON; 105 103 else if( opt == 'c' ) 106 104 { … … 110 108 CONF_FILE = g_strdup( optarg ); 111 109 g_free( conf ); 112 /* Re-evaluate arguments. Don't use this option twice,113 you'll end up in an infinite loop! Hope this trick114 works with all libcs BTW.. */115 optind = 1;116 110 return( conf_load( argc, argv ) ); 117 111 }
Note: See TracChangeset
for help on using the changeset viewer.