introduce ngx_write_console() to support OEM code pages

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 3fb697b7d98298082134e208130e85346042a6c8..fe638781c5857ca69ce752529e4b97bfc7d6be57 100644 (file)
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -152,7 +152,7 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
 
     (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_log_stderr(ngx_err_t err, const char *fmt, ...)
 
     ngx_linefeed(p);
 
-    (void) ngx_write_fd(ngx_stderr, errstr, p - errstr);
+    (void) ngx_write_console(ngx_stderr, errstr, p - errstr);
 }
 
 

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 8608e173da9bdb3b19a67b22003a4d1dd637fbd0..cf5c3ed9170dcac16d9bfcb463309de39ef44d88 100644 (file)
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -113,6 +113,10 @@ ngx_write_fd(ngx_fd_t fd, void *buf, size_t n)
 
 #define ngx_write_fd_n           "write()"
 
+
+#define ngx_write_console        ngx_write_fd
+
+
 #define ngx_linefeed(p)          *p++ = LF;
 #define NGX_LINEFEED_SIZE        1
 

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 79f42b13b2f0eb4109bdb6f25cce338fcf4e7aa4..e10bce3aebb3f39af97e52d6cb3b2ab09a24180c 100644 (file)
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -232,6 +232,21 @@ ngx_write_fd(ngx_fd_t fd, void *buf, size_t size)
 }
 
 
+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)
 {

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 2abaaf5e2410506f422c9a7bb287186412960c27..af56800d5911cd7311cf62e93678f00e23938959 100644 (file)
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -98,6 +98,9 @@ ssize_t ngx_write_fd(ngx_fd_t fd, void *buf, size_t size);
 #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