mimetype: use the default command if none is configured

This commit is contained in:
Jean-Francois Dockes 2016-04-12 18:06:56 +02:00
parent f03a649559
commit 9db024791f

View File

@ -64,6 +64,7 @@ static string mimetypefromdata(RclConfig *cfg, const string &fn, bool usfc)
vector<string> cmd; vector<string> cmd;
string scommand; string scommand;
if (cfg->getConfParam("systemfilecommand", scommand)) { if (cfg->getConfParam("systemfilecommand", scommand)) {
LOGDEB2(("mimetype: syscmd from config: %s\n", scommand.c_str()));
stringToStrings(scommand, cmd); stringToStrings(scommand, cmd);
string exe; string exe;
if (cmd.empty()) { if (cmd.empty()) {
@ -74,6 +75,10 @@ static string mimetypefromdata(RclConfig *cfg, const string &fn, bool usfc)
cmd[0] = exe; cmd[0] = exe;
} }
cmd.push_back(fn); cmd.push_back(fn);
} else {
LOGDEB(("mimetype:systemfilecommand not found, using %s\n",
stringsToString(tradfilecmd).c_str()));
cmd = tradfilecmd;
} }
string result; string result;