mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-04-04 06:02:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2873_diff_escape_dollar' into 4.8.1-stable

Browse Source 
* 2873_diff_escape_dollar:
  Don't close file and pipe that were not opened.
  Ticket #2873: diffviewer cannot open file if name contains '$'.
This commit is contained in:
Andrew Borodin 2012-09-11 16:42:20 +04:00
commit 75a19e2e8d
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/diffviewer/ydiff.c
View File

@ -43,6 +43,7 @@
#include "lib/util.h" #include "lib/util.h"
#include "lib/widget.h" #include "lib/widget.h"
#include "lib/strutil.h" #include "lib/strutil.h"
#include "lib/strescape.h" /* strutils_glob_escape() */
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
#include "lib/charsets.h" #include "lib/charsets.h"
#endif #endif
@ -470,10 +471,14 @@ f_trunc (FBUF * fs)
static int static int
f_close (FBUF * fs) f_close (FBUF * fs)
{ {
int rv; int rv = -1;
if (fs != NULL)
{
rv = close (fs->fd);
f_free (fs);
}
rv = close (fs->fd);
f_free (fs);
return rv; return rv;
} }
@ -530,14 +535,19 @@ p_open (const char *cmd, int flags)
static int static int
p_close (FBUF * fs) p_close (FBUF * fs)
{ {
int rv; int rv = -1;
if (fs != NULL)
{
rv = pclose (fs->data);
f_free (fs);
}
rv = pclose (fs->data);
f_free (fs);
return rv; return rv;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* Get one char (byte) from string * Get one char (byte) from string
* *
@ -801,8 +811,15 @@ dff_execute (const char *args, const char *extra, const char *file1, const char
FBUF *f; FBUF *f;
char *cmd; char *cmd;
int code; int code;
char *file1_esc, *file2_esc;
/* escape potential $ to avoid shell variable substitutions in popen() */
file1_esc = strutils_shell_escape (file1);
file2_esc = strutils_shell_escape (file2);
cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
g_free (file1_esc);
g_free (file2_esc);
cmd = g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args, extra, opt, file1, file2);
if (cmd == NULL) if (cmd == NULL)
return -1; return -1;