tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix pb with executing viewer for files with single-quotes in pathnames

Browse Source
This commit is contained in:
dockes 2006-12-07 07:07:35 +00:00
parent d5745bdb83
commit b9b6a871ca
4 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qtgui/rclmain_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.12 2006-12-05 15:23:50 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.13 2006-12-07 07:07:35 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -662,12 +662,13 @@ void RclMain::startNativeViewer(int docnum)
string fn = urltolocalpath(doc.url); string fn = urltolocalpath(doc.url);
string url = url_encode(doc.url, 7); string url = url_encode(doc.url, 7);
string ipath = doc.ipath;
// Substitute %u (url) and %f (file name) inside prototype command // Substitute %u (url) and %f (file name) inside prototype command
string ncmd; string ncmd;
map<char, string> subs; map<char, string> subs;
subs['u'] = string("'") + url + "'"; subs['u'] = escapeShell(url);
subs['f'] = string("'") + fn + "'"; subs['f'] = escapeShell(fn);
subs['i'] = escapeShell(ipath);
pcSubst(cmd, ncmd, subs); pcSubst(cmd, ncmd, subs);
ncmd += " &"; ncmd += " &";

11
src/utils/mimeparse.h
View File

@ -16,7 +16,7 @@
*/ */
#ifndef _MIME_H_INCLUDED_ #ifndef _MIME_H_INCLUDED_
#define _MIME_H_INCLUDED_ #define _MIME_H_INCLUDED_
/* @(#$Id: mimeparse.h,v 1.9 2006-09-22 07:42:55 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: mimeparse.h,v 1.10 2006-12-07 07:07:18 dockes Exp $ (C) 2004 J.F.Dockes */
/* /*
Mime definitions RFC to 4-9-2006: Mime definitions RFC to 4-9-2006:
@ -73,9 +73,12 @@ class MimeHeaderValue {
*/ */
extern bool parseMimeHeaderValue(const string& in, MimeHeaderValue& psd); extern bool parseMimeHeaderValue(const string& in, MimeHeaderValue& psd);
/** Quoted printable decoding. Doubles up as rfc2231 decoder, hence the esc */ /**
extern bool qp_decode(const string& in, string &out, * Quoted printable decoding. Doubles up as rfc2231 decoder, hence the esc
char esc = '='); * RFC2045 Quoted printable uses '=' , rfc2331 uses '%'. The two encodings are
* otherwise similar.
*/
extern bool qp_decode(const string& in, string &out, char esc = '=');
/** Decode an Internet mail field value encoded according to rfc2047 /** Decode an Internet mail field value encoded according to rfc2047
* *

32
src/utils/smallut.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.19 2006-11-30 13:38:44 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: smallut.cpp,v 1.20 2006-12-07 07:07:18 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -403,6 +403,36 @@ string escapeHtml(const string &in)
return out; return out;
} }
string escapeShell(const string &in)
{
string out;
out += "\"";
for (string::size_type pos = 0; pos < in.length(); pos++) {
switch(in.at(pos)) {
case '$':
out += "\\$";
break;
case '`':
out += "\\`";
break;
case '"':
out += "\\\"";
break;
case '\n':
out += "\\\n";
break;
case '\\':
out += "\\\\";
break;
default:
out += in.at(pos);
}
}
out += "\"";
return out;
}
// Small utility to substitute printf-like percents cmds in a string // Small utility to substitute printf-like percents cmds in a string
bool pcSubst(const string& in, string& out, map<char, string>& subs) bool pcSubst(const string& in, string& out, map<char, string>& subs)
{ {

6
src/utils/smallut.h
View File

@ -16,7 +16,7 @@
*/ */
#ifndef _SMALLUT_H_INCLUDED_ #ifndef _SMALLUT_H_INCLUDED_
#define _SMALLUT_H_INCLUDED_ #define _SMALLUT_H_INCLUDED_
/* @(#$Id: smallut.h,v 1.19 2006-11-13 11:59:11 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: smallut.h,v 1.20 2006-12-07 07:07:18 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <list> #include <list>
#include <map> #include <map>
@ -65,6 +65,10 @@ extern string escapeHtml(const string &in);
* so chars should only contain ascii */ * so chars should only contain ascii */
extern string neutchars(const string &str, string chars); extern string neutchars(const string &str, string chars);
/** turn string into something that won't be expanded by a shell. In practise
* quote with single-quotes and escape internal singlequotes */
extern string escapeShell(const string &str);
/** Truncate a string to a given maxlength, avoiding cutting off midword /** Truncate a string to a given maxlength, avoiding cutting off midword
* if reasonably possible. */ * if reasonably possible. */
extern string truncate_to_word(string &input, string::size_type maxlen); extern string truncate_to_word(string &input, string::size_type maxlen);