Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:eressea/server

This commit is contained in:
Enno Rehling 2012-05-23 22:52:21 +02:00
parent fa2d31cb9e f2643e79b6
commit 0151b2d27b
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.c
View File

@ -91,22 +91,22 @@ static int parse_args(int argc, char **argv, int *exitcode)
} else { } else {
return usage(argv[0], argv[i]); return usage(argv[0], argv[i]);
} }
} else } else {
switch (argv[i][1]) { switch (argv[i][1]) {
case 'C': case 'C':
entry_point = NULL; entry_point = NULL;
break; break;
case 'e': case 'e':
entry_point = argv[++i]; entry_point = argv[i][2] ? argv[i]+2 : argv[++i];
break; break;
case 't': case 't':
turn = atoi(argv[++i]); turn = atoi(argv[i][2] ? argv[i]+2 : argv[++i]);
break; break;
case 'q': case 'q':
verbosity = 0; verbosity = 0;
break; break;
case 'v': case 'v':
verbosity = atoi(argv[++i]); verbosity = atoi(argv[i][2] ? argv[i]+2 : argv[++i]);
break; break;
case 'h': case 'h':
usage(argv[0], NULL); usage(argv[0], NULL);
@ -116,8 +116,26 @@ static int parse_args(int argc, char **argv, int *exitcode)
usage(argv[0], argv[i]); usage(argv[0], argv[i]);
return 1; return 1;
} }
}
} }
switch (verbosity) {
case 0:
log_stderr = 0;
break;
case 1:
log_stderr = LOG_CPERROR;
break;
case 2:
log_stderr = LOG_CPERROR|LOG_CPWARNING;
break;
case 3:
log_stderr = LOG_CPERROR|LOG_CPWARNING|LOG_CPDEBUG;
break;
default:
log_stderr = LOG_CPERROR|LOG_CPWARNING|LOG_CPDEBUG|LOG_CPINFO;
break;
}
if (run_tests) { if (run_tests) {
*exitcode = RunAllTests(); *exitcode = RunAllTests();
return 1; return 1;