Ticket #2370: 2370_viewer_stdin_fix-3c.patch

src/args.c

@@ -516 +516 @@
 
         if (tmp != NULL)
             mc_run_param0 = g_strdup (tmp);
+        /* If fd0 is non-interactive, a file is being piped */
+        else if (!isatty(fileno(stdin)))
+            mc_run_param0 = g_strdup("-");
         else
         {
             *error = g_error_new (MC_ERROR, 0, "%s\n", _("No arguments given to the viewer."));

src/filemanager/midnight.c

@@ -907 +907 @@
     size_t l;
     vfs_path_t *vpath;
 
+    if (filename[0] == '-' && filename[1] == '\0') /* don't let it reach vfs */
+        return g_strdup (filename);
+
     vpath = vfs_path_from_str (filename);
     if (!vfs_file_is_local (vpath) || g_path_is_absolute (filename))
     {

src/viewer/datasource.c

@@ -91 +91 @@
 /* --------------------------------------------------------------------------------------------- */
 
 void
+mcview_set_datasource_stdin_pipe (mcview_t * view)
+{
+    view->datasource = DS_STDIN_PIPE;
+    view->ds_stdio_pipe = stdin;
+
+    mcview_growbuf_init (view);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+void
 mcview_set_datasource_none (mcview_t * view)
 {
     view->datasource = DS_NONE;
@@ -106 +117 @@
     case DS_NONE:
         return 0;
     case DS_STDIO_PIPE:
+    case DS_STDIN_PIPE:
     case DS_VFS_PIPE:
         return mcview_growbuf_filesize (view);
     case DS_FILE:
@@ -171 +183 @@
     switch (view->datasource)
     {
     case DS_STDIO_PIPE:
+    case DS_STDIN_PIPE:
     case DS_VFS_PIPE:
         str = mcview_get_ptr_growing_buffer (view, byte_index);
         break;
@@ -318 +331 @@
         }
         mcview_growbuf_free (view);
         break;
+    case DS_STDIN_PIPE:
+        view->ds_stdio_pipe = NULL;
+        mcview_growbuf_free (view);
+        break;
     case DS_VFS_PIPE:
         if (view->ds_vfs_pipe != -1)
         {

src/viewer/display.c

@@ -110 +110 @@
     }
 
     buttonbar_set_label (b, 5, Q_ ("ButtonBar|Goto"), keymap, (Widget *) view);
-    buttonbar_set_label (b, 8, view->magic_mode ? Q_ ("ButtonBar|Raw")
-                         : Q_ ("ButtonBar|Parse"), keymap, (Widget *) view);
+
+    if (view->datasource == DS_STDIN_PIPE)
+        buttonbar_set_label (b, 8, NULL, NULL, NULL);
+    else
+        buttonbar_set_label (b, 8, view->magic_mode ? Q_ ("ButtonBar|Raw")
+                             : Q_ ("ButtonBar|Parse"), keymap, (Widget *) view);
 
     if (mcview_is_in_panel (view))
         buttonbar_set_label (b, 10, "", keymap, (Widget *) view);

src/viewer/growbuf.c

@@ -150 +150 @@
                 return;
             }
         }
+        else if (view->datasource == DS_STDIN_PIPE)
+        {
+            nread = fread (p, 1, bytesfree, view->ds_stdio_pipe);
+            if (nread == 0)
+            {
+                view->growbuf_finished = TRUE;
+                view->ds_stdio_pipe = NULL;
+                return;
+            }
+        }
         else
         {
 #ifdef HAVE_ASSERT_H
             assert (view->datasource == DS_VFS_PIPE);
 #endif

src/viewer/inlines.h

@@ -102 +102 @@
     switch (view->datasource)
     {
     case DS_STDIO_PIPE:
+    case DS_STDIN_PIPE:
     case DS_VFS_PIPE:
         return mcview_get_byte_growing_buffer (view, offset, retval);
     case DS_FILE:

src/viewer/internal.h

@@ -29 +29 @@
 {
     DS_NONE,                    /* No data available */
     DS_STDIO_PIPE,              /* Data comes from a pipe using popen/pclose */
+    DS_STDIN_PIPE,              /* Data comes from a pipe using standart input */
     DS_VFS_PIPE,                /* Data comes from a piped-in VFS file */
     DS_FILE,                    /* Data comes from a VFS file */
     DS_STRING                   /* Data comes from a string in memory */
@@ -228 +229 @@
 
 /* datasource.c: */
 void mcview_set_datasource_none (mcview_t *);
+void mcview_set_datasource_stdin_pipe (mcview_t *);
 off_t mcview_get_filesize (mcview_t *);
 void mcview_update_filesize (mcview_t * view);
 char *mcview_get_ptr_file (mcview_t *, off_t);

src/viewer/lib.c

@@ -78 +78 @@
 {
     char *filename, *command;
 
+    if (view->datasource == DS_STDIN_PIPE) /* stdin can't be "re-opened" */
+        return; /* and we can't do magic toggle without reopen, yet */
+
     mcview_altered_magic_flag = 1;
     view->magic_mode = !view->magic_mode;
     filename = g_strdup (view->filename);

src/viewer/mcviewer.c

@@ -312 +312 @@
         char tmp[BUF_MEDIUM];
         struct stat st;
 
+        /* See if "-" filename refers to a standart input pipe */
+        if (file[0] == '-' && file[1] == '\0' && !isatty (fileno(stdin)))
+        {
+            mcview_set_datasource_stdin_pipe (view);
+            retval = TRUE;
+            goto finish;
+        }
+
         /* Open the file */
         fd = mc_open (file, O_RDONLY | O_NONBLOCK);
         if (fd == -1)