nginx: src/os/win32/ngx_files.c annotate

annotate src/os/win32/ngx_files.c @ 8136:37a184966ab3

Win32: reworked ngx_win32_rename_file() to use nginx wrappers. This ensures that ngx_win32_rename_file() will support non-ASCII names when supported by the wrappers. Notably, this is used by PUT requests in the dav module when overwriting existing files with non-ASCII names (ticket #1433).

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 23 Feb 2023 20:49:52 +0300
parents	8880fe0b193c
children	4b06186670ed

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4017 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	6
42 cd035a94e0b6 nginx-0.0.1-2002-12-27-10:27:47 import Igor Sysoev <igor@sysoev.ru> parents: 35 diff changeset	7
cd035a94e0b6 nginx-0.0.1-2002-12-27-10:27:47 import Igor Sysoev <igor@sysoev.ru> parents: 35 diff changeset	8 #include <ngx_config.h>
100 7ebc8b7fb816 nginx-0.0.1-2003-06-03-19:42:58 import Igor Sysoev <igor@sysoev.ru> parents: 42 diff changeset	9 #include <ngx_core.h>
8 708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	12 #define NGX_UTF16_BUFLEN 256
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	13 #define NGX_UTF8_BUFLEN 512
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	14
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	15 static ngx_int_t ngx_win32_check_filename(u_short *u, size_t len,
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	16 ngx_uint_t dirname);
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	17 static u_short ngx_utf8_to_utf16(u_short utf16, u_char utf8, size_t len,
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	18 size_t reserved);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	19 static u_char ngx_utf16_to_utf8(u_char utf8, u_short utf16, size_t len,
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	20 size_t *allocated);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	21 uint32_t ngx_utf16_decode(u_short **u, size_t n);
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	22
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	23
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	24 /* FILE_FLAG_BACKUP_SEMANTICS allows to obtain a handle to a directory */
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	25
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	26 ngx_fd_t
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	27 ngx_open_file(u_char *name, u_long mode, u_long create, u_long access)
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	28 {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	29 size_t len;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	30 u_short *u;
3137 179f6dfcb7fe preserve errno while ngx_free() Igor Sysoev <igor@sysoev.ru> parents: 2974 diff changeset	31 ngx_fd_t fd;
179f6dfcb7fe preserve errno while ngx_free() Igor Sysoev <igor@sysoev.ru> parents: 2974 diff changeset	32 ngx_err_t err;
179f6dfcb7fe preserve errno while ngx_free() Igor Sysoev <igor@sysoev.ru> parents: 2974 diff changeset	33 u_short utf16[NGX_UTF16_BUFLEN];
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	34
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	35 len = NGX_UTF16_BUFLEN;
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	36 u = ngx_utf8_to_utf16(utf16, name, &len, 0);
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	37
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	38 if (u == NULL) {
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	39 return INVALID_HANDLE_VALUE;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	40 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	41
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	42 fd = INVALID_HANDLE_VALUE;
15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	43
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	44 if (create == NGX_FILE_OPEN
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	45 && ngx_win32_check_filename(u, len, 0) != NGX_OK)
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	46 {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	47 goto failed;
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	48 }
15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	49
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	50 fd = CreateFileW(u, mode,
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	51 FILE_SHARE_READ\|FILE_SHARE_WRITE\|FILE_SHARE_DELETE,
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	52 NULL, create, FILE_FLAG_BACKUP_SEMANTICS, NULL);
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	53
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	54 failed:
15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	55
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	56 if (u != utf16) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	57 err = ngx_errno;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	58 ngx_free(u);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	59 ngx_set_errno(err);
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	60 }
15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	61
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	62 return fd;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	63 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	64
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	65
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	66 ssize_t
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	67 ngx_read_file(ngx_file_t file, u_char buf, size_t size, off_t offset)
8 708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	68 {
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 280 diff changeset	69 u_long n;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	70 ngx_err_t err;
182 3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	71 OVERLAPPED ovlp, *povlp;
8 708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	72
3156 55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	73 ovlp.Internal = 0;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	74 ovlp.InternalHigh = 0;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	75 ovlp.Offset = (u_long) offset;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	76 ovlp.OffsetHigh = (u_long) (offset >> 32);
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	77 ovlp.hEvent = NULL;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 457 diff changeset	78
3156 55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	79 povlp = &ovlp;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	80
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	81 if (ReadFile(file->fd, buf, size, &n, povlp) == 0) {
2974 63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	82 err = ngx_errno;
63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	83
63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	84 if (err == ERROR_HANDLE_EOF) {
63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	85 return 0;
63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	86 }
63f71723cd2a handle Win32 ReadFile() EOF state in Unix way Igor Sysoev <igor@sysoev.ru> parents: 2901 diff changeset	87
3157 a2c1b4f74ea7 log file name for read/write errors Igor Sysoev <igor@sysoev.ru> parents: 3156 diff changeset	88 ngx_log_error(NGX_LOG_ERR, file->log, err,
a2c1b4f74ea7 log file name for read/write errors Igor Sysoev <igor@sysoev.ru> parents: 3156 diff changeset	89 "ReadFile() \"%s\" failed", file->name.data);
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	90 return NGX_ERROR;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	91 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	92
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	93 file->offset += n;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	94
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	95 return n;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	96 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	97
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	98
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	99 ssize_t
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	100 ngx_write_file(ngx_file_t file, u_char buf, size_t size, off_t offset)
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	101 {
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 280 diff changeset	102 u_long n;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	103 OVERLAPPED ovlp, *povlp;
183 4c698194c56d nginx-0.0.1-2003-11-13-19:16:33 import Igor Sysoev <igor@sysoev.ru> parents: 182 diff changeset	104
3156 55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	105 ovlp.Internal = 0;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	106 ovlp.InternalHigh = 0;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	107 ovlp.Offset = (u_long) offset;
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	108 ovlp.OffsetHigh = (u_long) (offset >> 32);
55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	109 ovlp.hEvent = NULL;
183 4c698194c56d nginx-0.0.1-2003-11-13-19:16:33 import Igor Sysoev <igor@sysoev.ru> parents: 182 diff changeset	110
3156 55f006d944ba delete Win95 code Igor Sysoev <igor@sysoev.ru> parents: 3138 diff changeset	111 povlp = &ovlp;
183 4c698194c56d nginx-0.0.1-2003-11-13-19:16:33 import Igor Sysoev <igor@sysoev.ru> parents: 182 diff changeset	112
4c698194c56d nginx-0.0.1-2003-11-13-19:16:33 import Igor Sysoev <igor@sysoev.ru> parents: 182 diff changeset	113 if (WriteFile(file->fd, buf, size, &n, povlp) == 0) {
3157 a2c1b4f74ea7 log file name for read/write errors Igor Sysoev <igor@sysoev.ru> parents: 3156 diff changeset	114 ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno,
a2c1b4f74ea7 log file name for read/write errors Igor Sysoev <igor@sysoev.ru> parents: 3156 diff changeset	115 "WriteFile() \"%s\" failed", file->name.data);
182 3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	116 return NGX_ERROR;
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	117 }
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	118
3158 17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	119 if (n != size) {
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	120 ngx_log_error(NGX_LOG_CRIT, file->log, 0,
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	121 "WriteFile() \"%s\" has written only %ul of %uz",
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	122 file->name.data, n, size);
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	123 return NGX_ERROR;
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	124 }
17afb68c2a9a test incomplete WriteFile() Igor Sysoev <igor@sysoev.ru> parents: 3157 diff changeset	125
182 3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	126 file->offset += n;
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	127
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	128 return n;
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	129 }
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	130
3c49eaf3f522 nginx-0.0.1-2003-11-13-09:14:05 import Igor Sysoev <igor@sysoev.ru> parents: 123 diff changeset	131
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	132 ssize_t
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	133 ngx_write_chain_to_file(ngx_file_t file, ngx_chain_t cl, off_t offset,
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	134 ngx_pool_t *pool)
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	135 {
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	136 u_char buf, prev;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	137 size_t size;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	138 ssize_t total, n;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	139
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	140 total = 0;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	141
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	142 while (cl) {
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	143 buf = cl->buf->pos;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	144 prev = buf;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	145 size = 0;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	146
344 e366ba5db8f8 nginx-0.0.3-2004-06-01-10:04:46 import Igor Sysoev <igor@sysoev.ru> parents: 343 diff changeset	147 /* coalesce the neighbouring bufs */
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	148
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	149 while (cl && prev == cl->buf->pos) {
6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	150 size += cl->buf->last - cl->buf->pos;
6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	151 prev = cl->buf->last;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	152 cl = cl->next;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	153 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	154
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	155 n = ngx_write_file(file, buf, size, offset);
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	156
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	157 if (n == NGX_ERROR) {
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	158 return NGX_ERROR;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	159 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	160
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	161 total += n;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	162 offset += n;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	163 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	164
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	165 return total;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	166 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	167
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	168
1634 d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	169 ssize_t
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	170 ngx_read_fd(ngx_fd_t fd, void *buf, size_t size)
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	171 {
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	172 u_long n;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	173
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	174 if (ReadFile(fd, buf, size, &n, NULL) != 0) {
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	175 return (size_t) n;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	176 }
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	177
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	178 return -1;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	179 }
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	180
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	181
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	182 ssize_t
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	183 ngx_write_fd(ngx_fd_t fd, void *buf, size_t size)
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	184 {
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	185 u_long n;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	186
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	187 if (WriteFile(fd, buf, size, &n, NULL) != 0) {
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	188 return (size_t) n;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	189 }
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	190
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	191 return -1;
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	192 }
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	193
d3cbb96818f1 fix win32 ngx_read_fd() and ngx_write_fd() Igor Sysoev <igor@sysoev.ru> parents: 1632 diff changeset	194
2769 9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	195 ssize_t
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	196 ngx_write_console(ngx_fd_t fd, void *buf, size_t size)
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	197 {
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	198 u_long n;
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	199
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	200 (void) CharToOemBuff(buf, buf, size);
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	201
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	202 if (WriteFile(fd, buf, size, &n, NULL) != 0) {
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	203 return (size_t) n;
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	204 }
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	205
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	206 return -1;
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	207 }
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	208
9d986c4e796f introduce ngx_write_console() to support OEM code pages Igor Sysoev <igor@sysoev.ru> parents: 2687 diff changeset	209
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	210 ngx_err_t
1693 f4eb04fd8579 use malloc() in ngx_win32_rename_file, set crit level instead of error Igor Sysoev <igor@sysoev.ru> parents: 1634 diff changeset	211 ngx_win32_rename_file(ngx_str_t from, ngx_str_t to, ngx_log_t *log)
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	212 {
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	213 u_char *name;
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	214 ngx_err_t err;
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	215 ngx_uint_t collision;
64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	216 ngx_atomic_uint_t num;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	217
4017 4f4086cf1a07 Fix buffer overrun under Windows. Maxim Dounin <mdounin@mdounin.ru> parents: 3651 diff changeset	218 name = ngx_alloc(to->len + 1 + NGX_ATOMIC_T_LEN + 1 + sizeof("DELETE"),
4f4086cf1a07 Fix buffer overrun under Windows. Maxim Dounin <mdounin@mdounin.ru> parents: 3651 diff changeset	219 log);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	220 if (name == NULL) {
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	221 return NGX_ENOMEM;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	222 }
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	223
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	224 ngx_memcpy(name, to->data, to->len);
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	225
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	226 collision = 0;
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	227
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	228 /* mutex_lock() (per cache or single ?) */
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	229
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	230 for ( ;; ) {
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	231 num = ngx_next_temp_number(collision);
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	232
2900 812445a822e3 add trailing zero to a file name Igor Sysoev <igor@sysoev.ru> parents: 2782 diff changeset	233 ngx_sprintf(name + to->len, ".%0muA.DELETE%Z", num);
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	234
8136 37a184966ab3 Win32: reworked ngx_win32_rename_file() to use nginx wrappers. Maxim Dounin <mdounin@mdounin.ru> parents: 8135 diff changeset	235 if (ngx_rename_file(to->data, name) != NGX_FILE_ERROR) {
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	236 break;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	237 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	238
8135 8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	239 err = ngx_errno;
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	240
8135 8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	241 if (err == NGX_EEXIST \|\| err == NGX_EEXIST_FILE) {
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	242 collision = 1;
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	243 continue;
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	244 }
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	245
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	246 ngx_log_error(NGX_LOG_CRIT, log, err,
2901 17da2da3a8f5 fix logging in ngx_win32_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 2900 diff changeset	247 "MoveFile() \"%s\" to \"%s\" failed", to->data, name);
8135 8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	248 goto failed;
499 64d9afb209da nginx-0.1.24-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	249 }
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	250
8136 37a184966ab3 Win32: reworked ngx_win32_rename_file() to use nginx wrappers. Maxim Dounin <mdounin@mdounin.ru> parents: 8135 diff changeset	251 if (ngx_rename_file(from->data, to->data) == NGX_FILE_ERROR) {
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	252 err = ngx_errno;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	253
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	254 } else {
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	255 err = 0;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	256 }
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	257
8136 37a184966ab3 Win32: reworked ngx_win32_rename_file() to use nginx wrappers. Maxim Dounin <mdounin@mdounin.ru> parents: 8135 diff changeset	258 if (ngx_delete_file(name) == NGX_FILE_ERROR) {
2901 17da2da3a8f5 fix logging in ngx_win32_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 2900 diff changeset	259 ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
17da2da3a8f5 fix logging in ngx_win32_rename_file() Igor Sysoev <igor@sysoev.ru> parents: 2900 diff changeset	260 "DeleteFile() \"%s\" failed", name);
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	261 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	262
8135 8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	263 failed:
8880fe0b193c Win32: reworked ngx_win32_rename_file() to check errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8134 diff changeset	264
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	265 /* mutex_unlock() */
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	266
1693 f4eb04fd8579 use malloc() in ngx_win32_rename_file, set crit level instead of error Igor Sysoev <igor@sysoev.ru> parents: 1634 diff changeset	267 ngx_free(name);
f4eb04fd8579 use malloc() in ngx_win32_rename_file, set crit level instead of error Igor Sysoev <igor@sysoev.ru> parents: 1634 diff changeset	268
3382 6be1f25bae90 fix Win32 error messages when an temporary file replaces an existent file: Igor Sysoev <igor@sysoev.ru> parents: 3200 diff changeset	269 return err;
184 1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	270 }
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	271
1bf718ce0dde nginx-0.0.1-2003-11-14-10:20:34 import Igor Sysoev <igor@sysoev.ru> parents: 183 diff changeset	272
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	273 ngx_int_t
2462 90d5ddfedbb1 use GetFileAttributesEx() instead of GetFileAttributes() Igor Sysoev <igor@sysoev.ru> parents: 2459 diff changeset	274 ngx_file_info(u_char file, ngx_file_info_t sb)
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	275 {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	276 size_t len;
3138 a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	277 long rc;
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	278 u_short *u;
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	279 ngx_err_t err;
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	280 WIN32_FILE_ATTRIBUTE_DATA fa;
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	281 u_short utf16[NGX_UTF16_BUFLEN];
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	282
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	283 len = NGX_UTF16_BUFLEN;
15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	284
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	285 u = ngx_utf8_to_utf16(utf16, file, &len, 0);
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	286
3138 a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	287 if (u == NULL) {
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	288 return NGX_FILE_ERROR;
a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	289 }
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	290
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	291 rc = NGX_FILE_ERROR;
3138 a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	292
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	293 if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	294 goto failed;
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	295 }
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	296
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	297 rc = GetFileAttributesExW(u, GetFileExInfoStandard, &fa);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	298
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	299 sb->dwFileAttributes = fa.dwFileAttributes;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	300 sb->ftCreationTime = fa.ftCreationTime;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	301 sb->ftLastAccessTime = fa.ftLastAccessTime;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	302 sb->ftLastWriteTime = fa.ftLastWriteTime;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	303 sb->nFileSizeHigh = fa.nFileSizeHigh;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	304 sb->nFileSizeLow = fa.nFileSizeLow;
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	305
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	306 failed:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	307
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	308 if (u != utf16) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	309 err = ngx_errno;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	310 ngx_free(u);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	311 ngx_set_errno(err);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	312 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	313
3138 a2479937dbd8 win32 ngx_file_info() utf8 support Igor Sysoev <igor@sysoev.ru> parents: 3137 diff changeset	314 return rc;
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	315 }
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	316
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	317
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	318 ngx_int_t
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	319 ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	320 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	321 uint64_t intervals;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	322 FILETIME ft;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	323
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	324 /* 116444736000000000 is commented in src/os/win32/ngx_time.c */
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	325
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	326 intervals = s * 10000000 + 116444736000000000;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	327
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	328 ft.dwLowDateTime = (DWORD) intervals;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	329 ft.dwHighDateTime = (DWORD) (intervals >> 32);
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	330
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	331 if (SetFileTime(fd, NULL, NULL, &ft) != 0) {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	332 return NGX_OK;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	333 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	334
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	335 return NGX_ERROR;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	336 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	337
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	338
3651 515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	339 ngx_int_t
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	340 ngx_create_file_mapping(ngx_file_mapping_t *fm)
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	341 {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	342 LARGE_INTEGER size;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	343
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	344 fm->fd = ngx_open_file(fm->name, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	345 NGX_FILE_DEFAULT_ACCESS);
7086 577628e6b6a6 Style. Sergey Kandaurov <pluknet@nginx.com> parents: 5785 diff changeset	346
3651 515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	347 if (fm->fd == NGX_INVALID_FILE) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	348 ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	349 ngx_open_file_n " \"%s\" failed", fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	350 return NGX_ERROR;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	351 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	352
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	353 fm->handle = NULL;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	354
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	355 size.QuadPart = fm->size;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	356
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	357 if (SetFilePointerEx(fm->fd, size, NULL, FILE_BEGIN) == 0) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	358 ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	359 "SetFilePointerEx(\"%s\", %uz) failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	360 fm->name, fm->size);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	361 goto failed;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	362 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	363
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	364 if (SetEndOfFile(fm->fd) == 0) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	365 ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	366 "SetEndOfFile() \"%s\" failed", fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	367 goto failed;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	368 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	369
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	370 fm->handle = CreateFileMapping(fm->fd, NULL, PAGE_READWRITE,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	371 (u_long) ((off_t) fm->size >> 32),
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	372 (u_long) ((off_t) fm->size & 0xffffffff),
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	373 NULL);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	374 if (fm->handle == NULL) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	375 ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	376 "CreateFileMapping(%s, %uz) failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	377 fm->name, fm->size);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	378 goto failed;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	379 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	380
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	381 fm->addr = MapViewOfFile(fm->handle, FILE_MAP_WRITE, 0, 0, 0);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	382
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	383 if (fm->addr != NULL) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	384 return NGX_OK;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	385 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	386
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	387 ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	388 "MapViewOfFile(%uz) of file mapping \"%s\" failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	389 fm->size, fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	390
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	391 failed:
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	392
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	393 if (fm->handle) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	394 if (CloseHandle(fm->handle) == 0) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	395 ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	396 "CloseHandle() of file mapping \"%s\" failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	397 fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	398 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	399 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	400
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	401 if (ngx_close_file(fm->fd) == NGX_FILE_ERROR) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	402 ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	403 ngx_close_file_n " \"%s\" failed", fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	404 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	405
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	406 return NGX_ERROR;
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	407 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	408
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	409
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	410 void
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	411 ngx_close_file_mapping(ngx_file_mapping_t *fm)
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	412 {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	413 if (UnmapViewOfFile(fm->addr) == 0) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	414 ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	415 "UnmapViewOfFile(%p) of file mapping \"%s\" failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	416 fm->addr, &fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	417 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	418
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	419 if (CloseHandle(fm->handle) == 0) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	420 ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	421 "CloseHandle() of file mapping \"%s\" failed",
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	422 &fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	423 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	424
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	425 if (ngx_close_file(fm->fd) == NGX_FILE_ERROR) {
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	426 ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	427 ngx_close_file_n " \"%s\" failed", fm->name);
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	428 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	429 }
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	430
515d50917016 ngx_create_file_mapping() Igor Sysoev <igor@sysoev.ru> parents: 3614 diff changeset	431
4564 13eb3193cd63 Fixed win32 build after realpath changes in r4559. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	432 u_char *
2259 0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	433 ngx_realpath(u_char path, u_char resolved)
0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	434 {
0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	435 /* STUB */
4564 13eb3193cd63 Fixed win32 build after realpath changes in r4559. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	436 return path;
2259 0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	437 }
0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	438
0864138899f1 $realpath_root Igor Sysoev <igor@sysoev.ru> parents: 2248 diff changeset	439
8132 8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	440 size_t
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	441 ngx_getcwd(u_char *buf, size_t size)
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	442 {
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	443 u_char *p;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	444 size_t n;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	445 u_short utf16[NGX_MAX_PATH];
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	446
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	447 n = GetCurrentDirectoryW(NGX_MAX_PATH, utf16);
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	448
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	449 if (n == 0) {
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	450 return 0;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	451 }
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	452
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	453 if (n > NGX_MAX_PATH) {
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	454 ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	455 return 0;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	456 }
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	457
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	458 p = ngx_utf16_to_utf8(buf, utf16, &size, NULL);
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	459
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	460 if (p == NULL) {
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	461 return 0;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	462 }
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	463
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	464 if (p != buf) {
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	465 ngx_free(p);
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	466 ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	467 return 0;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	468 }
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	469
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	470 return size - 1;
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	471 }
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	472
8ea2e052feb4 Win32: non-ASCII directory names support in ngx_getcwd(). Maxim Dounin <mdounin@mdounin.ru> parents: 8131 diff changeset	473
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	474 ngx_int_t
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	475 ngx_open_dir(ngx_str_t name, ngx_dir_t dir)
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	476 {
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	477 size_t len;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	478 u_short u, p;
7433 061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	479 ngx_err_t err;
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	480 u_short utf16[NGX_UTF16_BUFLEN];
7433 061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	481
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	482 len = NGX_UTF16_BUFLEN - 2;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	483 u = ngx_utf8_to_utf16(utf16, name->data, &len, 2);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	484
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	485 if (u == NULL) {
7433 061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	486 return NGX_ERROR;
061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	487 }
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	488
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	489 if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	490 goto failed;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	491 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	492
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	493 p = &u[len - 1];
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	494
7433 061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	495 *p++ = '/';
061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	496 p++ = '';
061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	497 *p = '\0';
061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	498
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	499 dir->dir = FindFirstFileW(u, &dir->finddata);
5749 a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	500
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	501 if (dir->dir == INVALID_HANDLE_VALUE) {
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	502 goto failed;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	503 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	504
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	505 if (u != utf16) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	506 ngx_free(u);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	507 }
7433 061ec464813f Win32: removed NGX_DIR_MASK concept. Maxim Dounin <mdounin@mdounin.ru> parents: 7086 diff changeset	508
457 ded1284520cc nginx-0.1.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	509 dir->valid_info = 1;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	510 dir->ready = 1;
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	511 dir->name = NULL;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	512 dir->allocated = 0;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	513
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	514 return NGX_OK;
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	515
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	516 failed:
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	517
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	518 if (u != utf16) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	519 err = ngx_errno;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	520 ngx_free(u);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	521 ngx_set_errno(err);
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	522 }
c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	523
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	524 return NGX_ERROR;
186 c1f3a3c7c5db nginx-0.0.1-2003-11-17-00:49:42 import Igor Sysoev <igor@sysoev.ru> parents: 185 diff changeset	525 }
185 d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	526
d5f50cefc322 nginx-0.0.1-2003-11-14-19:52:04 import Igor Sysoev <igor@sysoev.ru> parents: 184 diff changeset	527
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	528 ngx_int_t
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	529 ngx_read_dir(ngx_dir_t *dir)
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	530 {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	531 u_char *name;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	532 size_t len, allocated;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	533
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	534 if (dir->ready) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	535 dir->ready = 0;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	536 goto convert;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	537 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	538
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	539 if (FindNextFileW(dir->dir, &dir->finddata) != 0) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	540 dir->type = 1;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	541 goto convert;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	542 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	543
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	544 return NGX_ERROR;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	545
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	546 convert:
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	547
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	548 name = dir->name;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	549 len = dir->allocated;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	550
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	551 name = ngx_utf16_to_utf8(name, dir->finddata.cFileName, &len, &allocated);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	552
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	553 if (name == NULL) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	554 return NGX_ERROR;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	555 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	556
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	557 if (name != dir->name) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	558
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	559 if (dir->name) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	560 ngx_free(dir->name);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	561 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	562
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	563 dir->name = name;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	564 dir->allocated = allocated;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	565 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	566
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	567 dir->namelen = len - 1;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	568
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	569 return NGX_OK;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	570 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	571
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	572
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	573 ngx_int_t
5749 a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	574 ngx_close_dir(ngx_dir_t *dir)
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	575 {
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	576 if (dir->name) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	577 ngx_free(dir->name);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	578 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	579
5749 a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	580 if (FindClose(dir->dir) == 0) {
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	581 return NGX_ERROR;
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	582 }
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	583
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	584 return NGX_OK;
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	585 }
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	586
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	587
a680bf4dddd5 Win32: ngx_open_dir() and ngx_close_dir() fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5501 diff changeset	588 ngx_int_t
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	589 ngx_create_dir(u_char *name, ngx_uint_t access)
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	590 {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	591 long rc;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	592 size_t len;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	593 u_short *u;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	594 ngx_err_t err;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	595 u_short utf16[NGX_UTF16_BUFLEN];
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	596
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	597 len = NGX_UTF16_BUFLEN;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	598 u = ngx_utf8_to_utf16(utf16, name, &len, 0);
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	599
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	600 if (u == NULL) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	601 return NGX_FILE_ERROR;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	602 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	603
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	604 rc = NGX_FILE_ERROR;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	605
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	606 if (ngx_win32_check_filename(u, len, 1) != NGX_OK) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	607 goto failed;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	608 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	609
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	610 rc = CreateDirectoryW(u, NULL);
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	611
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	612 failed:
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	613
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	614 if (u != utf16) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	615 err = ngx_errno;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	616 ngx_free(u);
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	617 ngx_set_errno(err);
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	618 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	619
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	620 return rc;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	621 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	622
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	623
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	624 ngx_int_t
8134 7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	625 ngx_delete_dir(u_char *name)
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	626 {
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	627 long rc;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	628 size_t len;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	629 u_short *u;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	630 ngx_err_t err;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	631 u_short utf16[NGX_UTF16_BUFLEN];
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	632
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	633 len = NGX_UTF16_BUFLEN;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	634 u = ngx_utf8_to_utf16(utf16, name, &len, 0);
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	635
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	636 if (u == NULL) {
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	637 return NGX_FILE_ERROR;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	638 }
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	639
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	640 rc = NGX_FILE_ERROR;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	641
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	642 if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	643 goto failed;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	644 }
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	645
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	646 rc = RemoveDirectoryW(u);
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	647
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	648 failed:
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	649
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	650 if (u != utf16) {
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	651 err = ngx_errno;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	652 ngx_free(u);
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	653 ngx_set_errno(err);
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	654 }
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	655
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	656 return rc;
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	657 }
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	658
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	659
7d60e4584d9e Win32: non-ASCII directory names support in ngx_delete_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8133 diff changeset	660 ngx_int_t
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	661 ngx_open_glob(ngx_glob_t *gl)
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	662 {
2459 f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	663 u_char *p;
f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	664 size_t len;
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	665 u_short *u;
2459 f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	666 ngx_err_t err;
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	667 u_short utf16[NGX_UTF16_BUFLEN];
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	668
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	669 len = NGX_UTF16_BUFLEN;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	670 u = ngx_utf8_to_utf16(utf16, gl->pattern, &len, 0);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	671
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	672 if (u == NULL) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	673 return NGX_ERROR;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	674 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	675
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	676 gl->dir = FindFirstFileW(u, &gl->finddata);
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	677
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	678 if (gl->dir == INVALID_HANDLE_VALUE) {
1980 b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	679
2459 f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	680 err = ngx_errno;
f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	681
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	682 if (u != utf16) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	683 ngx_free(u);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	684 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	685
2459 f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	686 if ((err == ERROR_FILE_NOT_FOUND \|\| err == ERROR_PATH_NOT_FOUND)
f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	687 && gl->test)
f732b8509658 fix r1981 on win32 Igor Sysoev <igor@sysoev.ru> parents: 2259 diff changeset	688 {
1980 b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	689 gl->no_match = 1;
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	690 return NGX_OK;
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	691 }
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	692
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	693 ngx_set_errno(err);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	694
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	695 return NGX_ERROR;
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	696 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	697
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	698 for (p = gl->pattern; *p; p++) {
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	699 if (*p == '/') {
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	700 gl->last = p + 1 - gl->pattern;
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	701 }
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	702 }
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	703
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	704 if (u != utf16) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	705 ngx_free(u);
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	706 }
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	707
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	708 gl->ready = 1;
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	709
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	710 return NGX_OK;
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	711 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	712
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	713
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	714 ngx_int_t
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	715 ngx_read_glob(ngx_glob_t gl, ngx_str_t name)
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	716 {
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	717 u_char *p;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	718 size_t len;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	719 ngx_err_t err;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	720 u_char utf8[NGX_UTF8_BUFLEN];
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	721
1980 b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	722 if (gl->no_match) {
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	723 return NGX_DONE;
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	724 }
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	725
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	726 if (gl->ready) {
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	727 gl->ready = 0;
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	728 goto convert;
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	729 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	730
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	731 ngx_free(gl->name.data);
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	732 gl->name.data = NULL;
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	733
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	734 if (FindNextFileW(gl->dir, &gl->finddata) != 0) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	735 goto convert;
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	736 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	737
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	738 err = ngx_errno;
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	739
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	740 if (err == NGX_ENOMOREFILES) {
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	741 return NGX_DONE;
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	742 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	743
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	744 ngx_log_error(NGX_LOG_ALERT, gl->log, err,
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	745 "FindNextFile(%s) failed", gl->pattern);
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	746
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	747 return NGX_ERROR;
8131 751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	748
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	749 convert:
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	750
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	751 len = NGX_UTF8_BUFLEN;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	752 p = ngx_utf16_to_utf8(utf8, gl->finddata.cFileName, &len, NULL);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	753
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	754 if (p == NULL) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	755 return NGX_ERROR;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	756 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	757
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	758 gl->name.len = gl->last + len - 1;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	759
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	760 gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	761 if (gl->name.data == NULL) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	762 goto failed;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	763 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	764
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	765 ngx_memcpy(gl->name.data, gl->pattern, gl->last);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	766 ngx_cpystrn(gl->name.data + gl->last, p, len);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	767
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	768 if (p != utf8) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	769 ngx_free(p);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	770 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	771
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	772 *name = gl->name;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	773
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	774 return NGX_OK;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	775
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	776 failed:
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	777
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	778 if (p != utf8) {
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	779 err = ngx_errno;
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	780 ngx_free(p);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	781 ngx_set_errno(err);
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	782 }
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	783
751f79bd802c Win32: non-ASCII names support in "include" with wildcards. Maxim Dounin <mdounin@mdounin.ru> parents: 8130 diff changeset	784 return NGX_ERROR;
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	785 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	786
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	787
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	788 void
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	789 ngx_close_glob(ngx_glob_t *gl)
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	790 {
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	791 if (gl->name.data) {
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	792 ngx_free(gl->name.data);
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	793 }
2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	794
1980 b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	795 if (gl->dir == INVALID_HANDLE_VALUE) {
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	796 return;
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	797 }
b5263e401884 ignore glob no match error Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	798
1632 2142e5cf62da fix win32 glob Igor Sysoev <igor@sysoev.ru> parents: 1052 diff changeset	799 if (FindClose(gl->dir) == 0) {
727 532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	800 ngx_log_error(NGX_LOG_ALERT, gl->log, ngx_errno,
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	801 "FindClose(%s) failed", gl->pattern);
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	802 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	803 }
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	804
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	805
532d15ddbe68 glob support in include Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	806 ngx_int_t
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	807 ngx_de_info(u_char name, ngx_dir_t dir)
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	808 {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	809 return NGX_OK;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	810 }
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	811
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	812
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	813 ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	814 ngx_de_link_info(u_char name, ngx_dir_t dir)
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	815 {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	816 return NGX_OK;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	817 }
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	818
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	819
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	820 ngx_int_t
3178 975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	821 ngx_read_ahead(ngx_fd_t fd, size_t n)
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	822 {
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	823 return ~NGX_FILE_ERROR;
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	824 }
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	825
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	826
975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3164 diff changeset	827 ngx_int_t
2248 1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	828 ngx_directio_on(ngx_fd_t fd)
2134 13652cba8633 fix building by bcc broken in r2130 Igor Sysoev <igor@sysoev.ru> parents: 1980 diff changeset	829 {
3164 b1b1775698d5 uniform ngx_directio_on/off() interface with other file functions Igor Sysoev <igor@sysoev.ru> parents: 3158 diff changeset	830 return ~NGX_FILE_ERROR;
2134 13652cba8633 fix building by bcc broken in r2130 Igor Sysoev <igor@sysoev.ru> parents: 1980 diff changeset	831 }
2248 1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	832
2615 ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	833
2248 1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	834 ngx_int_t
1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	835 ngx_directio_off(ngx_fd_t fd)
1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	836 {
3164 b1b1775698d5 uniform ngx_directio_on/off() interface with other file functions Igor Sysoev <igor@sysoev.ru> parents: 3158 diff changeset	837 return ~NGX_FILE_ERROR;
2248 1adec90a0e46 disable directio for unaligned reads in Linux Igor Sysoev <igor@sysoev.ru> parents: 2234 diff changeset	838 }
2615 ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	839
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	840
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	841 size_t
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	842 ngx_fs_bsize(u_char *name)
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	843 {
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	844 u_char root[4];
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	845 u_long sc, bs, nfree, ncl;
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	846
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	847 if (name[2] == ':') {
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	848 ngx_cpystrn(root, name, 4);
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	849 name = root;
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	850 }
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	851
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	852 if (GetDiskFreeSpace((const char *) name, &sc, &bs, &nfree, &ncl) == 0) {
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	853 return 512;
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	854 }
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	855
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	856 return sc * bs;
ceef364208c8 ngx_fs_bsize() Igor Sysoev <igor@sysoev.ru> parents: 2462 diff changeset	857 }
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	858
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	859
7670 ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	860 off_t
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	861 ngx_fs_available(u_char *name)
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	862 {
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	863 ULARGE_INTEGER navail;
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	864
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	865 if (GetDiskFreeSpaceEx((const char *) name, &navail, NULL, NULL) == 0) {
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	866 return NGX_MAX_OFF_T_VALUE;
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	867 }
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	868
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	869 return (off_t) navail.QuadPart;
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	870 }
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	871
ccb5ff87ab3e Cache: introduced min_free cache clearing. Maxim Dounin <mdounin@mdounin.ru> parents: 7433 diff changeset	872
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	873 static ngx_int_t
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	874 ngx_win32_check_filename(u_short *u, size_t len, ngx_uint_t dirname)
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	875 {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	876 u_long n;
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	877 u_short lu, p, *slash, ch;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	878 ngx_err_t err;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	879 enum {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	880 sw_start = 0,
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	881 sw_normal,
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	882 sw_after_slash,
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	883 sw_after_colon,
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	884 sw_after_dot
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	885 } state;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	886
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	887 /* check for NTFS streams (":"), trailing dots and spaces */
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	888
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	889 lu = NULL;
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	890 slash = NULL;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	891 state = sw_start;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	892
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	893 #if (NGX_SUPPRESS_WARN)
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	894 ch = 0;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	895 #endif
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	896
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	897 for (p = u; *p; p++) {
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	898 ch = *p;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	899
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	900 switch (state) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	901
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	902 case sw_start:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	903
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	904 /*
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	905 * skip till first "/" to allow paths starting with drive and
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	906 * relative path, like "c:html/"
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	907 */
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	908
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	909 if (ch == '/' \|\| ch == '\\') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	910 state = sw_after_slash;
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	911 slash = p;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	912 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	913
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	914 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	915
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	916 case sw_normal:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	917
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	918 if (ch == ':') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	919 state = sw_after_colon;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	920 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	921 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	922
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	923 if (ch == '.' \|\| ch == ' ') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	924 state = sw_after_dot;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	925 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	926 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	927
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	928 if (ch == '/' \|\| ch == '\\') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	929 state = sw_after_slash;
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	930 slash = p;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	931 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	932 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	933
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	934 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	935
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	936 case sw_after_slash:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	937
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	938 if (ch == '/' \|\| ch == '\\') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	939 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	940 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	941
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	942 if (ch == '.') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	943 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	944 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	945
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	946 if (ch == ':') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	947 state = sw_after_colon;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	948 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	949 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	950
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	951 state = sw_normal;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	952 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	953
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	954 case sw_after_colon:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	955
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	956 if (ch == '/' \|\| ch == '\\') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	957 state = sw_after_slash;
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	958 slash = p;
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	959 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	960 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	961
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	962 goto invalid;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	963
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	964 case sw_after_dot:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	965
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	966 if (ch == '/' \|\| ch == '\\') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	967 goto invalid;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	968 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	969
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	970 if (ch == ':') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	971 goto invalid;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	972 }
4703 726346e1ae66 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 4673 diff changeset	973
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	974 if (ch == '.' \|\| ch == ' ') {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	975 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	976 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	977
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	978 state = sw_normal;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	979 break;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	980 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	981 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	982
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	983 if (state == sw_after_dot) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	984 goto invalid;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	985 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	986
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	987 if (dirname && slash) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	988 ch = *slash;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	989 *slash = '\0';
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	990 len = slash - u + 1;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	991 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	992
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	993 /* check if long name match */
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	994
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	995 lu = malloc(len * 2);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	996 if (lu == NULL) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	997 return NGX_ERROR;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	998 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	999
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1000 n = GetLongPathNameW(u, lu, len);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1001
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1002 if (n == 0) {
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1003
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1004 if (dirname && slash && ngx_errno == NGX_ENOENT) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1005 ngx_set_errno(NGX_ENOPATH);
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1006 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1007
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1008 goto failed;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1009 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1010
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1011 if (n != len - 1 \|\| _wcsicmp(u, lu) != 0) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1012 goto invalid;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1013 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1014
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1015 if (dirname && slash) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1016 *slash = ch;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1017 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1018
5437 dea321e5c021 Win32: plugged memory leak. Maxim Dounin <mdounin@mdounin.ru> parents: 4703 diff changeset	1019 ngx_free(lu);
dea321e5c021 Win32: plugged memory leak. Maxim Dounin <mdounin@mdounin.ru> parents: 4703 diff changeset	1020
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1021 return NGX_OK;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1022
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1023 invalid:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1024
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1025 ngx_set_errno(NGX_ENOENT);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1026
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1027 failed:
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1028
8133 e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1029 if (dirname && slash) {
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1030 *slash = ch;
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1031 }
e0f385521c79 Win32: non-ASCII directory names support in ngx_create_dir(). Maxim Dounin <mdounin@mdounin.ru> parents: 8132 diff changeset	1032
4673 dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1033 if (lu) {
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1034 err = ngx_errno;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1035 ngx_free(lu);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1036 ngx_set_errno(err);
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1037 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1038
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1039 return NGX_ERROR;
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1040 }
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1041
dc6c658942a8 Win32: disallowed access to various non-canonical name variants. Maxim Dounin <mdounin@mdounin.ru> parents: 4564 diff changeset	1042
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1043 static u_short *
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1044 ngx_utf8_to_utf16(u_short utf16, u_char utf8, size_t *len, size_t reserved)
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1045 {
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1046 u_char *p;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1047 u_short u, last;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1048 uint32_t n;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1049
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1050 p = utf8;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1051 u = utf16;
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1052 last = utf16 + *len;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1053
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1054 while (u < last) {
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1055
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1056 if (*p < 0x80) {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1057 u++ = (u_short) p;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1058
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1059 if (*p == 0) {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1060 *len = u - utf16;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1061 return utf16;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1062 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1063
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1064 p++;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1065
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1066 continue;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1067 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1068
5501 1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1069 if (u + 1 == last) {
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1070 *len = u - utf16;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1071 break;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1072 }
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1073
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1074 n = ngx_utf8_decode(&p, 4);
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1075
5501 1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1076 if (n > 0x10ffff) {
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1077 ngx_set_errno(NGX_EILSEQ);
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1078 return NULL;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1079 }
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1080
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1081 if (n > 0xffff) {
5501 1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1082 n -= 0x10000;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1083 *u++ = (u_short) (0xd800 + (n >> 10));
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1084 *u++ = (u_short) (0xdc00 + (n & 0x03ff));
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1085 continue;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1086 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1087
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1088 *u++ = (u_short) n;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1089 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1090
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1091 /* the given buffer is not enough, allocate a new one */
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1092
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1093 u = malloc(((p - utf8) + ngx_strlen(p) + 1 + reserved) * sizeof(u_short));
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1094 if (u == NULL) {
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1095 return NULL;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1096 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1097
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1098 ngx_memcpy(u, utf16, len 2);
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1099
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1100 utf16 = u;
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1101 u += *len;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1102
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1103 for ( ;; ) {
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1104
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1105 if (*p < 0x80) {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1106 u++ = (u_short) p;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1107
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1108 if (*p == 0) {
3417 15017418fd84 disable Win32 short file names Igor Sysoev <igor@sysoev.ru> parents: 3382 diff changeset	1109 *len = u - utf16;
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1110 return utf16;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1111 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1112
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1113 p++;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1114
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1115 continue;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1116 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1117
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1118 n = ngx_utf8_decode(&p, 4);
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1119
5501 1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1120 if (n > 0x10ffff) {
5785 fbdab7f38fd6 Style: use ngx_free() instead of free(). Tatsuhiko Kubo <cubicdaiya@gmail.com> parents: 5749 diff changeset	1121 ngx_free(utf16);
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1122 ngx_set_errno(NGX_EILSEQ);
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1123 return NULL;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1124 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1125
5501 1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1126 if (n > 0xffff) {
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1127 n -= 0x10000;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1128 *u++ = (u_short) (0xd800 + (n >> 10));
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1129 *u++ = (u_short) (0xdc00 + (n & 0x03ff));
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1130 continue;
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1131 }
1cd23ca84a9b Win32: support for UTF-16 surrogate pairs (ticket #457). Maxim Dounin <mdounin@mdounin.ru> parents: 5437 diff changeset	1132
2628 64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1133 *u++ = (u_short) n;
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1134 }
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1135
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1136 /* unreachable */
64a10d6b97bd win32 ngx_open_file() supports utf8 names and NGX_FILE_APPEND Igor Sysoev <igor@sysoev.ru> parents: 2615 diff changeset	1137 }
8130 b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1138
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1139
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1140 static u_char *
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1141 ngx_utf16_to_utf8(u_char utf8, u_short utf16, size_t len, size_t allocated)
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1142 {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1143 u_char p, last;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1144 u_short u, j;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1145 uint32_t n;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1146
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1147 u = utf16;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1148 p = utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1149 last = utf8 + *len;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1150
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1151 while (p < last) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1152
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1153 if (*u < 0x80) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1154 p++ = (u_char) u;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1155
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1156 if (*u == 0) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1157 *len = p - utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1158 return utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1159 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1160
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1161 u++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1162
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1163 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1164 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1165
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1166 if (p >= last - 4) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1167 *len = p - utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1168 break;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1169 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1170
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1171 n = ngx_utf16_decode(&u, 2);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1172
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1173 if (n > 0x10ffff) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1174 ngx_set_errno(NGX_EILSEQ);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1175 return NULL;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1176 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1177
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1178 if (n >= 0x10000) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1179 *p++ = (u_char) (0xf0 + (n >> 18));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1180 *p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1181 *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1182 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1183 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1184 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1185
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1186 if (n >= 0x0800) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1187 *p++ = (u_char) (0xe0 + (n >> 12));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1188 *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1189 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1190 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1191 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1192
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1193 *p++ = (u_char) (0xc0 + (n >> 6));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1194 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1195 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1196
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1197 /* the given buffer is not enough, allocate a new one */
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1198
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1199 for (j = u; j; j++) { / void */ }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1200
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1201 p = malloc((j - utf16) * 4 + 1);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1202 if (p == NULL) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1203 return NULL;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1204 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1205
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1206 if (allocated) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1207 allocated = (j - utf16) 4 + 1;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1208 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1209
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1210 ngx_memcpy(p, utf8, *len);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1211
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1212 utf8 = p;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1213 p += *len;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1214
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1215 for ( ;; ) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1216
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1217 if (*u < 0x80) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1218 p++ = (u_char) u;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1219
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1220 if (*u == 0) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1221 *len = p - utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1222 return utf8;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1223 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1224
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1225 u++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1226
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1227 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1228 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1229
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1230 n = ngx_utf16_decode(&u, 2);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1231
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1232 if (n > 0x10ffff) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1233 ngx_free(utf8);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1234 ngx_set_errno(NGX_EILSEQ);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1235 return NULL;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1236 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1237
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1238 if (n >= 0x10000) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1239 *p++ = (u_char) (0xf0 + (n >> 18));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1240 *p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1241 *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1242 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1243 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1244 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1245
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1246 if (n >= 0x0800) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1247 *p++ = (u_char) (0xe0 + (n >> 12));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1248 *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1249 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1250 continue;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1251 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1252
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1253 *p++ = (u_char) (0xc0 + (n >> 6));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1254 *p++ = (u_char) (0x80 + (n & 0x3f));
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1255 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1256
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1257 /* unreachable */
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1258 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1259
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1260
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1261 /*
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1262 * ngx_utf16_decode() decodes one or two UTF-16 code units
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1263 * the return values:
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1264 * 0x80 - 0x10ffff valid character
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1265 * 0x110000 - 0xfffffffd invalid sequence
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1266 * 0xfffffffe incomplete sequence
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1267 * 0xffffffff error
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1268 */
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1269
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1270 uint32_t
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1271 ngx_utf16_decode(u_short **u, size_t n)
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1272 {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1273 uint32_t k, m;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1274
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1275 k = **u;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1276
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1277 if (k < 0xd800 \|\| k > 0xdfff) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1278 (*u)++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1279 return k;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1280 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1281
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1282 if (k > 0xdbff) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1283 (*u)++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1284 return 0xffffffff;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1285 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1286
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1287 if (n < 2) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1288 return 0xfffffffe;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1289 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1290
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1291 (*u)++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1292
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1293 m = (u)++;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1294
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1295 if (m < 0xdc00 \|\| m > 0xdfff) {
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1296 return 0xffffffff;
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1297
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1298 }
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1299
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1300 return 0x10000 + ((k - 0xd800) << 10) + (m - 0xdc00);
b0a06c50c1b4 Win32: non-ASCII names support in autoindex (ticket #458). Maxim Dounin <mdounin@mdounin.ru> parents: 7670 diff changeset	1301 }

Mercurial > hg > nginx

annotate src/os/win32/ngx_files.c @ 8136:37a184966ab3