fixed issues #3 and #10

src/tomb

@@ -404,10 +404,17 @@ create_tomb() {
 	exit 1
     fi
 
+	local tombkey="${tombdir}/${tombname}.tomb.key"
+	local rnd=$RANDOM
+	if [ -e "${tomkey}" ]; then
+		notice "Key file ${tombkey} already exists!"
+		notice "Renaming to ${tombdir}/${tombname}.tomb.$rnd.key"
+		tombkey="${tombdir}/${tombname}.tomb.$rnd.key"
+	fi
 
     print "${tombpass}" | gpg \
 	--openpgp --batch --no-options --no-tty --passphrase-fd 0 2>/dev/null \
-	-o "${tombdir}/${tombname}.tomb.key" -c -a ${keytmp}/tomb.tmp
+	-o "${tombkey}" -c -a ${keytmp}/tomb.tmp
 
     # if [ $? != 0 ]; then
     # 	error "setting password failed: gnupg returns 2"
@@ -1071,7 +1078,12 @@ main () {
 		print "[D] Tomb invoked with args \"${(f)@}\" "
 		print "[D] running on `date`"
 		DEBUG=1; shift 1 ;;
-	      -s) SIZE=$2; shift 2 ;;
+	      -s) test=`awk '/^[0-9]+$/' <<< "$2"`
+			  if [ -z "$test" ]; then  
+				error "Size value must be a number!"
+				return 1
+			  fi
+			  SIZE=$2; shift 2 ;;
 	      -k) KEY=$2; shift 2 ;;
 	      -n) NOBIND=1; shift 1 ;;
 	      -o) MOUNTOPTS=$2; shift 2;;