Ticket #1485: mc-4.7.0-pre1.iso9660.patch

File mc-4.7.0-pre1.iso9660.patch, 922 bytes (added by angel_il, 10 years ago)
  • vfs/extfs/iso9660.in

    diff -Naur mc-4.7.0-pre1~/vfs/extfs/iso9660.in mc-4.7.0-pre1/vfs/extfs/iso9660.in
    old new  
    1515    fi 
    1616    if test -n "$CHARSET"; then 
    1717        CHARSET=`echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/'` 
    18         isoinfo -j $CHARSET -i /dev/null 2>&1 | grep "Unknown charset" >/dev/null && CHARSET= 
     18        isoinfo -j $CHARSET -i /dev/null 2>&1 | egrep "Iconv not yet supported|Unknown charset" >/dev/null && CHARSET= 
    1919    fi 
    2020    if test -n "$CHARSET"; then 
    2121        JOLIET_OPT="-j $CHARSET -J" 
     
    2323        JOLIET_OPT="-J" 
    2424    fi 
    2525    ISOINFO="isoinfo -R" 
    26     isoinfo -d -i "$1" | grep "NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" 
     26    isoinfo -d -i "$1" | egrep "UCS level 1|NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" 
    2727} 
    2828 
    2929mcisofs_list () {