X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=d653144a66520082f9ffd0472d59533a59c4f025;hb=1f0d91977b69c4e284de655e958830ead163424c;hp=d52f4cdf45c9c76002b408d0ed446652c3d092f9;hpb=d9d59cd6e90cb745d8886d6376a0ed97eb6761ef;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/backupninja b/backupninja
index d52f4cd..d653144 100755
--- a/backupninja
+++ b/backupninja
@@ -131,6 +131,23 @@ function setsection() {
 	CURRENT_SECTION=$1
 }
 
+
+#
+# create a temporary file in a secure way.
+#
+function maketemp() {
+	if [ -x /bin/mktemp ]
+	then
+		local tempfile=`mktemp /tmp/$1.XXXXXXXX`
+	else
+		DATE=`date`
+		sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
+		local tempfile=/tmp/$1.$sectmp
+	fi
+	echo $tempfile
+}
+
+
 #
 # sets a global var with name equal to $1
 # to the value of the configuration parameter $1
@@ -305,14 +322,7 @@ function process_action() {
 	let "actions_run += 1"
 
 	# call the handler:
-	[ if -x /bin/mktemp ]
-	then
-		local bufferfile=`mktemp /tmp/backupninja.buffer.XXXXXXXX`
-	else
-		DATE=`date`
-		sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
-		local bufferfile=/tmp/backupninja.buffer.$sectmp
-	fi
+	local bufferfile=`maketemp backupninja.buffer`
 	echo "" > $bufferfile
 	echo_debug_msg=1
 	(
@@ -486,7 +496,7 @@ errormsg=""
 if [ "$singlerun" ]; then
 	files=$singlerun
 else
-	files=`find $configdirectory ! -name '.*.swp' -mindepth 1 | sort -n`
+	files=`find $configdirectory -mindepth 1 ! -name '.*.swp' | sort -n`
 fi
 
 for file in $files; do