tor

commit 2f872f9762128228e98f74bf7cb53aed54aee088
parent 4c0e434f33d937f43b49dc707718d73e5aea23b7
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 28 Mar 2018 14:47:05 -0400

Merge remote-tracking branch 'hello71/bug25398'

Diffstat:
A
changes/bug25398
 | 
2
++
M
src/common/compat.c
 | 
36
++----------------------------------

2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/changes/bug25398 b/changes/bug25398
@@ -0,0 +1,2 @@
+  o Minor bugfixes (portability):
+    - Remove uncompilable tor_mmap_file fallback. Fixes bug 25398.
diff --git a/src/common/compat.c b/src/common/compat.c
@@ -402,40 +402,8 @@ tor_munmap_file(tor_mmap_t *handle)
   return 0;
 }
 #else
-tor_mmap_t *
-tor_mmap_file(const char *filename)
-{
-  struct stat st;
-  char *res = read_file_to_str(filename, RFTS_BIN|RFTS_IGNORE_MISSING, &st);
-  tor_mmap_t *handle;
-  if (! res)
-    return NULL;
-  handle = tor_malloc_zero(sizeof(tor_mmap_t));
-  handle->data = res;
-  handle->size = st.st_size;
-  return handle;
-}
-
-/** Unmap the file mapped with tor_mmap_file(), and return 0 for success
- * or -1 for failure.
- */
-
-int
-tor_munmap_file(tor_mmap_t *handle)
-{
-  char *d = NULL;
-  if (handle == NULL)
-    return 0;
-
-  d = (char*)handle->data;
-  tor_free(d);
-  memwipe(handle, 0, sizeof(tor_mmap_t));
-  tor_free(handle);
-
-  /* Can't fail in this mmap()/munmap()-free case */
-  return 0;
-}
-#endif /* defined(COMPAT_HAS_MMAN_AND_PAGESIZE) || ... || ... */
+#error "cannot implement tor_mmap_file"
+#endif /* defined(HAVE_MMAP) || ... || ... */
 
 /** Replacement for snprintf.  Differs from platform snprintf in two
  * ways: First, always NUL-terminates its output.  Second, always