Store directories (normally) have to be mount points

This can be disabled with new options to store and store-pattern.

fixes #42

4 files changed, 43 insertions, 10 deletions

diff --git a/src/ConfDirective.cc b/src/ConfDirective.cc
index c10f762..7cef053 100644
--- a/src/ConfDirective.cc
+++ b/src/ConfDirective.cc
@@ -139,22 +139,43 @@ void ColorDirective::set_packed(ConfContext &cc, size_t n, int radix) const {
 
 // Global directives ----------------------------------------------------------
 
+size_t parseStoreArguments(const ConfContext &cc, bool &mounted) {
+   mounted = true;
+   size_t i = 1;
+   while(i < cc.bits.size() && cc.bits[i][0] == '-') {
+     if(cc.bits[i] == "--mounted")
+       mounted = true;
+     else if(cc.bits[i] == "--no-mounted")
+       mounted = false;
+     else
+       throw SyntaxError("unrecognized store option");
+      ++i;
+   }
+   if(i >= cc.bits.size())
+     throw SyntaxError("missing store path");
+   return i;
+}
+
 /** @brief The @c store directive */
 static const struct StoreDirective: public ConfDirective {
-  StoreDirective(): ConfDirective("store", 1, 1) {}
+  StoreDirective(): ConfDirective("store", 1, INT_MAX) {}
   void set(ConfContext &cc) const override {
-    cc.conf->stores[cc.bits[1]] = new Store(cc.bits[1]);
+    bool mounted;
+    size_t i = parseStoreArguments(cc, mounted);
+    cc.conf->stores[cc.bits[i]] = new Store(cc.bits[i], mounted);
   }
 } store_directive;
 
 /** @brief The @c store-pattern directive */
 static const struct StorePatternDirective: public ConfDirective {
-  StorePatternDirective(): ConfDirective("store-pattern", 1, 1) {}
+  StorePatternDirective(): ConfDirective("store-pattern", 1, INT_MAX) {}
   void set(ConfContext &cc) const override {
     std::vector<std::string> files;
-    globFiles(files, cc.bits[1], GLOB_NOCHECK);
+    bool mounted;
+    size_t i = parseStoreArguments(cc, mounted);
+    globFiles(files, cc.bits[i], GLOB_NOCHECK);
     for(auto &file: files)
-      cc.conf->stores[file] = new Store(file);
+      cc.conf->stores[file] = new Store(file, mounted);
   }
 } store_pattern_directive;
 
diff --git a/src/Store.cc b/src/Store.cc
index 5add94f..543c7cd 100644
--- a/src/Store.cc
+++ b/src/Store.cc
@@ -1,4 +1,4 @@
-// Copyright © 2011, 2012 Richard Kettlewell.
+// Copyright © 2011-13, 2015-18 Richard Kettlewell.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -34,6 +34,14 @@ void Store::identify() {
       return;                     // already identified
     if(stat(path.c_str(), &sb) < 0)
       throw BadStore("store '" + path + "' does not exist");
+    if(mounted) {
+      const std::string parent_path = path + "/..";
+      struct stat parent_sb;
+      if(stat(parent_path.c_str(), &parent_sb) < 0)
+        throw FatalStoreError("cannot stat '" + parent_path);
+      if(sb.st_dev == parent_sb.st_dev)
+        throw UnavailableStore("store '" + path + "' is not mounted");
+    }
     // Make sure backup devices are mounted
     preDeviceAccess();
     // Read the device name
diff --git a/src/Store.h b/src/Store.h
index 82a4058..d812719 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -1,5 +1,5 @@
 // -*-C++-*-
-// Copyright © 2011, 2012, 2014, 2015 Richard Kettlewell.
+// Copyright © 2011, 2012, 2014, 2015, 2018 Richard Kettlewell.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -32,7 +32,8 @@ public:
   /** @brief Constructor
    * @param path_ Location of store
    */
-  Store(const std::string &path_): path(path_) {}
+  Store(const std::string &path_, bool mounted_):
+    path(path_), mounted(mounted_) {}
 
   /** @brief Possible states */
   enum State {
@@ -43,9 +44,12 @@ public:
     Enabled = 2,
   };
 
-  /** @param Location of store */
+  /** @brief Location of store */
   std::string path;
 
+  /** @brief True if path must be a mount point */
+  bool mounted;
+
   /** @param Device mounted at this store
    *
    * Set to null pointer before checking, or if no device is mounted here
diff --git a/src/rsbackup.cc b/src/rsbackup.cc
index 8c6c0e1..e1896d2 100644
--- a/src/rsbackup.cc
+++ b/src/rsbackup.cc
@@ -58,7 +58,7 @@ int main(int argc, char **argv) {
       for(auto &s: command.stores) {
         auto it = config.stores.find(s);
         if(it == config.stores.end())
-          config.stores[s] = new Store(s);
+          config.stores[s] = new Store(s, false/*TODO*/);
         else
           it->second->state = Store::Enabled;
       }