From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 9 Aug 2011 12:50:24 +0000 (+0200)
Subject: - added input checks
X-Git-Tag: v0.1.3~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ec946e2352eb5c17fc5c38ed2bf560b3ab1e183;p=thirdparty%2Fsnapper.git

- added input checks
---

diff --git a/tools/snapper.cc b/tools/snapper.cc
index 98c40699..8169cb7a 100644
--- a/tools/snapper.cc
+++ b/tools/snapper.cc
@@ -311,8 +311,8 @@ command_list()
 		TableRow row;
 		row.add(decString(it1->getNum()));
 		row.add(decString(it2->getNum()));
-		row.add(it1->isCurrent() ? "" : datetime(it1->getDate(), false, false));
-		row.add(it2->isCurrent() ? "" : datetime(it2->getDate(), false, false));
+		row.add(datetime(it1->getDate(), false, false));
+		row.add(datetime(it2->getDate(), false, false));
 		row.add(it1->getDescription());
 		table.add(row);
 	    }
@@ -451,6 +451,11 @@ command_modify()
     }
 
     Snapshots::iterator snapshot = readNum(getopts.popArg());
+    if (snapshot->isCurrent())
+    {
+	cerr << _("Invalid snapshot.") << endl;
+	exit(EXIT_FAILURE);
+    }
 
     GetOpts::parsed_opts::const_iterator opt;
 
@@ -481,6 +486,12 @@ command_delete()
     while (getopts.hasArgs())
     {
 	Snapshots::iterator snapshot = readNum(getopts.popArg());
+	if (snapshot->isCurrent())
+	{
+	    cerr << _("Invalid snapshot.") << endl;
+	    exit(EXIT_FAILURE);
+	}
+
 	sh->deleteSnapshot(snapshot);
     }
 }
@@ -508,6 +519,12 @@ command_mount()
     while (getopts.hasArgs())
     {
 	Snapshots::iterator snapshot = readNum(getopts.popArg());
+	if (snapshot->isCurrent())
+	{
+	    cerr << _("Invalid snapshot.") << endl;
+	    exit(EXIT_FAILURE);
+	}
+
 	snapshot->mountFilesystemSnapshot();
     }
 }
@@ -535,6 +552,12 @@ command_umount()
     while (getopts.hasArgs())
     {
 	Snapshots::iterator snapshot = readNum(getopts.popArg());
+	if (snapshot->isCurrent())
+	{
+	    cerr << _("Invalid snapshot.") << endl;
+	    exit(EXIT_FAILURE);
+	}
+
 	snapshot->umountFilesystemSnapshot();
     }
 }