safe_io: do not set ending \0 in safe_read_file()

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/common/safe_io.c b/src/common/safe_io.c
index 492234972812a73b159979038f783e3fe9014e18..76fd25aca1229951068a5c1989c5f55d1b21d7f1 100644 (file)
--- a/src/common/safe_io.c
+++ b/src/common/safe_io.c
@@ -216,7 +216,7 @@ int safe_read_file(const char *base, const char *file,
   if (fd < 0) {
     return -errno;
   }
-  len = safe_read(fd, val, vallen - 1);
+  len = safe_read(fd, val, vallen);
   if (len < 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return len;
@@ -224,6 +224,5 @@ int safe_read_file(const char *base, const char *file,
   // close sometimes returns errors, but only after write()
   VOID_TEMP_FAILURE_RETRY(close(fd));
 
-  val[len] = 0;
   return len;
 }

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index c114a9c7b9e07ae1581cac5da70daba14f527953..de1f5d608387d8b12583d9564526672b738e7516 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -529,6 +529,11 @@ unittest_context_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL)
 unittest_context_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 check_PROGRAMS += unittest_context
 
+unittest_safe_io_SOURCES = test/common/test_safe_io.cc
+unittest_safe_io_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+unittest_safe_io_CXXFLAGS = $(UNITTEST_CXXFLAGS)
+check_PROGRAMS += unittest_safe_io
+
 unittest_heartbeatmap_SOURCES = test/heartbeat_map.cc
 unittest_heartbeatmap_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
 unittest_heartbeatmap_CXXFLAGS = $(UNITTEST_CXXFLAGS)

diff --git a/src/test/common/test_safe_io.cc b/src/test/common/test_safe_io.cc
new file mode 100644 (file)
index 0000000..b54437d
--- /dev/null
+++ b/src/test/common/test_safe_io.cc
@@ -0,0 +1,37 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include <algorithm>
+#include <cstring>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "common/safe_io.h"
+
+#include "gtest/gtest.h"
+
+
+TEST(SafeIO, safe_read_file) {
+  const char *fname = "safe_read_testfile";
+  ::unlink(fname);
+  int fd = ::open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
+  ASSERT_NE(fd, -1);
+  const char buf[] = "0123456789";
+  for (int i = 0; i < 8; i++) {
+    ASSERT_EQ(sizeof(buf), write(fd, buf, sizeof(buf)));
+  }
+  ::close(fd);
+  char rdata[80];
+  ASSERT_EQ(sizeof(rdata),
+           safe_read_file(".", fname, rdata, sizeof(rdata)));
+  for (char *p = rdata, *end = rdata+sizeof(rdata); p < end; p+=sizeof(buf)) {
+    ASSERT_EQ(0, std::memcmp(p, buf, std::min(size_t(end-p), sizeof(buf))));
+  }
+  ::unlink(fname);
+}
+
+// Local Variables:
+// compile-command: "cd ../.. ;
+//   make unittest_safe_io &&
+//   ./unittest_safe_io"
+// End: