Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-04-28 19:05:27 +0400
committerIgor Sysoev <igor@sysoev.ru>2009-04-28 19:05:27 +0400
commit9d4a8d911155a1de672547c4774977993c083cc0 (patch)
tree004e0d5f08ac1b276f4cfd8eb377401893b11595 /src/os
parentbffd3196cfd7f262b659fb0b2cab98822d7f79c5 (diff)
introduce ngx_write_console() to support OEM code pages
Diffstat (limited to 'src/os')
-rw-r--r--src/os/unix/ngx_files.h4
-rw-r--r--src/os/win32/ngx_files.c15
-rw-r--r--src/os/win32/ngx_files.h3
3 files changed, 22 insertions, 0 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 8608e173d..cf5c3ed91 100644
--- 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 79f42b13b..e10bce3ae 100644
--- 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 2abaaf5e2..af56800d5 100644
--- 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