antiword/antiword-0.37-can_2005_3126.patch

31 lines
998 B
Diff
Raw Normal View History

diff -ru antiword-0.37/Unix-only/KDE1-only/kantiword.sh antiword-0.37-secfix/Unix-only/KDE1-only/kantiword.sh
--- antiword-0.37/Unix-only/KDE1-only/kantiword.sh 2000-10-19 19:09:36.000000000 +0200
+++ antiword-0.37-secfix/Unix-only/KDE1-only/kantiword.sh 2006-01-18 10:57:42.000000000 +0100
@@ -19,8 +19,10 @@
else
tmp_dir="/tmp"
fi
-out_file=$tmp_dir"/antiword.$$.ps"
-err_file=$tmp_dir"/antiword.$$.err"
+out_file=`tempfile -d $tmp_dir` || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+err_file=`tempfile -d $tmp_dir` || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+# Clean up
+trap " /bin/rm -f -- \"$out_file\" \"$err_file\"" 0 1 2 3 13 15
# Determine the paper size
paper_size=$1
@@ -30,13 +32,10 @@
antiword -p $paper_size -i 0 "$@" 2>$err_file >$out_file
if [ $? -ne 0 ]
then
- rm -f $out_file
exit 1
fi
# Show the PostScript file
gv $out_file -nocentre -media $paper_size
-# Clean up
-rm -f $out_file $err_file
exit 0