Ticket #2334: quick_view.patch

src/viewer/actions_cmd.c

@@ -189 +189 @@
 {
     WView *view = (WView *) v;
     WPanel *panel;
+    const char* path = NULL;
+    const vfs_path_t *vfile = NULL;
 
     /* If the user is busy typing, wait until he finishes to update the
        screen */
@@ -210 +212 @@
 
     mcview_done (view);
     mcview_init (view);
-    mcview_load (view, 0, panel->dir.list[panel->selected].fname, 0, 0, 0);
+    path = panel->dir.list[panel->selected].fname;
+    vfile = vfs_path_from_str(path);
+    if (regex_command_for (view, vfile, "View", NULL) == 0)
+        mcview_load (view, NULL, path, 0, 0, 0);
     mcview_display (view);
 }
 

src/viewer/growbuf.c

@@ -218 +218 @@
                 return;
             }
         }
-        else
+        else if (view->datasource == DS_VFS_PIPE)
         {
-            g_assert (view->datasource == DS_VFS_PIPE);
             do
             {
                 nread = mc_read (view->ds_vfs_pipe, p, bytesfree);
@@ -233 +232 @@
                 return;
             }
         }
+        else
+        {
+            // Skip the rest of file
+            nread = bytesfree;
+        }
         short_read = ((size_t) nread < bytesfree);
         view->growbuf_lastindex += nread;
     }