comparison src/http/modules/ngx_http_autoindex_module.c @ 2125:8e4b9d2acde8

rename ngx_utf_...() to ngx_utf8_...()
author Igor Sysoev <igor@sysoev.ru>
date Tue, 29 Jul 2008 14:41:34 +0000
parents 2f2052fdd882
children b438ffe54e34
comparison
equal deleted inserted replaced
2124:e0b424b98f24 2125:8e4b9d2acde8
327 327
328 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len, 328 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len,
329 NGX_ESCAPE_HTML); 329 NGX_ESCAPE_HTML);
330 330
331 if (r->utf8) { 331 if (r->utf8) {
332 entry->utf_len = ngx_utf_length(entry->name.data, entry->name.len); 332 entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
333 } else { 333 } else {
334 entry->utf_len = len; 334 entry->utf_len = len;
335 } 335 }
336 336
337 entry->dir = ngx_de_is_dir(&dir); 337 entry->dir = ngx_de_is_dir(&dir);
418 418
419 } else { 419 } else {
420 utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1; 420 utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
421 } 421 }
422 422
423 b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, 423 b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
424 utf_len, entry[i].name.len + 1); 424 utf_len, entry[i].name.len + 1);
425 last = b->last; 425 last = b->last;
426 426
427 } else { 427 } else {
428 b->last = ngx_cpystrn(b->last, entry[i].name.data, 428 b->last = ngx_cpystrn(b->last, entry[i].name.data,
429 NGX_HTTP_AUTOINDEX_NAME_LEN + 1); 429 NGX_HTTP_AUTOINDEX_NAME_LEN + 1);