--- /usr/bin/pfsin	2010-07-20 07:50:32.000000000 +0200
+++ pfsin	2011-04-05 16:43:01.000000000 +0200
@@ -3,7 +3,7 @@
 # Read any image and write pfs stream to the standard output
 ############################################################
 
-if test -z $1 || test "$1" = "--help"; then
+if test -z "$1" || test "$1" = "--help"; then
 cat <<EOF
 Read an image in one of the several formats and write pfs stream to
 the standard output.
@@ -57,9 +57,9 @@
 
 while test "$1"; do
 
-      extension=${1##*.}
+      extension="${1##*.}"
 
-      file_pattern=$1
+      file_pattern="$1"
       
       # Handle common arguments arguments 
       extra_arguments="";
@@ -84,50 +84,50 @@
           done
       fi
          
-      case $extension in
+      case "$extension" in
           ("hdr"|"HDR"|"pic"|"PIC")
-          pfsinrgbe $file_pattern $global_arguments $extra_arguments
+          pfsinrgbe "$file_pattern" $global_arguments $extra_arguments
              ;;
           ("ppm"|"PPM"|"pnm"|"PNM"|"pgm"|"PGM")
-          pfsinppm $file_pattern $global_arguments $extra_arguments
+          pfsinppm "$file_pattern" $global_arguments $extra_arguments
              ;;
           ("tif"|"TIF"|"tiff"|"TIFF")
-          pfsintiff $file_pattern $global_arguments $extra_arguments
+          pfsintiff "$file_pattern" $global_arguments $extra_arguments
              ;;            
           ("exr"|"EXR")
-          pfsinexr $file_pattern $global_arguments $extra_arguments
+          pfsinexr "$file_pattern" $global_arguments $extra_arguments
              ;;
           ("pfm"|"PFM")
-          pfsinpfm $file_pattern $global_arguments $extra_arguments
+          pfsinpfm "$file_pattern" $global_arguments $extra_arguments
              ;;
           ("jpg"|"JPG"|"jpeg"|"JPEG")
           ## Use ImageMagick if possible, if not - netpbm
           if which pfsinimgmagick >/dev/null; then
-              pfsinimgmagick $file_pattern $global_arguments $extra_arguments          
+              pfsinimgmagick "$file_pattern" $global_arguments $extra_arguments          
           else
-              jpegtopnm $file_pattern | pfsinppm - $global_arguments $extra_arguments
+              jpegtopnm "$file_pattern" | pfsinppm - $global_arguments $extra_arguments
           fi
           ;;
           ("png"|"PNG")
           ## Use ImageMagick if possible, if not - netpbm
           if which pfsinimgmagick >/dev/null; then
-              pfsinimgmagick $file_pattern $global_arguments $extra_arguments          
+              pfsinimgmagick "$file_pattern" $global_arguments $extra_arguments          
           else
-              pngtopnm $file_pattern | pfsinppm - $global_arguments $extra_arguments
+              pngtopnm "$file_pattern" | pfsinppm - $global_arguments $extra_arguments
           fi
           ;;
           ("dpx"|"DPX"|"gif"|"GIF"|"bmp"|"BMP"|"eps"|"EPS")
-          pfsinimgmagick $file_pattern $global_arguments $extra_arguments
+          pfsinimgmagick "$file_pattern" $global_arguments $extra_arguments
              ;;
           ("pfs"|"PFS")
-          cat $file_pattern | pfstag --set "FILE_NAME=${file_pattern}"
+          cat "$file_pattern" | pfstag --set "FILE_NAME=${file_pattern}"
              ;;
           ("hdrgen"|"HDRGEN")
-          pfsinhdrgen $file_pattern $global_arguments $extra_arguments
+          pfsinhdrgen "$file_pattern" $global_arguments $extra_arguments
              ;;
           (*)
-          if dcraw -i $file_pattern > /dev/null 2>&1; then
-              pfsindcraw $file_pattern $global_arguments $extra_arguments
+          if dcraw -i "$file_pattern" > /dev/null 2>&1; then
+              pfsindcraw "$file_pattern" $global_arguments $extra_arguments
           else
               echo 1>&2 "Unknown extension: $extension"
               exit 1