aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_conf_file.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-06-30 12:35:16 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-06-30 12:35:16 +0000
commitb4fbdcf5d4bdaad5b762c2852c88123ed54a4bbb (patch)
tree66b1f911ac5d19ca710c753bbd15bf5a0dc505a4 /src/core/ngx_conf_file.c
parentb882154636c92aede2b682e4ae10c324d8d5cf35 (diff)
downloadnginx-b4fbdcf5d4bdaad5b762c2852c88123ed54a4bbb.tar.gz
nginx-b4fbdcf5d4bdaad5b762c2852c88123ed54a4bbb.zip
-g switch
Diffstat (limited to 'src/core/ngx_conf_file.c')
-rw-r--r--src/core/ngx_conf_file.c71
1 files changed, 66 insertions, 5 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index dbeb39d0c..7da9997ca 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -58,14 +58,52 @@ static int argument_number[] = {
char *
+ngx_conf_param(ngx_conf_t *cf)
+{
+ ngx_str_t *param;
+ ngx_buf_t b;
+ ngx_conf_file_t conf_file;
+
+ param = &cf->cycle->conf_param;
+
+ if (param->len == 0) {
+ return NGX_CONF_OK;
+ }
+
+ ngx_memzero(&conf_file, sizeof(ngx_conf_file_t));
+
+ ngx_memzero(&b, sizeof(ngx_buf_t));
+
+ b.start = param->data;
+ b.pos = param->data;
+ b.last = param->data + param->len;
+ b.end = b.last;
+ b.temporary = 1;
+
+ conf_file.file.fd = NGX_INVALID_FILE;
+ conf_file.file.name.data = (u_char *) "command line";
+ conf_file.line = 1;
+
+ cf->conf_file = &conf_file;
+ cf->conf_file->buffer = &b;
+
+ return ngx_conf_parse(cf, NULL);
+}
+
+
+char *
ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
{
char *rv;
ngx_fd_t fd;
ngx_int_t rc;
ngx_buf_t *b;
- ngx_uint_t block;
ngx_conf_file_t *prev;
+ enum {
+ parse_file = 0,
+ parse_block,
+ parse_param
+ } type;
#if (NGX_SUPPRESS_WARN)
fd = NGX_INVALID_FILE;
@@ -120,10 +158,14 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
cf->conf_file->file.log = cf->log;
cf->conf_file->line = 1;
- block = 0;
+ type = parse_file;
+
+ } else if (cf->conf_file->file.fd != NGX_INVALID_FILE) {
+
+ type = parse_block;
} else {
- block = 1;
+ type = parse_param;
}
@@ -146,7 +188,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
if (rc == NGX_CONF_BLOCK_DONE) {
- if (!block) {
+ if (type != parse_block) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "unexpected \"}\"");
goto failed;
}
@@ -156,7 +198,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
if (rc == NGX_CONF_FILE_DONE) {
- if (block) {
+ if (type == parse_block) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected end of file, expecting \"}\"");
goto failed;
@@ -165,6 +207,16 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
goto done;
}
+ if (rc == NGX_CONF_BLOCK_START) {
+
+ if (type == parse_param) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "block directives are not supported "
+ "in -g option");
+ goto failed;
+ }
+ }
+
/* rc == NGX_OK || rc == NGX_CONF_BLOCK_START */
if (cf->handler) {
@@ -402,10 +454,19 @@ ngx_conf_read_token(ngx_conf_t *cf)
for ( ;; ) {
if (b->pos >= b->last) {
+
if (cf->conf_file->file.offset
>= ngx_file_size(&cf->conf_file->file.info))
{
if (cf->args->nelts > 0) {
+
+ if (cf->conf_file->file.fd == NGX_INVALID_FILE) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "unexpected end of parameter, "
+ "expecting \";\"");
+ return NGX_ERROR;
+ }
+
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected end of file, "
"expecting \";\" or \"}\"");