Mercurial > hg > nginx
changeset 2772:9b107cdf53f6
*) do not show line number for -g option
*) reset configuration file after -g option has been parsed
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 28 Apr 2009 20:06:03 +0000 |
parents | 4d62ef39f08b |
children | 7a44b1932741 |
files | src/core/ngx_conf_file.c |
diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Tue Apr 28 20:03:59 2009 +0000 +++ b/src/core/ngx_conf_file.c Tue Apr 28 20:06:03 2009 +0000 @@ -61,6 +61,7 @@ char * ngx_conf_param(ngx_conf_t *cf) { + char *rv; ngx_str_t *param; ngx_buf_t b; ngx_conf_file_t conf_file; @@ -82,13 +83,17 @@ b.temporary = 1; conf_file.file.fd = NGX_INVALID_FILE; - conf_file.file.name.data = (u_char *) "command line"; - conf_file.line = 1; + conf_file.file.name.data = NULL; + conf_file.line = 0; cf->conf_file = &conf_file; cf->conf_file->buffer = &b; - return ngx_conf_parse(cf, NULL); + rv = ngx_conf_parse(cf, NULL); + + cf->conf_file = NULL; + + return rv; } @@ -973,6 +978,12 @@ return; } + if (cf->conf_file->file.fd == NGX_INVALID_FILE) { + ngx_log_error(level, cf->log, 0, "%*s in command line", + p - errstr, errstr); + return; + } + ngx_log_error(level, cf->log, 0, "%*s in %s:%ui", p - errstr, errstr, cf->conf_file->file.name.data, cf->conf_file->line);