--- paxtest-0.9.9.orig/genpaxtest
+++ paxtest-0.9.9/genpaxtest
@@ -16,23 +16,27 @@
 cat << __here__ > paxtest
 #!/bin/sh
 
-if [ \$# = 1 ]
+if [ \$# = 1 -o \$# = 2 ]
 then
 	if [ "\$1" = "kiddie" ]
 	then
 		PAXTEST_MODE=0
+                shift
 	elif [ "\$1" = "blackhat" ]
 	then
 		PAXTEST_MODE=1
+                shift
 	else
-		echo "usage: paxtest [kiddie|blackhat]"
+		echo "usage: paxtest [kiddie|blackhat] [logfile]"
 		exit 1
 	fi
 else
-	echo "usage: paxtest [kiddie|blackhat]"
+	echo "usage: paxtest [kiddie|blackhat] [logfile]"
 	exit 1
 fi
 
+LOG=\$HOME/paxtest.log
+[ -n "\$1" ]  && LOG=\$1
 export PAXTEST_MODE
 
 if [ "\${LD_LIBRARY_PATH}" = "" ]
@@ -43,26 +47,33 @@
 fi
 export LD_LIBRARY_PATH
 
-cat <<__end__ | tee paxtest.log
+cat <<__end__ | tee \$LOG
 PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
 Released under the GNU Public Licence version 2 or later
 
 __end__
 
-echo "Mode: \$1" >>paxtest.log
-uname -a >>paxtest.log
-echo >>paxtest.log
+echo -n "Mode: " >>\$LOG
+if [ "\$PAXTEST_MODE" -eq 0 ] ; then
+    echo -n "Kiddie" >>\$LOG
+fi
+if [ "\$PAXTEST_MODE" -eq 1 ] ; then
+    echo -n "Blackhat" >>\$LOG
+fi
+echo >>\$LOG
+uname -a >>\$LOG
+echo >>\$LOG
 
-echo 'Writing output to paxtest.log'
+echo "Writing output to \$LOG"
 echo 'It may take a while for the tests to complete'
 
 for i in $*
 do
 	${RUNDIR}/\$i
-done >>paxtest.log 2>&1
+done >>\$LOG 2>&1
 
 echo "Test results:"
-cat paxtest.log
+cat \$LOG
 
 echo