2 files changed, 58 insertions, 1 deletions
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 1352cfea..dd2d3154 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -37,7 +37,10 @@ hammer_OBJECTS = $(hammer_SOURCES:.cc=.lo)
 hammer_LDADD = -L. -lOpenAxiom
 
 libOpenAxiom_HEADERS = storage.H hash-table.H string-pool.H sexpr.H
-libOpenAxiom_SOURCES = storage.cc string-pool.cc sexpr.cc command.cc
+libOpenAxiom_SOURCES = \
+	storage.cc string-pool.cc sexpr.cc command.cc \
+	filesystem.cc
+
 libOpenAxiom_OBJECTS = $(libOpenAxiom_SOURCES:.cc=.lo)
 
 oa_public_headers = storage hash-table string-pool sexpr
diff --git a/src/utils/filesystem.cc b/src/utils/filesystem.cc
new file mode 100644
index 00000000..eca8bf29
--- /dev/null
+++ b/src/utils/filesystem.cc
@@ -0,0 +1,54 @@
+// Copyright (C) 2011, Gabriel Dos Reis.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     - Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//
+//     - Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in
+//       the documentation and/or other materials provided with the
+//       distribution.
+//
+//     - Neither the name of The Numerical Algorithms Group Ltd. nor the
+//       names of its contributors may be used to endorse or promote products
+//       derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// --% Author: Gabriel Dos Reis.
+
+
+#include "open-axiom.h"
+
+namespace OpenAxiom {
+   Filesystem::Filesystem(const std::string& d)
+         : root(d),
+           alg(d + "/algebra"),
+           db(alg)
+   { }
+
+   std::string Filesystem::sysdir() const { return root; }
+
+   std::string Filesystem::algdir() const { return alg; }
+
+   std::string Filesystem::dbdir() const { return db; }
+
+   std::string
+   database_filepath(const Filesystem& fs, const std::string& file) {
+      return fs.dbdir() + "/" + file + ".daase";
+   }
+}