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

sanity check on file -i return

Browse Source
This commit is contained in:
dockes 2006-03-21 11:04:39 +00:00
parent 0dee171e81
commit fb3a94578c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/index/mimetype.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.16 2006-01-23 13:32:28 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.17 2006-03-21 11:04:39 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
@ -85,14 +85,16 @@ static string mimetypefromdata(const string &fn, bool usfc)
// Split it, and take second field // Split it, and take second field
list<string> res; list<string> res;
stringToStrings(result, res); stringToStrings(result, res);
if (res.size() <= 1) if (res.size() <= 1)
return ""; return "";
list<string>::iterator it = res.begin(); list<string>::iterator it = res.begin();
it++; mime = *++it;
mime = *it;
// Remove possible punctuation at the end // Remove possible punctuation at the end
if (mime.length() > 0 && !isalpha(mime[mime.length() - 1])) if (mime.length() > 0 && !isalpha(mime[mime.length() - 1]))
mime.erase(mime.length() -1); mime.erase(mime.length() -1);
// File -i will sometimes return strange stuff (ie: "very small file")
if(mime.find("/") == string::npos)
mime = "";
} }
#endif #endif