iscmd: supplement -x with -d test not a dir

src/filters/rclabw

@@ -15,6 +15,7 @@ LC_ALL=C ; export LC_ALL
 progname="rclabw"
 filetype=abiword
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -38,10 +39,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcldjvu

@@ -35,6 +35,7 @@ filetype=dejavu
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -58,10 +59,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcldoc

@@ -28,6 +28,7 @@ decoder="antiword -t -i 1 -m UTF-8"
 #decoder="wvWare -1 -c UTF-8"
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -51,10 +52,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcldvi

@@ -32,6 +32,7 @@ filetype=dvi
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -55,10 +56,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclflac

@@ -11,6 +11,7 @@ progname="rclflac"
 filetype=media
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -34,10 +35,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }
@@ -70,6 +71,9 @@ then
   senderror INPUTNOSUCHFILE "$infile"
 fi
 
+# protect access to our temp files and directories
+umask 77
+
 ##############################################################################
 # !! Leave the following line unmodified !
 #ENDRECFILTCOMMONCODE

src/filters/rclgaim

@@ -21,6 +21,7 @@ filetype="gaim log"
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -44,10 +45,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclid3

@@ -11,6 +11,7 @@ progname="rclid3"
 filetype=audio
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -34,10 +35,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclkwd

@@ -19,6 +19,7 @@ filetype=kword
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -42,10 +43,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcllyx

@@ -34,6 +34,7 @@ filetype=lyx
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -57,10 +58,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclman

@@ -23,6 +23,7 @@ filetype=man
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -46,10 +47,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclogg

@@ -11,6 +11,7 @@ progname="rclogg"
 filetype=ogg
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -34,10 +35,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }
@@ -70,6 +71,9 @@ then
   senderror INPUTNOSUCHFILE "$infile"
 fi
 
+# protect access to our temp files and directories
+umask 77
+
 ##############################################################################
 # !! Leave the following line unmodified !
 #ENDRECFILTCOMMONCODE

src/filters/rclopxml

@@ -12,6 +12,7 @@ LC_ALL=C ; export LC_ALL
 progname=rclopxml
 filetype=openxml
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -35,10 +36,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclpdf

@@ -36,6 +36,7 @@ filetype=pdf
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -59,10 +60,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclppt

@@ -33,6 +33,7 @@ filetype=powerpoint
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -56,10 +57,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclps

@@ -30,6 +30,7 @@ filetype=postscript
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -53,10 +54,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclpurple

@@ -21,6 +21,7 @@ filetype="purple/pidgin log"
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -44,10 +45,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclrtf

@@ -16,6 +16,7 @@ filetype=rtf
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -39,10 +40,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclscribus

@@ -23,6 +23,7 @@ filetype=Scribus
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -46,10 +47,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclsiduxman

@@ -16,6 +16,7 @@ LC_ALL=C ; export LC_ALL
 progname="rclsiduxman"
 filetype="sidux manual htm"
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -39,10 +40,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclsoff

@@ -21,6 +21,7 @@ filetype=openoffice
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -44,10 +45,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclsvg

@@ -15,6 +15,7 @@ LC_ALL=C ; export LC_ALL
 progname="rclsvg"
 filetype=svg
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -38,10 +39,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcltex

@@ -11,6 +11,7 @@ progname="rcltex"
 filetype=TeX
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -34,10 +35,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rcltext

@@ -17,6 +17,7 @@ LC_ALL=C ; export LC_ALL
 progname="rcltext"
 filetype=text
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -40,10 +41,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclwpd

@@ -14,6 +14,7 @@ progname="rclwpd"
 filetype=wpd
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -37,10 +38,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/rclxls

@@ -34,6 +34,7 @@ filetype=excel
 
 
 
+
 #RECFILTCOMMONCODE
 ##############################################################################
 # !! Leave the previous line unmodified!! Code imported from the
@@ -57,10 +58,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }

src/filters/recfiltcommon

@@ -22,10 +22,10 @@ iscmd()
     cmd=$1
     case $cmd in
     */*)
-	if test -x $cmd ; then return 0; else return 1; fi ;;
+	if test -x $cmd -a ! -d $cmd ; then return 0; else return 1; fi ;;
     *)
       oldifs=$IFS; IFS=":"; set -- $PATH; IFS=$oldifs
-      for d in $*;do test -x $d/$cmd && return 0;done
+      for d in $*;do test -x $d/$cmd -a ! -d $d/$cmd && return 0;done
       return 1 ;;
     esac
 }