Merge branch 'unicode'.

There are some issues left, like incorrect wrapping in some cases, but
we can fix them later.

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/package.cc b/crawl-ref/source/package.cc
index 7c3c50b608..70aadaf14c 100644
--- a/crawl-ref/source/package.cc
+++ b/crawl-ref/source/package.cc
@@ -94,7 +94,7 @@ package::package(const char* file, bool writeable, bool empty)
 
     if (empty)
     {
-        fd = open(file, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0666);
+        fd = open_u(file, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0666);
         if (fd == -1)
             sysfail("can't create save file (%s)", file);
 
@@ -109,7 +109,7 @@ package::package(const char* file, bool writeable, bool empty)
     }
     else
     {
-        fd = open(file, (writeable? O_RDWR : O_RDONLY) | O_BINARY, 0666);
+        fd = open_u(file, (writeable? O_RDWR : O_RDONLY) | O_BINARY, 0666);
         if (fd == -1)
             sysfail("can't open save file (%s)", file);
 
@@ -563,7 +563,7 @@ void package::unlink()
     abort();
     close(fd);
     fd = -1;
-    ::unlink(filename.c_str());
+    ::unlink_u(filename.c_str());
 }