*** /usr/bin/asciiview Fri Feb 13 12:48:26 2004 --- /usr/bin/asciiview Fri Feb 13 12:47:53 2004 *************** *** 7,15 **** } myconvert() { ! if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then exit ! elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then exit fi echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 --- 7,15 ---- } myconvert() { ! if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then exit ! elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then exit fi echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 *************** *** 44,51 **** options="$options $1" shift ;; ! *) ! filenames="$filenames $1" shift ;; esac --- 44,56 ---- options="$options $1" shift ;; ! *) ! if [ "$filenames" = "" ] ! then ! filenames=$1 #avoid leading null ! else ! filenames=$(echo -e "$filenames\000$1") ! fi shift ;; esac *************** *** 53,67 **** trap clear 0 mkfifo /tmp/aview$$.pgm outfile=/tmp/aview$$.pgm ! for name in $filenames ; do ! if test -r $name ; then ! case $name in *.fli | *.lfc | *.flic ) PATH="$PATH:." ! aaflip $options $name ;; *) ! myconvert $name >/tmp/aview$$.pgm & pid=$! PATH="$PATH:." aview $options /tmp/aview$$.pgm --- 58,73 ---- trap clear 0 mkfifo /tmp/aview$$.pgm outfile=/tmp/aview$$.pgm ! IFS=$(echo -e "\000") ! echo $filenames | while read name; do ! if test -r "$name" ; then ! case "$name" in *.fli | *.lfc | *.flic ) PATH="$PATH:." ! aaflip $options "$name" ;; *) ! myconvert "$name" >/tmp/aview$$.pgm & pid=$! PATH="$PATH:." aview $options /tmp/aview$$.pgm