X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=24d77eb79dbd2ab0862b2b7012b73babde542c93;hp=6353fbe79df9b7b38f92d6e6c6fba1fa80399f5b;hb=07ab37b55e1bf4ad7ef65fd25db84fa2a5f50f56;hpb=50e03ce10c3bab1c43e1e68dca3b0471d63807d9

diff --git a/dss.c b/dss.c
index 6353fbe..24d77eb 100644
--- a/dss.c
+++ b/dss.c
@@ -1060,17 +1060,36 @@ static int handle_sigchld(void)
 	return -E_BUG;
 }
 
+/* also checks if . is a mountpoint, if --mountpoint was given */
 static int change_to_dest_dir(void)
 {
 	int ret;
 	const char *dd = OPT_STRING_VAL(DSS, DEST_DIR);
+	struct stat dot, dotdot;
 
 	DSS_INFO_LOG(("changing cwd to %s\n", dd));
-	if (chdir(dd) >= 0)
-		return 1;
-	ret = -ERRNO_TO_DSS_ERROR(errno);
-	DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
-	return ret;
+	if (chdir(dd) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
+		return ret;
+	}
+	if (!OPT_GIVEN(DSS, MOUNTPOINT))
+		return 0;
+	if (stat(".", &dot) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not stat .\n"));
+		return ret;
+	}
+	if (stat("..", &dotdot) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not stat ..\n"));
+		return ret;
+	}
+	if (dot.st_dev == dotdot.st_dev && dot.st_ino != dotdot.st_ino) {
+		DSS_ERROR_LOG(("mountpoint check failed for %s\n", dd));
+		return -E_MOUNTPOINT;
+	}
+	return 1;
 }
 
 static int check_config(void)
@@ -1690,13 +1709,17 @@ static int com_ls(void)
 	int i;
 	struct snapshot_list sl;
 	struct snapshot *s;
+	int64_t now = get_current_time();
 
 	dss_get_snapshot_list(&sl);
 	FOR_EACH_SNAPSHOT(s, i, &sl) {
-		int64_t d = 0;
+		int64_t d;
 		if (s->flags & SS_COMPLETE)
 			d = (s->completion_time - s->creation_time) / 60;
-		dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval, s->name, d/60, d%60);
+		else
+			d = (now - s->creation_time) / 60;
+		dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval,
+			s->name, d / 60, d % 60);
 	}
 	free_snapshot_list(&sl);
 	return 1;