mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
Miscellaneous bug fixes / activated "make check" for src/or
svn:r31
This commit is contained in:
parent
0a3da3ae37
commit
62ead018a1
@ -8,6 +8,9 @@
|
||||
/*
|
||||
* Changes :
|
||||
* $Log$
|
||||
* Revision 1.4 2002/07/09 19:51:41 montrose
|
||||
* Miscellaneous bug fixes / activated "make check" for src/or
|
||||
*
|
||||
* Revision 1.3 2002/07/03 16:31:22 montrose
|
||||
* Added getoptions() and made minor adjustment to poptReadDefaultOptions()
|
||||
*
|
||||
@ -361,19 +364,17 @@ RETURN VALUE: INT_MIN = problem opening config file, else standard poptGetNextOp
|
||||
**/
|
||||
{
|
||||
FILE *fp;
|
||||
int argc, c;
|
||||
int argc, c, n;
|
||||
char **argv;
|
||||
char line[1024];
|
||||
line[0] = line[1] = '-'; /* prepend expected long name option flag */
|
||||
fp = open_config(fname);
|
||||
fp = fopen(fname,"r");
|
||||
if ( fp == NULL ) return INT_MIN;
|
||||
c = 0;
|
||||
/**
|
||||
this loop skips over all leading whitespace and blank lines then returns all text
|
||||
from that point to the next newline.
|
||||
**/
|
||||
while ( c >= -1 && fscanf(fp,"%*[ \n]%[^\n]",&line[2]) == 1 )
|
||||
while ( c >= -1 )
|
||||
{
|
||||
if ( fscanf(fp,"%*[ \n]%n",&n) == EOF ) break; /* eat leading whitespace */
|
||||
if ( fscanf(fp, "%[^\n]",&line[2]) == EOF ) break; /* read a line */
|
||||
switch ( line[2] )
|
||||
{
|
||||
case '#': /* comments begin with this */
|
||||
@ -386,7 +387,7 @@ RETURN VALUE: INT_MIN = problem opening config file, else standard poptGetNextOp
|
||||
c = poptGetNextOpt(optCon); /* interpret option read from config file */
|
||||
}
|
||||
}
|
||||
close_config(fp);
|
||||
fclose(fp);
|
||||
return c;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,8 @@
|
||||
|
||||
TESTS = test_config
|
||||
|
||||
noinst_PROGRAMS = test_config
|
||||
|
||||
bin_PROGRAMS = or
|
||||
|
||||
or_LDADD = -L../common -lor
|
||||
@ -7,6 +11,10 @@ or_SOURCES = args.c buffers.c cell.c circuit.c command.c connection.c \
|
||||
connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
|
||||
main.c onion.c routers.c
|
||||
|
||||
test_config_SOURCES = test_config.c
|
||||
|
||||
test_config_LDADD = config.o -L../common -lor
|
||||
|
||||
noinst_HEADERS = or.h
|
||||
|
||||
|
||||
|
@ -8,6 +8,9 @@
|
||||
/*
|
||||
* Changes :
|
||||
* $Log$
|
||||
* Revision 1.5 2002/07/09 19:51:41 montrose
|
||||
* Miscellaneous bug fixes / activated "make check" for src/or
|
||||
*
|
||||
* Revision 1.4 2002/07/03 19:58:18 montrose
|
||||
* minor bug fix in error checking
|
||||
*
|
||||
@ -117,10 +120,10 @@ RETURN VALUE: 0 on success, non-zero on error
|
||||
case -1:
|
||||
if ( Verbose ) /* display options upon user request */
|
||||
{
|
||||
printf("\nLogLevel=%s\n",options->LogLevel);
|
||||
printf("LogLevel=%s\n",options->LogLevel);
|
||||
printf("RouterFile=%s, PrivateKeyFile=%s\n",options->RouterFile,options->PrivateKeyFile);
|
||||
printf("ORPort=%d, OPPort=%d, APPort=%d\n",options->ORPort,options->OPPort,options->APPort);
|
||||
printf("CoinWeight=%6.4f, MaxConn=%d, TrafficShaping=%d\n\n",options->CoinWeight,options->MaxConn,options->TrafficShaping);
|
||||
printf("CoinWeight=%6.4f, MaxConn=%d, TrafficShaping=%d\n",options->CoinWeight,options->MaxConn,options->TrafficShaping);
|
||||
}
|
||||
code = 0;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user