Ticket #2471: mc-4.7.0.10-iso9660-semicolon.patch

lib/vfs/mc-vfs/extfs/iso9660.in

@@ -24 +24 @@
     fi
     ISOINFO="isoinfo -R"
     isoinfo -d -i "$1" 2>/dev/null | @GREP@ "UCS level 1\|NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT"
+
+    if [ `isoinfo -d -i "$1" 2>/dev/null | @GREP@ "Joliet with UCS level 3 found" | wc -l` == 1 ] ; then
+        if [ `isoinfo -d -i "$1" 2>/dev/null | @GREP@ "NO Rock Ridge" | wc -l` == 1 ] ; then
+            SEMICOLON="YES"
+        fi
+    fi
 }
 
 mcisofs_list () {
@@ -38 +44 @@
   *)     MYCAT="cat";;
 esac
 
-$ISOINFO -l -i "$1" | @AWK@ '
+$ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON '
 BEGIN {
   dir="";
   # Pattern to match 8 first fields.
@@ -60 +66 @@
   sub(irx, "", name)
   sub("^----------   0    0    0", "-r--r--r--   1 root root", attr)
   sub(" $", "", name)
+  # for Joliet UCS level 3
+  if (SEMICOLON = "YES") sub(";1$", "", name);
   ## sub(";[0-9]+$", "", name) ## would break copyout
   # skip . and ..
   if (name ~ /^\.\.?/) next;
@@ -68 +76 @@
 }
 
 mcisofs_copyout () {
-        $ISOINFO -i "$1" -x "/$2" > "$3" 
+        if [ "x$SEMICOLON" == "xYES" ]; then
+            $ISOINFO -i "$1" -x "/$2;1" 2>/dev/null > "$3"
+        else
+            $ISOINFO -i "$1" -x "/$2" 2>/dev/null > "$3"
+        fi
 }
 
 LC_ALL=C