X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.kss.in;h=28cda06cba4a9fb93d2120b44c05103c9b0f7ed6;hb=bc7b7a8eb122206d239ec0e693676bcce31be1aa;hp=974ecc2e5ae3e6b7f05d5ad3877fa71f8ecd5d7b;hpb=723c9eeee862766a1534b2ce17b78adbfac1c3be;p=xscreensaver

diff --git a/driver/xscreensaver.kss.in b/driver/xscreensaver.kss.in
index 974ecc2e..28cda06c 100755
--- a/driver/xscreensaver.kss.in
+++ b/driver/xscreensaver.kss.in
@@ -58,23 +58,27 @@ while [ -n "$1" ]; do
       exit
       ;;
 
-    -test)
-      # I was unable to grep stdout because xscreensaver nabs it. But I was able
-      # to output it to a file, and grep the file.
-      TEMP_FILE=/tmp/xsc.$RANDOM
-      $bindir/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE &
-      $bindir/xscreensaver-command -activate
-      while true; do
-        ExitNow=$(grep -E -c unblanking\|already $TEMP_FILE)
-        if [ $ExitNow != 0 ]; then
-          kill $!
-          rm $TEMP_FILE
-          exit
-        fi
-        sleep 1
-      done
-      exit	# It should never get this far.
-      ;;
+# I don't know what "-test" was supposed to do, but I suspect the
+# answer is "something stupid."  Also, it uses /tmp insecurely.
+# So let's just comment it out, shall we?  -jwz, 10-Nov-2003.
+#
+#    -test)
+#      # I was unable to grep stdout because xscreensaver nabs it. But I was able
+#      # to output it to a file, and grep the file.
+#      TEMP_FILE=/tmp/xsc.$RANDOM
+#      $bindir/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE &
+#      $bindir/xscreensaver-command -activate
+#      while true; do
+#        ExitNow=$(grep -E -c unblanking\|already $TEMP_FILE)
+#        if [ $ExitNow != 0 ]; then
+#          kill $!
+#          rm $TEMP_FILE
+#          exit
+#        fi
+#        sleep 1
+#      done
+#      exit	# It should never get this far.
+#      ;;
 
 #    -corners)
 #      echo "Not yet supported"
@@ -87,9 +91,9 @@ while [ -n "$1" ]; do
       Install="TRUE"
       ;;
     -lock)
-      if [ ! -f "/etc/shadow" ]; then      
+#      if [ ! -f "/etc/shadow" ]; then      
         lockmode="-lock-mode"
-      fi
+#      fi
       ;;
 #    -allow-root)
 #      echo "Not yet supported"
@@ -124,7 +128,7 @@ if [ -n "$Install" ] ; then
   wait $!                                               # Do not exit, just wait for signals.
 
 else
-  echo "Usage: ./xscreensaver.kss -install|-setup|-test|-desc [-delay num] [-lock] [-nice num]"
+  echo "Usage: ./xscreensaver.kss -install|-setup|-desc [-delay num] [-lock] [-nice num]"
 #  echo "  -corners xxxx     Placing cursor in corner performs action:"
 #  echo "                     x = i  no action (ignore)"
 #  echo "                     x = s  save screen"
@@ -139,7 +143,7 @@ else
   echo "  -preview wid      Run in the specified XWindow"
 #  echo "  -inroot           Run in the root window"
   echo "  -setup            Setup screen saver"
-  echo "  -test             Invoke the screen saver immediately"
+#  echo "  -test             Invoke the screen saver immediately"
 fi
 
 # End of script - "xscreensaver.kss"