1 --- mgetty-1.1.30.orig/fax/faxspool.in 2002-11-23 10:14:57.000000000 -0500
2 +++ mgetty-1.1.30/fax/faxspool.in 2003-04-27 23:48:56.000000000 -0400
5 FAX_SPOOL_OUT=@FAX_SPOOL_OUT@
6 FAX_SEQ=$FAX_SPOOL_OUT/.Sequence
7 -FAX_SEQ_LOCKDIR=$FAX_SPOOL_OUT/locks
8 +FAX_SEQ_LOCKDIR=/var/lock/fax
9 FAX_SEQ_LOCK=$FAX_SEQ_LOCKDIR/LCK..seq
10 LAST_RUN=@FAX_SPOOL_OUT@/faxqueue_done
17 + pbm2g3 "$1" >"$2".001
25 - pgmtopbm $1 | pbm2g3 >$2.001
26 + pgmtopbm "$1" | pbm2g3 >"$2".001
34 - ppmtopgm $1 | pgmtopbm | pbm2g3 >$2.001
35 + ppmtopgm "$1" | pgmtopbm | pbm2g3 >"$2".001
44 + g3cat "$1" >"$2".001
52 - test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
53 + test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5"
57 pnmscale -xysize 1728 2000 |\
70 - test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
71 + test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5"
75 pnmscale -xysize 1728 2000 |\
88 - test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
89 + test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5"
93 pnmscale -xysize 1728 2000 |\
102 @@ -235,11 +235,11 @@
110 + hp2log3 -r"$2" <"$1"
113 + hp2hig3 -r"$2" <"$1"
117 @@ -251,10 +251,10 @@
120 driver="$GS_DRIVER_HI"
121 - test X$3 = X-n && driver="$GS_DRIVER_LO"
122 + test X"$3" = X-n && driver="$GS_DRIVER_LO"
125 - gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER -
127 + gs $driver -sOutputFile="$2"%03d -dNOPAUSE -q -dSAFER -
131 @@ -268,19 +268,19 @@
134 driver="$GS_DRIVER_HI"
135 - test X$3 = X-n && driver="$GS_DRIVER_LO"
136 + test X"$3" = X-n && driver="$GS_DRIVER_LO"
138 - gs $driver -sOutputFile=$2%03d -dNOPAUSE \
139 - -- gslp.ps -fCourier-Bold10 -B $1
140 + gs $driver -sOutputFile="$2"%03d -dNOPAUSE \
141 + -- gslp.ps -fCourier-Bold10 -B "$1"
145 # (convert "LF" to "CR+LF" via awk)
148 -# test X$3 = X-n && pgm=hp2log3
149 +# test X"$3" = X-n && pgm=hp2log3
151 -# $AWK '{ printf "%s\r\n", $0 }' $1 | $pgm -r$2
152 +# $AWK '{ printf "%s\r\n", $0 }' "$1" | $pgm -r"$2"
155 # via pbmtext (not really recommended):
156 @@ -288,13 +288,13 @@
158 ## Select appropriate font
159 # font=$PBMFONT_BODY_F
160 -# test X$3 = X-n && font=$PBMFONT_BODY_N
161 +# test X"$3" = X-n && font=$PBMFONT_BODY_N
162 # Determine how many pages text will be split in to. Uses default pagelen.
165 # Convert each page into a separate G3 file. Uses default pagelen (60).
167 # while [ $page -le $nr ]; do
168 -# pgx $page < $1 | pbmtext -font $font | pbm2g3 >$2.$page
169 +# pgx $page < "$1" | pbmtext -font $font | pbm2g3 >"$2".$page
170 # page=`expr $page + 1`
180 driver="$GS_DRIVER_LO" ; dvipscfg="-P dfaxlo"
182 @@ -316,18 +316,18 @@
183 # if you do not have the dfaxlo(w)/dfaxhigh dvips modes configured,
184 # remove "$dvipscfg" from the dvips command line below [or configure them!]
186 - dvips $dvipscfg $1 -o \
187 - !"gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q -"
188 + dvips $dvipscfg "$1" -o \
189 + !"gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q -"
191 # for those that only have the old "dvialw":
194 -# gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q -
195 +# gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q -
197 # for those that have dvi2ps and not dvips:
200 -# gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q -
201 +# gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q -
205 @@ -341,11 +341,11 @@
208 driver="$GS_DRIVER_HI"
209 - test X$3 = X-n && driver="$GS_DRIVER_LO"
210 + test X"$3" = X-n && driver="$GS_DRIVER_LO"
214 acroread -toPostScript |
215 - gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER -
216 + gs $driver -sOutputFile="$2"%03d -dNOPAUSE -q -dSAFER -
224 - $echo "not authorized to use \`\`-u $2'' switch." >&2
225 + $echo "not authorized to use \`\`-u "$2"'' switch." >&2
235 if expr "$phone" : "[-0-9TtPpWw,;]*$" >/dev/null ; then :