Mercurial > hg > nginx
changeset 2769:9d986c4e796f
introduce ngx_write_console() to support OEM code pages
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 28 Apr 2009 15:05:27 +0000 |
parents | e4a4c889694f |
children | e70ac6e13f31 |
files | src/core/ngx_log.c src/os/unix/ngx_files.h src/os/win32/ngx_files.c src/os/win32/ngx_files.h |
diffstat | 4 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_log.c Tue Apr 28 06:20:12 2009 +0000 +++ b/src/core/ngx_log.c Tue Apr 28 15:05:27 2009 +0000 @@ -152,7 +152,7 @@ (void) ngx_sprintf(msg, "[%V]: ", &err_levels[level]); - (void) ngx_write_fd(ngx_stderr, msg, p - msg); + (void) ngx_write_console(ngx_stderr, msg, p - msg); } @@ -224,7 +224,7 @@ ngx_linefeed(p); - (void) ngx_write_fd(ngx_stderr, errstr, p - errstr); + (void) ngx_write_console(ngx_stderr, errstr, p - errstr); }
--- a/src/os/unix/ngx_files.h Tue Apr 28 06:20:12 2009 +0000 +++ b/src/os/unix/ngx_files.h Tue Apr 28 15:05:27 2009 +0000 @@ -113,6 +113,10 @@ #define ngx_write_fd_n "write()" + +#define ngx_write_console ngx_write_fd + + #define ngx_linefeed(p) *p++ = LF; #define NGX_LINEFEED_SIZE 1
--- a/src/os/win32/ngx_files.c Tue Apr 28 06:20:12 2009 +0000 +++ b/src/os/win32/ngx_files.c Tue Apr 28 15:05:27 2009 +0000 @@ -232,6 +232,21 @@ } +ssize_t +ngx_write_console(ngx_fd_t fd, void *buf, size_t size) +{ + u_long n; + + (void) CharToOemBuff(buf, buf, size); + + if (WriteFile(fd, buf, size, &n, NULL) != 0) { + return (size_t) n; + } + + return -1; +} + + ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log) {
--- a/src/os/win32/ngx_files.h Tue Apr 28 06:20:12 2009 +0000 +++ b/src/os/win32/ngx_files.h Tue Apr 28 15:05:27 2009 +0000 @@ -98,6 +98,9 @@ #define ngx_write_fd_n "WriteFile()" +ssize_t ngx_write_console(ngx_fd_t fd, void *buf, size_t size); + + #define ngx_linefeed(p) *p++ = CR; *p++ = LF; #define NGX_LINEFEED_SIZE 2