diff options
| author | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-10-22 22:51:24 +0200 |
|---|---|---|
| committer | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-10-22 22:51:24 +0200 |
| commit | 44daf03024fbf7cbffa10349044786f6ab784821 (patch) | |
| tree | fe311eb22e2d853dfc18fde1a9e55d21815f4f82 /src/server/serverConfigFile.c | |
| parent | e12753d2ec9db83ec08bb9db63902a82fb245cdd (diff) | |
Revert "X"
This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd.
Diffstat (limited to 'src/server/serverConfigFile.c')
| -rw-r--r-- | src/server/serverConfigFile.c | 135 |
1 files changed, 69 insertions, 66 deletions
diff --git a/src/server/serverConfigFile.c b/src/server/serverConfigFile.c index 7e843eb..487ec13 100644 --- a/src/server/serverConfigFile.c +++ b/src/server/serverConfigFile.c @@ -11,95 +11,98 @@ static textFile_t *serverTextFile; -static void -prepareConfigFile(textFile_t * ts) +static void prepareConfigFile(textFile_t *ts) { - int i; - int j; - - for (i = 0; i < serverTextFile->text->count; i++) { - char *line; - int len; - - line = (char *) (serverTextFile->text->list[i]); - len = strlen(line); - - for (j = 0; j < len; j++) { - if (line[j] == ' ') // [TAB] - { - line[j] = ' '; - } - } - } + int i; + int j; + + for( i = 0 ; i < serverTextFile->text->count ; i++ ) + { + char *line; + int len; + + line = (char *)(serverTextFile->text->list[i]); + len = strlen(line); + + for( j = 0 ; j < len ; j++ ) + { + if( line[j] == ' ' ) // [TAB] + { + line[j] = ' '; + } + } + } } -void -initServerConfigFile() +void initServerConfigFile() { - char *configFile; + char *configFile; - configFile = getParamElse("--config-file", SERVER_CONFIG); - printf(_("Loading configuration from: \"%s\"\n"), - getParamElse("--config-file", SERVER_CONFIG)); + configFile = getParamElse("--config-file", SERVER_CONFIG); + printf(_("Loading configuration from: \"%s\"\n"), getParamElse("--config-file", SERVER_CONFIG) ); - serverTextFile = loadTextFile(configFile); + serverTextFile = loadTextFile(configFile); - if (serverTextFile == NULL) { - fprintf(stderr, - _ - ("I was unable to load config file. Falling back to defaults!\n")); - return; - } - - prepareConfigFile(serverTextFile); + if( serverTextFile == NULL ) + { + fprintf(stderr, _("I was unable to load config file. Falling back to defaults!\n")); + return; + } + + prepareConfigFile(serverTextFile); } -static char * -findValue(char *s) +static char *findValue(char *s) { - int len; - int i; + int len; + int i; - len = strlen(s); + len = strlen(s); - for (i = 0; i < len - 1; i++) { - if (s[i] == ' ' && s[i + 1] != ' ') { - return s + i + 1; - } - } + for( i = 0 ; i < len-1 ; i++) + { + if( s[i] == ' ' && s[i+1] != ' ' ) + { + return s+i+1; + } + } - return NULL; + return NULL; } -char * -getServerConfigFileValue(char *env, char *s) +char* getServerConfigFileValue(char *env, char *s) { - int i; - int len; + int i; + int len; - if (serverTextFile == NULL) { - return s; - } + if( serverTextFile == NULL ) + { + return s; + } - len = strlen(env); + len = strlen(env); - for (i = 0; i < serverTextFile->text->count; i++) { - char *line; + for( i = 0 ; i < serverTextFile->text->count ; i++ ) + { + char *line; - line = (char *) (serverTextFile->text->list[i]); + line = (char *)(serverTextFile->text->list[i]); - if (strncmp(line, env, len) == 0) { - return findValue(line); - } - } + if( strncmp(line, env, len) == 0 ) + { + return findValue(line); + } + } - return s; + return s; } -void -quitServerConfigFile() +void quitServerConfigFile() { - if (serverTextFile != NULL) { - destroyTextFile(serverTextFile); - } + if( serverTextFile != NULL ) + { + destroyTextFile(serverTextFile); + } } + + |