mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 09:19:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #3339: fix pasting from clipboard.

Browse Source 
When clipboard_paste option was set but clipboard utility was not
installed, nothing was pasted and clipboard file became empty.

Solution: reimplement pasting way using mc_pipe_t instead of my_system().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2014-12-05 11:36:31 +03:00
parent b7b78319f0
commit b9e06b5f2c
1 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/clipboard.c
View File

@ -6,6 +6,7 @@
Written by: Written by:
Ilia Maslakov <il.smind@gmail.com>, 2010. Ilia Maslakov <il.smind@gmail.com>, 2010.
Andrew Borodin <aborodin@vmail.ru>, 2014.
This file is part of the Midnight Commander. This file is part of the Midnight Commander.
@ -93,7 +94,8 @@ gboolean
clipboard_file_from_ext_clip (const gchar * event_group_name, const gchar * event_name, clipboard_file_from_ext_clip (const gchar * event_group_name, const gchar * event_name,
gpointer init_data, gpointer data) gpointer init_data, gpointer data)
{ {
char *tmp, *cmd; mc_pipe_t *p;
int file = -1;
const char *d = getenv ("DISPLAY"); const char *d = getenv ("DISPLAY");
(void) event_group_name; (void) event_group_name;
@ -104,14 +106,60 @@ clipboard_file_from_ext_clip (const gchar * event_group_name, const gchar * even
if (d == NULL || clipboard_paste_path == NULL || clipboard_paste_path[0] == '\0') if (d == NULL || clipboard_paste_path == NULL || clipboard_paste_path[0] == '\0')
return TRUE; return TRUE;
tmp = mc_config_get_full_path (EDIT_CLIP_FILE); p = mc_popen (clipboard_paste_path, NULL);
cmd = g_strconcat (clipboard_paste_path, " > ", tmp, " 2>/dev/null", (char *) NULL); if (p == NULL)
return TRUE; /* don't show error message */
if (cmd != NULL) p->out.null_term = FALSE;
my_system (EXECUTE_AS_SHELL, mc_global.tty.shell, cmd); p->err.null_term = TRUE;
while (TRUE)
{
GError *error = NULL;
p->out.len = MC_PIPE_BUFSIZE;
p->err.len = MC_PIPE_BUFSIZE;
mc_pread (p, &error);
if (error != NULL)
{
/* don't show error message */
g_error_free (error);
break;
}
/* ignore stderr and get stdout */
if (p->out.len == MC_PIPE_STREAM_EOF || p->out.len == MC_PIPE_ERROR_READ)
break;
if (p->out.len > 0)
{
ssize_t nwrite;
if (file < 0)
{
vfs_path_t *fname_vpath;
fname_vpath = mc_config_get_full_vpath (EDIT_CLIP_FILE);
file = mc_open (fname_vpath, O_CREAT | O_WRONLY | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH | O_BINARY);
vfs_path_free (fname_vpath);
if (file < 0)
break;
}
nwrite = mc_write (file, p->out.buf, p->out.len);
(void) nwrite;
}
}
if (file >= 0)
mc_close (file);
mc_pclose (p, NULL);
g_free (cmd);
g_free (tmp);
return TRUE; return TRUE;
} }