Mercurial > hg > nginx

comparison src/core/ngx_file.c @ 5330:314c3d7cc3a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children 7d8770196436
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
353 353
354 if (path->name.data[path->name.len - 1] == '/') { 354 if (path->name.data[path->name.len - 1] == '/') {
355 path->name.len--; 355 path->name.len--;
356 } 356 }
357 357
358 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name) 358 if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
359 != NGX_OK)
360 {
361 return NULL; 359 return NULL;
362 } 360 }
363 361
364 path->len = 0; 362 path->len = 0;
365 path->manager = NULL; 363 path->manager = NULL;
409 return NGX_CONF_ERROR; 407 return NGX_CONF_ERROR;
410 } 408 }
411 409
412 (*path)->name = init->name; 410 (*path)->name = init->name;
413 411
414 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name) 412 if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) {
415 != NGX_OK)
416 {
417 return NGX_CONF_ERROR; 413 return NGX_CONF_ERROR;
418 } 414 }
419 415
420 (*path)->level[0] = init->level[0]; 416 (*path)->level[0] = init->level[0];
421 (*path)->level[1] = init->level[1]; 417 (*path)->level[1] = init->level[1];