[tor-commits] [tor/master] Merge branch 'fs_refactor'

[nickm at torproject.org]

commit 000de2f2ac4f740be8351673691371d78a5da7e9
Merge: 211360371 3d606dddb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 14:45:17 2018 -0400

    Merge branch 'fs_refactor'

 .gitignore               |    2 +
 Makefile.am              |    2 +
 configure.ac             |    2 +-
 src/common/compat.c      |  601 ---------------------------
 src/common/compat.h      |   56 +--
 src/common/util.c        | 1030 ----------------------------------------------
 src/common/util.h        |   91 +---
 src/include.am           |    1 +
 src/lib/fdio/fdio.c      |    2 +-
 src/lib/fdio/fdio.h      |    2 +-
 src/lib/fs/.may_include  |   11 +
 src/lib/fs/dir.c         |  360 ++++++++++++++++
 src/lib/fs/dir.h         |   27 ++
 src/lib/fs/files.c       |  711 ++++++++++++++++++++++++++++++++
 src/lib/fs/files.h       |  100 +++++
 src/lib/fs/include.am    |   25 ++
 src/lib/fs/mmap.c        |  234 +++++++++++
 src/lib/fs/mmap.h        |   35 ++
 src/lib/fs/path.c        |  289 +++++++++++++
 src/lib/fs/path.h        |   24 ++
 src/lib/fs/userdb.c      |  132 ++++++
 src/lib/fs/userdb.h      |   20 +
 src/lib/log/include.am   |    7 +-
 src/lib/log/torlog.c     |    4 +-
 src/lib/log/win32err.c   |   56 +++
 src/lib/log/win32err.h   |   17 +
 src/lib/net/.may_include |    1 +
 src/lib/net/socket.c     |   44 ++
 src/lib/net/socket.h     |    3 +
 29 files changed, 2119 insertions(+), 1770 deletions(-)

diff --cc Makefile.am
index c10790c52,f43b2ad1f..ef727e01f
--- a/Makefile.am
+++ b/Makefile.am
@@@ -40,8 -40,8 +40,9 @@@ endi
  # "Common" libraries used to link tor's utility code.
  TOR_UTIL_LIBS = \
  	src/common/libor.a \
+         src/lib/libtor-fs.a \
          src/lib/libtor-sandbox.a \
 +	src/lib/libtor-container.a \
  	src/lib/libtor-net.a \
          src/lib/libtor-log.a \
          src/lib/libtor-lock.a \
@@@ -58,8 -58,8 +59,9 @@@
  # and tests)
  TOR_UTIL_TESTING_LIBS = \
  	src/common/libor-testing.a \
+         src/lib/libtor-fs-testing.a \
          src/lib/libtor-sandbox-testing.a \
 +	src/lib/libtor-container-testing.a \
  	src/lib/libtor-net-testing.a \
          src/lib/libtor-log-testing.a \
          src/lib/libtor-lock-testing.a \