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

diff --git a/dss.c b/dss.c
index 6353fbe..bd9e577 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)