libtests: Include the Unicode test files directly.

[disorder] / server / mount.c

diff --git a/server/mount.c b/server/mount.c
index 506b66374c0dba121349e8783e7c12a4b16cc01f..6fbd2be086e817a36a283bc45375409dc14d2883 100644 (file)
--- a/server/mount.c
+++ b/server/mount.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2010 Richard Kettlewell
+ * Copyright (C) 2010, 2011 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
@@ -40,7 +40,10 @@ static int compare_fsstat(const void *av, const void *bv) {
 }
 #endif
 
+#if HAVE_GETFSSTAT || defined PATH_MTAB
 void periodic_mount_check(ev_source *ev_) {
+  if(!config->mount_rescan)
+    return;
 #if HAVE_GETFSSTAT
   /* On OS X, we keep track of the hash of the kernel's mounted
    * filesystem list */
@@ -74,8 +77,46 @@ void periodic_mount_check(ev_source *ev_) {
   memcpy(last, current, sizeof last);
   first = 0;
   gcry_md_close(h);
+#elif defined PATH_PROC_MOUNTS
+  /* On Linux we hash /proc/mounts */
+  static int first = 1;
+  static unsigned char last[20];
+
+  unsigned char *current;
+  int fd = -1, n;
+  gcrypt_hash_handle h = 0;
+  gcry_error_t e;
+  char buffer[1024];
+
+  if((e = gcry_md_open(&h, GCRY_MD_SHA1, 0))) {
+    disorder_error(0, "gcry_md_open: %s", gcry_strerror(e));
+    goto done;
+  }
+  if((fd = open(PATH_PROC_MOUNTS, O_RDONLY)) < 0) {
+    disorder_error(errno, "open %s", PATH_PROC_MOUNTS);
+    goto done;
+  }
+  for(;;) {
+    n = read(fd, buffer, sizeof buffer);
+    if(n > 0)
+      gcry_md_write(h, buffer, n);
+    else if(n == 0)
+      break;
+    else if(errno != EINTR) {
+      disorder_error(errno, "reading %s", PATH_PROC_MOUNTS);
+      goto done;
+    }
+  }
+  current = gcry_md_read(h, GCRY_MD_SHA1);
+  if(!first && memcmp(current, last, sizeof last))
+    trackdb_rescan(ev_, 1/*check*/, 0, 0);
+  memcpy(last, current, sizeof last);
+  first = 0;
+ done:
+  if(h) gcry_md_close(h);
+  if(fd != -1) close(fd);
 #elif defined PATH_MTAB
-  /* On Linux we keep track of the modification time of /etc/mtab */
+  /* As a further alternative we track the modification time of /etc/mtab */
   static time_t last_mount;
   struct stat sb;
   
@@ -86,6 +127,10 @@ void periodic_mount_check(ev_source *ev_) {
   }
 #endif
 }
+#else
+void periodic_mount_check(ev_source attribute((unused)) *ev_ ) {
+}
+#endif
 
 /*
 Local Variables: