Ticket #2302: urar.broken.archive.patch

urar

@@ -4 +4 @@
 # (C) 1996 2:5020/337.13@fidonet.org
 # Updated by christian.gennerat@alcatel.fr 1999
 #            Andrew V. Samoilov <sav@bcs.zp.ua> 2000
-# beta version 2.0
+#            Artem S. Tashkinov 2010
 #
 # rar and unrar can be found on http://www.rarlabs.com/
 
@@ -28 +28 @@
 
 mcrarfs_list ()
 {
-     $UNRAR v -c- -cfg- "$1" | gawk -v uid=`id -u` -v gid=`id -g` '
-BEGIN { flag=0 }
-/^-------/ { flag++; if (flag > 1) exit 0; next }
-flag==1 {
-    str = substr($0, 2)
-    getline
-    split($4, a, "-")
-    if (index($6, "D") != 0)
-        $6="drwxr-xr-x"
-    else
-        if (index($6, ".") != 0)
-            $6="-rw-r--r--"
-    printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str
-}'
+        $UNRAR v -c- -cfg- "$1" 2>&1 | grep -q -m1 "Pathname/Comment"
+        if [ $? == 0 ]; then
+                $UNRAR v -c- -cfg- "$1" | gawk -v uid=`id -u` -v gid=`id -g` '
+                BEGIN { flag=0 }
+                /^-------/ { flag++; if (flag > 1) exit 0; next }
+                flag==1 {
+                        str = substr($0, 2)
+                        getline
+                        split($4, a, "-")
+                        if (index($6, "D") != 0)
+                                $6="drwxr-xr-x"
+                        else
+                                if (index($6, ".") != 0)
+                                        $6="-rw-r--r--"
+                        printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str
+                }'
+        else
+                echo "-r--r--r-- 1 `id -u` `id -g` 0 01-01-1970 00:00 @ERROR-BAD-ARCHIVE@"
+        fi
 }
 
 mcrarfs_copyin ()
@@ -65 +70 @@
 
 mcrarfs_copyout ()
 {
-    $UNRAR p -p- -c- -cfg- -inul "$1" "$2" > "$3"
+        case "$2" in
+                @ERROR-BAD-ARCHIVE@)
+                        $UNRAR v -c- -cfg- "$1" &> "$3"
+                        exit 0
+                ;;
+                *)
+                        $UNRAR p -p- -c- -cfg- -inul "$1" "$2" > "$3"
+                        exit 0
+                ;;
+        esac
 }
 
 mcrarfs_mkdir ()