Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 293654 | Differences between
and this patch

Collapse All | Expand All

(-)aview-1.3.0.orig/asciiview (-9 / +14 lines)
Lines 7-15 Link Here
7
}
7
}
8
myconvert()
8
myconvert()
9
{
9
{
10
   if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then
10
   if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then
11
     exit
11
     exit
12
   elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then
12
   elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then
13
     exit
13
     exit
14
   fi
14
   fi
15
   echo "Failed to convert file format to PNM by both convert and anytopnm" >&2
15
   echo "Failed to convert file format to PNM by both convert and anytopnm" >&2
Lines 44-51 Link Here
44
      options="$options $1"
44
      options="$options $1"
45
      shift
45
      shift
46
      ;;
46
      ;;
47
    *) 
47
    *)
48
      filenames="$filenames $1"
48
      if [ "$filenames" = "" ]
49
      then
50
        filenames=$1   #avoid leading null
51
      else
52
        filenames=$(echo -e "$filenames\n$1")
53
      fi
49
      shift
54
      shift
50
      ;;
55
      ;;
51
  esac
56
  esac
Lines 53-67 Link Here
53
trap clear 0
58
trap clear 0
54
mkfifo /tmp/aview$$.pgm
59
mkfifo /tmp/aview$$.pgm
55
outfile=/tmp/aview$$.pgm
60
outfile=/tmp/aview$$.pgm
56
for name in $filenames ; do
61
echo "$filenames" | while read name; do
57
if test -r $name ; then
62
if test -r "$name" ; then
58
case $name in
63
case "$name" in
59
*.fli | *.lfc | *.flic )
64
*.fli | *.lfc | *.flic )
60
  PATH="$PATH:."
65
  PATH="$PATH:."
61
  aaflip $options $name
66
  aaflip $options "$name"
62
  ;;
67
  ;;
63
*)
68
*)
64
  myconvert $name >/tmp/aview$$.pgm &
69
  myconvert "$name" >/tmp/aview$$.pgm &
65
  pid=$!
70
  pid=$!
66
  PATH="$PATH:."
71
  PATH="$PATH:."
67
  aview  $options /tmp/aview$$.pgm
72
  aview  $options /tmp/aview$$.pgm

Return to bug 293654