From 5cae1b0d633e0507cf377e2664bba919ec48745a Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Wed, 10 Oct 2012 19:08:57 +0100
Subject: Update KenLM

---
 klm/util/file.cc       | 27 +++++++++++++++++++++------
 klm/util/file.hh       |  6 +++---
 klm/util/file_piece.cc |  2 ++
 3 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'klm/util')

diff --git a/klm/util/file.cc b/klm/util/file.cc
index ff5e64c9..6bf879ac 100644
--- a/klm/util/file.cc
+++ b/klm/util/file.cc
@@ -6,6 +6,7 @@
 #include <cstdio>
 #include <iostream>
 
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -111,6 +112,11 @@ void WriteOrThrow(int fd, const void *data_void, std::size_t size) {
   }
 }
 
+void WriteOrThrow(FILE *to, const void *data, std::size_t size) {
+  assert(size);
+  if (1 != std::fwrite(data, size, 1, to)) UTIL_THROW(util::ErrnoException, "Short write; requested size " << size);
+}
+
 void FSyncOrThrow(int fd) {
 // Apparently windows doesn't have fsync?  
 #if !defined(_WIN32) && !defined(_WIN64)
@@ -148,6 +154,12 @@ std::FILE *FDOpenOrThrow(scoped_fd &file) {
   return ret;
 }
 
+std::FILE *FOpenOrThrow(const char *path, const char *mode) {
+  std::FILE *ret;
+  UTIL_THROW_IF(!(ret = fopen(path, mode)), util::ErrnoException, "Could not fopen " << path << " for " << mode);
+  return ret;
+}
+
 TempMaker::TempMaker(const std::string &prefix) : base_(prefix) {
   base_ += "XXXXXX";
 }
@@ -247,7 +259,9 @@ mkstemp_and_unlink(char *tmpl)
 
     /* Modified for windows and to unlink */
     //      fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, _S_IREAD | _S_IWRITE);
-    fd = _open (tmpl, _O_RDWR | _O_CREAT | _O_TEMPORARY | _O_EXCL | _O_BINARY, _S_IREAD | _S_IWRITE);
+    int flags = _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY;
+    flags |= _O_TEMPORARY;
+    fd = _open (tmpl, flags, _S_IREAD | _S_IWRITE);
     if (fd >= 0)
     {
       errno = save_errno;
@@ -265,17 +279,18 @@ mkstemp_and_unlink(char *tmpl)
 int
 mkstemp_and_unlink(char *tmpl) {
   int ret = mkstemp(tmpl);
-  if (ret == -1) return -1;
-  UTIL_THROW_IF(unlink(tmpl), util::ErrnoException, "Failed to delete " << tmpl);
+  if (ret != -1) {
+    UTIL_THROW_IF(unlink(tmpl), util::ErrnoException, "Failed to delete " << tmpl);
+  }
   return ret;
 }
 #endif
 
 int TempMaker::Make() const {
-  std::string copy(base_);
-  copy.push_back(0);
+  std::string name(base_);
+  name.push_back(0);
   int ret;
-  UTIL_THROW_IF(-1 == (ret = mkstemp_and_unlink(&copy[0])), util::ErrnoException, "Failed to make a temporary based on " << base_);
+  UTIL_THROW_IF(-1 == (ret = mkstemp_and_unlink(&name[0])), util::ErrnoException, "Failed to make a temporary based on " << base_);
   return ret;
 }
 
diff --git a/klm/util/file.hh b/klm/util/file.hh
index 8af1ff4f..185cb1f3 100644
--- a/klm/util/file.hh
+++ b/klm/util/file.hh
@@ -80,6 +80,7 @@ void ReadOrThrow(int fd, void *to, std::size_t size);
 std::size_t ReadOrEOF(int fd, void *to_void, std::size_t amount);
 
 void WriteOrThrow(int fd, const void *data_void, std::size_t size);
+void WriteOrThrow(FILE *to, const void *data, std::size_t size);
 
 void FSyncOrThrow(int fd);
 
@@ -90,6 +91,8 @@ void SeekEnd(int fd);
 
 std::FILE *FDOpenOrThrow(scoped_fd &file);
 
+std::FILE *FOpenOrThrow(const char *path, const char *mode);
+
 class TempMaker {
   public:
     explicit TempMaker(const std::string &prefix);
@@ -98,9 +101,6 @@ class TempMaker {
     int Make() const;
     std::FILE *MakeFile() const;
 
-    // This will force you to close the fd instead of leaving it open.  
-    std::string Name(scoped_fd &opened) const;
-
   private:
     std::string base_;
 };
diff --git a/klm/util/file_piece.cc b/klm/util/file_piece.cc
index 19a68728..280f438c 100644
--- a/klm/util/file_piece.cc
+++ b/klm/util/file_piece.cc
@@ -5,6 +5,8 @@
 #include "util/mmap.hh"
 #ifdef WIN32
 #include <io.h>
+#else
+#include <unistd.h>
 #endif // WIN32
 
 #include <iostream>
-- 
cgit v1.2.3