Latest update - 9066
This commit is contained in:
+628
-81
@@ -10,10 +10,15 @@
|
||||
|
||||
|
||||
#define NGX_UTF16_BUFLEN 256
|
||||
#define NGX_UTF8_BUFLEN 512
|
||||
|
||||
static ngx_int_t ngx_win32_check_filename(u_char *name, u_short *u,
|
||||
size_t len);
|
||||
static u_short *ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len);
|
||||
static ngx_int_t ngx_win32_check_filename(u_short *u, size_t len,
|
||||
ngx_uint_t dirname);
|
||||
static u_short *ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len,
|
||||
size_t reserved);
|
||||
static u_char *ngx_utf16_to_utf8(u_char *utf8, u_short *utf16, size_t *len,
|
||||
size_t *allocated);
|
||||
uint32_t ngx_utf16_decode(u_short **u, size_t n);
|
||||
|
||||
|
||||
/* FILE_FLAG_BACKUP_SEMANTICS allows to obtain a handle to a directory */
|
||||
@@ -28,7 +33,7 @@ ngx_open_file(u_char *name, u_long mode, u_long create, u_long access)
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len);
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return INVALID_HANDLE_VALUE;
|
||||
@@ -37,7 +42,7 @@ ngx_open_file(u_char *name, u_long mode, u_long create, u_long access)
|
||||
fd = INVALID_HANDLE_VALUE;
|
||||
|
||||
if (create == NGX_FILE_OPEN
|
||||
&& ngx_win32_check_filename(name, u, len) != NGX_OK)
|
||||
&& ngx_win32_check_filename(u, len, 0) != NGX_OK)
|
||||
{
|
||||
goto failed;
|
||||
}
|
||||
@@ -58,6 +63,41 @@ failed:
|
||||
}
|
||||
|
||||
|
||||
ngx_fd_t
|
||||
ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t access)
|
||||
{
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ngx_fd_t fd;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
fd = CreateFileW(u,
|
||||
GENERIC_READ|GENERIC_WRITE,
|
||||
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
|
||||
NULL,
|
||||
CREATE_NEW,
|
||||
persistent ? 0:
|
||||
FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE,
|
||||
NULL);
|
||||
|
||||
if (u != utf16) {
|
||||
err = ngx_errno;
|
||||
ngx_free(u);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return fd;
|
||||
}
|
||||
|
||||
|
||||
ssize_t
|
||||
ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
|
||||
{
|
||||
@@ -202,6 +242,97 @@ ngx_write_console(ngx_fd_t fd, void *buf, size_t size)
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_delete_file(u_char *name)
|
||||
{
|
||||
long rc;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
rc = NGX_FILE_ERROR;
|
||||
|
||||
if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
rc = DeleteFileW(u);
|
||||
|
||||
failed:
|
||||
|
||||
if (u != utf16) {
|
||||
err = ngx_errno;
|
||||
ngx_free(u);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_rename_file(u_char *from, u_char *to)
|
||||
{
|
||||
long rc;
|
||||
size_t len;
|
||||
u_short *fu, *tu;
|
||||
ngx_err_t err;
|
||||
u_short utf16f[NGX_UTF16_BUFLEN];
|
||||
u_short utf16t[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
fu = ngx_utf8_to_utf16(utf16f, from, &len, 0);
|
||||
|
||||
if (fu == NULL) {
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
rc = NGX_FILE_ERROR;
|
||||
tu = NULL;
|
||||
|
||||
if (ngx_win32_check_filename(fu, len, 0) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
tu = ngx_utf8_to_utf16(utf16t, to, &len, 0);
|
||||
|
||||
if (tu == NULL) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (ngx_win32_check_filename(tu, len, 1) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
rc = MoveFileW(fu, tu);
|
||||
|
||||
failed:
|
||||
|
||||
if (fu != utf16f) {
|
||||
err = ngx_errno;
|
||||
ngx_free(fu);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
if (tu && tu != utf16t) {
|
||||
err = ngx_errno;
|
||||
ngx_free(tu);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
ngx_err_t
|
||||
ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
|
||||
{
|
||||
@@ -227,28 +358,36 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
|
||||
|
||||
ngx_sprintf(name + to->len, ".%0muA.DELETE%Z", num);
|
||||
|
||||
if (MoveFile((const char *) to->data, (const char *) name) != 0) {
|
||||
if (ngx_rename_file(to->data, name) != NGX_FILE_ERROR) {
|
||||
break;
|
||||
}
|
||||
|
||||
collision = 1;
|
||||
err = ngx_errno;
|
||||
|
||||
ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
|
||||
if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
|
||||
collision = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_CRIT, log, err,
|
||||
"MoveFile() \"%s\" to \"%s\" failed", to->data, name);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (MoveFile((const char *) from->data, (const char *) to->data) == 0) {
|
||||
if (ngx_rename_file(from->data, to->data) == NGX_FILE_ERROR) {
|
||||
err = ngx_errno;
|
||||
|
||||
} else {
|
||||
err = 0;
|
||||
}
|
||||
|
||||
if (DeleteFile((const char *) name) == 0) {
|
||||
if (ngx_delete_file(name) == NGX_FILE_ERROR) {
|
||||
ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
|
||||
"DeleteFile() \"%s\" failed", name);
|
||||
}
|
||||
|
||||
failed:
|
||||
|
||||
/* mutex_unlock() */
|
||||
|
||||
ngx_free(name);
|
||||
@@ -269,7 +408,7 @@ ngx_file_info(u_char *file, ngx_file_info_t *sb)
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
|
||||
u = ngx_utf8_to_utf16(utf16, file, &len);
|
||||
u = ngx_utf8_to_utf16(utf16, file, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_FILE_ERROR;
|
||||
@@ -277,7 +416,7 @@ ngx_file_info(u_char *file, ngx_file_info_t *sb)
|
||||
|
||||
rc = NGX_FILE_ERROR;
|
||||
|
||||
if (ngx_win32_check_filename(file, u, len) != NGX_OK) {
|
||||
if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@@ -424,61 +563,146 @@ ngx_realpath(u_char *path, u_char *resolved)
|
||||
}
|
||||
|
||||
|
||||
size_t
|
||||
ngx_getcwd(u_char *buf, size_t size)
|
||||
{
|
||||
u_char *p;
|
||||
size_t n;
|
||||
u_short utf16[NGX_MAX_PATH];
|
||||
|
||||
n = GetCurrentDirectoryW(NGX_MAX_PATH, utf16);
|
||||
|
||||
if (n == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (n > NGX_MAX_PATH) {
|
||||
ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
|
||||
return 0;
|
||||
}
|
||||
|
||||
p = ngx_utf16_to_utf8(buf, utf16, &size, NULL);
|
||||
|
||||
if (p == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (p != buf) {
|
||||
ngx_free(p);
|
||||
ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return size - 1;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
|
||||
{
|
||||
u_char *pattern, *p;
|
||||
size_t len;
|
||||
u_short *u, *p;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
pattern = malloc(name->len + 3);
|
||||
if (pattern == NULL) {
|
||||
len = NGX_UTF16_BUFLEN - 2;
|
||||
u = ngx_utf8_to_utf16(utf16, name->data, &len, 2);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
p = ngx_cpymem(pattern, name->data, name->len);
|
||||
if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
p = &u[len - 1];
|
||||
|
||||
*p++ = '/';
|
||||
*p++ = '*';
|
||||
*p = '\0';
|
||||
|
||||
dir->dir = FindFirstFile((const char *) pattern, &dir->finddata);
|
||||
dir->dir = FindFirstFileW(u, &dir->finddata);
|
||||
|
||||
if (dir->dir == INVALID_HANDLE_VALUE) {
|
||||
err = ngx_errno;
|
||||
ngx_free(pattern);
|
||||
ngx_set_errno(err);
|
||||
return NGX_ERROR;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
ngx_free(pattern);
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
dir->valid_info = 1;
|
||||
dir->ready = 1;
|
||||
dir->name = NULL;
|
||||
dir->allocated = 0;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
failed:
|
||||
|
||||
ngx_int_t
|
||||
ngx_read_dir(ngx_dir_t *dir)
|
||||
{
|
||||
if (dir->ready) {
|
||||
dir->ready = 0;
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if (FindNextFile(dir->dir, &dir->finddata) != 0) {
|
||||
dir->type = 1;
|
||||
return NGX_OK;
|
||||
if (u != utf16) {
|
||||
err = ngx_errno;
|
||||
ngx_free(u);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_read_dir(ngx_dir_t *dir)
|
||||
{
|
||||
u_char *name;
|
||||
size_t len, allocated;
|
||||
|
||||
if (dir->ready) {
|
||||
dir->ready = 0;
|
||||
goto convert;
|
||||
}
|
||||
|
||||
if (FindNextFileW(dir->dir, &dir->finddata) != 0) {
|
||||
dir->type = 1;
|
||||
goto convert;
|
||||
}
|
||||
|
||||
return NGX_ERROR;
|
||||
|
||||
convert:
|
||||
|
||||
name = dir->name;
|
||||
len = dir->allocated;
|
||||
|
||||
name = ngx_utf16_to_utf8(name, dir->finddata.cFileName, &len, &allocated);
|
||||
|
||||
if (name == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (name != dir->name) {
|
||||
|
||||
if (dir->name) {
|
||||
ngx_free(dir->name);
|
||||
}
|
||||
|
||||
dir->name = name;
|
||||
dir->allocated = allocated;
|
||||
}
|
||||
|
||||
dir->namelen = len - 1;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_close_dir(ngx_dir_t *dir)
|
||||
{
|
||||
if (dir->name) {
|
||||
ngx_free(dir->name);
|
||||
}
|
||||
|
||||
if (FindClose(dir->dir) == 0) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
@@ -487,19 +711,104 @@ ngx_close_dir(ngx_dir_t *dir)
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_create_dir(u_char *name, ngx_uint_t access)
|
||||
{
|
||||
long rc;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
rc = NGX_FILE_ERROR;
|
||||
|
||||
if (ngx_win32_check_filename(u, len, 1) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
rc = CreateDirectoryW(u, NULL);
|
||||
|
||||
failed:
|
||||
|
||||
if (u != utf16) {
|
||||
err = ngx_errno;
|
||||
ngx_free(u);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_delete_dir(u_char *name)
|
||||
{
|
||||
long rc;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
rc = NGX_FILE_ERROR;
|
||||
|
||||
if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
rc = RemoveDirectoryW(u);
|
||||
|
||||
failed:
|
||||
|
||||
if (u != utf16) {
|
||||
err = ngx_errno;
|
||||
ngx_free(u);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_open_glob(ngx_glob_t *gl)
|
||||
{
|
||||
u_char *p;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ngx_err_t err;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata);
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, gl->pattern, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
gl->dir = FindFirstFileW(u, &gl->finddata);
|
||||
|
||||
if (gl->dir == INVALID_HANDLE_VALUE) {
|
||||
|
||||
err = ngx_errno;
|
||||
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
if ((err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
|
||||
&& gl->test)
|
||||
{
|
||||
@@ -507,6 +816,8 @@ ngx_open_glob(ngx_glob_t *gl)
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ngx_set_errno(err);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
@@ -516,18 +827,10 @@ ngx_open_glob(ngx_glob_t *gl)
|
||||
}
|
||||
}
|
||||
|
||||
len = ngx_strlen(gl->finddata.cFileName);
|
||||
gl->name.len = gl->last + len;
|
||||
|
||||
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
|
||||
if (gl->name.data == NULL) {
|
||||
return NGX_ERROR;
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
|
||||
ngx_cpystrn(gl->name.data + gl->last, (u_char *) gl->finddata.cFileName,
|
||||
len + 1);
|
||||
|
||||
gl->ready = 1;
|
||||
|
||||
return NGX_OK;
|
||||
@@ -537,40 +840,25 @@ ngx_open_glob(ngx_glob_t *gl)
|
||||
ngx_int_t
|
||||
ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
|
||||
{
|
||||
size_t len;
|
||||
ngx_err_t err;
|
||||
u_char *p;
|
||||
size_t len;
|
||||
ngx_err_t err;
|
||||
u_char utf8[NGX_UTF8_BUFLEN];
|
||||
|
||||
if (gl->no_match) {
|
||||
return NGX_DONE;
|
||||
}
|
||||
|
||||
if (gl->ready) {
|
||||
*name = gl->name;
|
||||
|
||||
gl->ready = 0;
|
||||
return NGX_OK;
|
||||
goto convert;
|
||||
}
|
||||
|
||||
ngx_free(gl->name.data);
|
||||
gl->name.data = NULL;
|
||||
|
||||
if (FindNextFile(gl->dir, &gl->finddata) != 0) {
|
||||
|
||||
len = ngx_strlen(gl->finddata.cFileName);
|
||||
gl->name.len = gl->last + len;
|
||||
|
||||
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
|
||||
if (gl->name.data == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
|
||||
ngx_cpystrn(gl->name.data + gl->last, (u_char *) gl->finddata.cFileName,
|
||||
len + 1);
|
||||
|
||||
*name = gl->name;
|
||||
|
||||
return NGX_OK;
|
||||
if (FindNextFileW(gl->dir, &gl->finddata) != 0) {
|
||||
goto convert;
|
||||
}
|
||||
|
||||
err = ngx_errno;
|
||||
@@ -583,6 +871,43 @@ ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
|
||||
"FindNextFile(%s) failed", gl->pattern);
|
||||
|
||||
return NGX_ERROR;
|
||||
|
||||
convert:
|
||||
|
||||
len = NGX_UTF8_BUFLEN;
|
||||
p = ngx_utf16_to_utf8(utf8, gl->finddata.cFileName, &len, NULL);
|
||||
|
||||
if (p == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
gl->name.len = gl->last + len - 1;
|
||||
|
||||
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
|
||||
if (gl->name.data == NULL) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
|
||||
ngx_cpystrn(gl->name.data + gl->last, p, len);
|
||||
|
||||
if (p != utf8) {
|
||||
ngx_free(p);
|
||||
}
|
||||
|
||||
*name = gl->name;
|
||||
|
||||
return NGX_OK;
|
||||
|
||||
failed:
|
||||
|
||||
if (p != utf8) {
|
||||
err = ngx_errno;
|
||||
ngx_free(p);
|
||||
ngx_set_errno(err);
|
||||
}
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
|
||||
@@ -642,18 +967,31 @@ ngx_directio_off(ngx_fd_t fd)
|
||||
size_t
|
||||
ngx_fs_bsize(u_char *name)
|
||||
{
|
||||
u_char root[4];
|
||||
u_long sc, bs, nfree, ncl;
|
||||
u_long sc, bs, nfree, ncl;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
if (name[2] == ':') {
|
||||
ngx_cpystrn(root, name, 4);
|
||||
name = root;
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return 512;
|
||||
}
|
||||
|
||||
if (GetDiskFreeSpace((const char *) name, &sc, &bs, &nfree, &ncl) == 0) {
|
||||
if (GetDiskFreeSpaceW(u, &sc, &bs, &nfree, &ncl) == 0) {
|
||||
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
return 512;
|
||||
}
|
||||
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
return sc * bs;
|
||||
}
|
||||
|
||||
@@ -661,22 +999,40 @@ ngx_fs_bsize(u_char *name)
|
||||
off_t
|
||||
ngx_fs_available(u_char *name)
|
||||
{
|
||||
ULARGE_INTEGER navail;
|
||||
size_t len;
|
||||
u_short *u;
|
||||
ULARGE_INTEGER navail;
|
||||
u_short utf16[NGX_UTF16_BUFLEN];
|
||||
|
||||
if (GetDiskFreeSpaceEx((const char *) name, &navail, NULL, NULL) == 0) {
|
||||
len = NGX_UTF16_BUFLEN;
|
||||
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
|
||||
|
||||
if (u == NULL) {
|
||||
return NGX_MAX_OFF_T_VALUE;
|
||||
}
|
||||
|
||||
if (GetDiskFreeSpaceExW(u, &navail, NULL, NULL) == 0) {
|
||||
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
return NGX_MAX_OFF_T_VALUE;
|
||||
}
|
||||
|
||||
if (u != utf16) {
|
||||
ngx_free(u);
|
||||
}
|
||||
|
||||
return (off_t) navail.QuadPart;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
ngx_win32_check_filename(u_short *u, size_t len, ngx_uint_t dirname)
|
||||
{
|
||||
u_char *p, ch;
|
||||
u_long n;
|
||||
u_short *lu;
|
||||
u_short *lu, *p, *slash, ch;
|
||||
ngx_err_t err;
|
||||
enum {
|
||||
sw_start = 0,
|
||||
@@ -689,9 +1045,14 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
/* check for NTFS streams (":"), trailing dots and spaces */
|
||||
|
||||
lu = NULL;
|
||||
slash = NULL;
|
||||
state = sw_start;
|
||||
|
||||
for (p = name; *p; p++) {
|
||||
#if (NGX_SUPPRESS_WARN)
|
||||
ch = 0;
|
||||
#endif
|
||||
|
||||
for (p = u; *p; p++) {
|
||||
ch = *p;
|
||||
|
||||
switch (state) {
|
||||
@@ -705,6 +1066,7 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
|
||||
if (ch == '/' || ch == '\\') {
|
||||
state = sw_after_slash;
|
||||
slash = p;
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -723,6 +1085,7 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
|
||||
if (ch == '/' || ch == '\\') {
|
||||
state = sw_after_slash;
|
||||
slash = p;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -750,6 +1113,7 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
|
||||
if (ch == '/' || ch == '\\') {
|
||||
state = sw_after_slash;
|
||||
slash = p;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -778,6 +1142,12 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
if (dirname && slash) {
|
||||
ch = *slash;
|
||||
*slash = '\0';
|
||||
len = slash - u + 1;
|
||||
}
|
||||
|
||||
/* check if long name match */
|
||||
|
||||
lu = malloc(len * 2);
|
||||
@@ -788,6 +1158,11 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
n = GetLongPathNameW(u, lu, len);
|
||||
|
||||
if (n == 0) {
|
||||
|
||||
if (dirname && slash && ngx_errno == NGX_ENOENT) {
|
||||
ngx_set_errno(NGX_ENOPATH);
|
||||
}
|
||||
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@@ -795,6 +1170,10 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
if (dirname && slash) {
|
||||
*slash = ch;
|
||||
}
|
||||
|
||||
ngx_free(lu);
|
||||
|
||||
return NGX_OK;
|
||||
@@ -805,6 +1184,10 @@ invalid:
|
||||
|
||||
failed:
|
||||
|
||||
if (dirname && slash) {
|
||||
*slash = ch;
|
||||
}
|
||||
|
||||
if (lu) {
|
||||
err = ngx_errno;
|
||||
ngx_free(lu);
|
||||
@@ -816,7 +1199,7 @@ failed:
|
||||
|
||||
|
||||
static u_short *
|
||||
ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len)
|
||||
ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len, size_t reserved)
|
||||
{
|
||||
u_char *p;
|
||||
u_short *u, *last;
|
||||
@@ -865,7 +1248,7 @@ ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len)
|
||||
|
||||
/* the given buffer is not enough, allocate a new one */
|
||||
|
||||
u = malloc(((p - utf8) + ngx_strlen(p) + 1) * sizeof(u_short));
|
||||
u = malloc(((p - utf8) + ngx_strlen(p) + 1 + reserved) * sizeof(u_short));
|
||||
if (u == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -910,3 +1293,167 @@ ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len)
|
||||
|
||||
/* unreachable */
|
||||
}
|
||||
|
||||
|
||||
static u_char *
|
||||
ngx_utf16_to_utf8(u_char *utf8, u_short *utf16, size_t *len, size_t *allocated)
|
||||
{
|
||||
u_char *p, *last;
|
||||
u_short *u, *j;
|
||||
uint32_t n;
|
||||
|
||||
u = utf16;
|
||||
p = utf8;
|
||||
last = utf8 + *len;
|
||||
|
||||
while (p < last) {
|
||||
|
||||
if (*u < 0x80) {
|
||||
*p++ = (u_char) *u;
|
||||
|
||||
if (*u == 0) {
|
||||
*len = p - utf8;
|
||||
return utf8;
|
||||
}
|
||||
|
||||
u++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (p >= last - 4) {
|
||||
*len = p - utf8;
|
||||
break;
|
||||
}
|
||||
|
||||
n = ngx_utf16_decode(&u, 2);
|
||||
|
||||
if (n > 0x10ffff) {
|
||||
ngx_set_errno(NGX_EILSEQ);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (n >= 0x10000) {
|
||||
*p++ = (u_char) (0xf0 + (n >> 18));
|
||||
*p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (n >= 0x0800) {
|
||||
*p++ = (u_char) (0xe0 + (n >> 12));
|
||||
*p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
continue;
|
||||
}
|
||||
|
||||
*p++ = (u_char) (0xc0 + (n >> 6));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
}
|
||||
|
||||
/* the given buffer is not enough, allocate a new one */
|
||||
|
||||
for (j = u; *j; j++) { /* void */ }
|
||||
|
||||
p = malloc((j - utf16) * 4 + 1);
|
||||
if (p == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (allocated) {
|
||||
*allocated = (j - utf16) * 4 + 1;
|
||||
}
|
||||
|
||||
ngx_memcpy(p, utf8, *len);
|
||||
|
||||
utf8 = p;
|
||||
p += *len;
|
||||
|
||||
for ( ;; ) {
|
||||
|
||||
if (*u < 0x80) {
|
||||
*p++ = (u_char) *u;
|
||||
|
||||
if (*u == 0) {
|
||||
*len = p - utf8;
|
||||
return utf8;
|
||||
}
|
||||
|
||||
u++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
n = ngx_utf16_decode(&u, 2);
|
||||
|
||||
if (n > 0x10ffff) {
|
||||
ngx_free(utf8);
|
||||
ngx_set_errno(NGX_EILSEQ);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (n >= 0x10000) {
|
||||
*p++ = (u_char) (0xf0 + (n >> 18));
|
||||
*p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (n >= 0x0800) {
|
||||
*p++ = (u_char) (0xe0 + (n >> 12));
|
||||
*p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
continue;
|
||||
}
|
||||
|
||||
*p++ = (u_char) (0xc0 + (n >> 6));
|
||||
*p++ = (u_char) (0x80 + (n & 0x3f));
|
||||
}
|
||||
|
||||
/* unreachable */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* ngx_utf16_decode() decodes one or two UTF-16 code units
|
||||
* the return values:
|
||||
* 0x80 - 0x10ffff valid character
|
||||
* 0x110000 - 0xfffffffd invalid sequence
|
||||
* 0xfffffffe incomplete sequence
|
||||
* 0xffffffff error
|
||||
*/
|
||||
|
||||
uint32_t
|
||||
ngx_utf16_decode(u_short **u, size_t n)
|
||||
{
|
||||
uint32_t k, m;
|
||||
|
||||
k = **u;
|
||||
|
||||
if (k < 0xd800 || k > 0xdfff) {
|
||||
(*u)++;
|
||||
return k;
|
||||
}
|
||||
|
||||
if (k > 0xdbff) {
|
||||
(*u)++;
|
||||
return 0xffffffff;
|
||||
}
|
||||
|
||||
if (n < 2) {
|
||||
return 0xfffffffe;
|
||||
}
|
||||
|
||||
(*u)++;
|
||||
|
||||
m = *(*u)++;
|
||||
|
||||
if (m < 0xdc00 || m > 0xdfff) {
|
||||
return 0xffffffff;
|
||||
|
||||
}
|
||||
|
||||
return 0x10000 + ((k - 0xd800) << 10) + (m - 0xdc00);
|
||||
}
|
||||
+19
-19
@@ -30,7 +30,11 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
HANDLE dir;
|
||||
WIN32_FIND_DATA finddata;
|
||||
WIN32_FIND_DATAW finddata;
|
||||
|
||||
u_char *name;
|
||||
size_t namelen;
|
||||
size_t allocated;
|
||||
|
||||
unsigned valid_info:1;
|
||||
unsigned type:1;
|
||||
@@ -40,7 +44,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
HANDLE dir;
|
||||
WIN32_FIND_DATA finddata;
|
||||
WIN32_FIND_DATAW finddata;
|
||||
|
||||
unsigned ready:1;
|
||||
unsigned test:1;
|
||||
@@ -86,16 +90,8 @@ ngx_fd_t ngx_open_file(u_char *name, u_long mode, u_long create, u_long access);
|
||||
#define NGX_FILE_OWNER_ACCESS 0
|
||||
|
||||
|
||||
#define ngx_open_tempfile(name, persistent, access) \
|
||||
CreateFile((const char *) name, \
|
||||
GENERIC_READ|GENERIC_WRITE, \
|
||||
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \
|
||||
NULL, \
|
||||
CREATE_NEW, \
|
||||
persistent ? 0: \
|
||||
FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE, \
|
||||
NULL);
|
||||
|
||||
ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent,
|
||||
ngx_uint_t access);
|
||||
#define ngx_open_tempfile_n "CreateFile()"
|
||||
|
||||
|
||||
@@ -119,11 +115,11 @@ ssize_t ngx_write_console(ngx_fd_t fd, void *buf, size_t size);
|
||||
#define NGX_LINEFEED CRLF
|
||||
|
||||
|
||||
#define ngx_delete_file(name) DeleteFile((const char *) name)
|
||||
ngx_int_t ngx_delete_file(u_char *name);
|
||||
#define ngx_delete_file_n "DeleteFile()"
|
||||
|
||||
|
||||
#define ngx_rename_file(o, n) MoveFile((const char *) o, (const char *) n)
|
||||
ngx_int_t ngx_rename_file(u_char *from, u_char *to);
|
||||
#define ngx_rename_file_n "MoveFile()"
|
||||
ngx_err_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);
|
||||
|
||||
@@ -174,8 +170,12 @@ void ngx_close_file_mapping(ngx_file_mapping_t *fm);
|
||||
|
||||
u_char *ngx_realpath(u_char *path, u_char *resolved);
|
||||
#define ngx_realpath_n ""
|
||||
#define ngx_getcwd(buf, size) GetCurrentDirectory(size, (char *) buf)
|
||||
|
||||
|
||||
size_t ngx_getcwd(u_char *buf, size_t size);
|
||||
#define ngx_getcwd_n "GetCurrentDirectory()"
|
||||
|
||||
|
||||
#define ngx_path_separator(c) ((c) == '/' || (c) == '\\')
|
||||
|
||||
#define NGX_HAVE_MAX_PATH 1
|
||||
@@ -194,19 +194,19 @@ ngx_int_t ngx_close_dir(ngx_dir_t *dir);
|
||||
#define ngx_close_dir_n "FindClose()"
|
||||
|
||||
|
||||
#define ngx_create_dir(name, access) CreateDirectory((const char *) name, NULL)
|
||||
ngx_int_t ngx_create_dir(u_char *name, ngx_uint_t access);
|
||||
#define ngx_create_dir_n "CreateDirectory()"
|
||||
|
||||
|
||||
#define ngx_delete_dir(name) RemoveDirectory((const char *) name)
|
||||
ngx_int_t ngx_delete_dir(u_char *name);
|
||||
#define ngx_delete_dir_n "RemoveDirectory()"
|
||||
|
||||
|
||||
#define ngx_dir_access(a) (a)
|
||||
|
||||
|
||||
#define ngx_de_name(dir) ((u_char *) (dir)->finddata.cFileName)
|
||||
#define ngx_de_namelen(dir) ngx_strlen((dir)->finddata.cFileName)
|
||||
#define ngx_de_name(dir) (dir)->name
|
||||
#define ngx_de_namelen(dir) (dir)->namelen
|
||||
|
||||
ngx_int_t ngx_de_info(u_char *name, ngx_dir_t *dir);
|
||||
#define ngx_de_info_n "dummy()"
|
||||
|
||||
Reference in New Issue
Block a user