Fix libmime database load once and for all

This relates to Bug 656
pull/16/head
Timothy Pearson 10 years ago
parent 89a87055f0
commit e5f898219a

@ -19,6 +19,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "kmimemagic.h" #include "kmimemagic.h"
#include <kdebug.h> #include <kdebug.h>
#include <tdeapplication.h> #include <tdeapplication.h>
@ -31,6 +32,10 @@
#include <magic.h> #include <magic.h>
// Taken from file/file.h
// Keep in sync with that header!
#define FILE_LOAD 0
static void process(struct config_rec* conf, const TQString &); static void process(struct config_rec* conf, const TQString &);
KMimeMagic* KMimeMagic::s_pSelf; KMimeMagic* KMimeMagic::s_pSelf;
@ -63,8 +68,6 @@ void KMimeMagic::initStatic() {
#include <tqregexp.h> #include <tqregexp.h>
#include <tqstring.h> #include <tqstring.h>
#define HOWMANY 4000 /* big enough to recognize most WWW files, and skip GPL-headers */
#define MIME_INODE_DIR "inode/directory" #define MIME_INODE_DIR "inode/directory"
#define MIME_INODE_CDEV "inode/chardevice" #define MIME_INODE_CDEV "inode/chardevice"
#define MIME_INODE_BDEV "inode/blockdevice" #define MIME_INODE_BDEV "inode/blockdevice"
@ -150,6 +153,7 @@ struct config_rec {
int accuracy; int accuracy;
magic_t magic; magic_t magic;
TQStringList databases;
KMimeMagicUtimeConf * utimeConf; KMimeMagicUtimeConf * utimeConf;
}; };
@ -158,7 +162,13 @@ struct config_rec {
* apprentice - load configuration from the magic file. * apprentice - load configuration from the magic file.
*/ */
int KMimeMagic::apprentice( const TQString& magicfile ) { int KMimeMagic::apprentice( const TQString& magicfile ) {
return magic_load(conf->magic, magicfile.latin1()); TQString maindatabase = magicfile;
if (maindatabase == "") {
maindatabase = magic_getpath(0, FILE_LOAD);
}
conf->databases.clear();
conf->databases.append(maindatabase);
return magic_load(conf->magic, conf->databases[0].latin1());
} }
/* /*
@ -239,12 +249,21 @@ KMimeMagic::~KMimeMagic() {
} }
bool KMimeMagic::mergeConfig(const TQString & _configfile) { bool KMimeMagic::mergeConfig(const TQString & _configfile) {
if (magic_load(conf->magic, _configfile.latin1()) == 0) { conf->databases.append(_configfile);
TQString merged_databases = conf->databases.join(":");
int magicvers = magic_version();
if ((magicvers < 512) || (magicvers >= 518)) {
if (magic_load(conf->magic, merged_databases.latin1()) == 0) {
return true; return true;
} }
else { else {
return false; return false;
} }
}
else {
kdWarning(7018) << "KMimeMagic::mergeConfig disabled due to buggy libmagic version " << magicvers << endl;
return false;
}
} }
void KMimeMagic::setFollowLinks( bool _enable ) { void KMimeMagic::setFollowLinks( bool _enable ) {
@ -342,7 +361,6 @@ KMimeMagicResult* KMimeMagic::findFileType(const TQString & fn) {
process(conf, fn ); process(conf, fn );
/* if we have any results, put them in the request structure */ /* if we have any results, put them in the request structure */
//finishResult();
magicResult->setMimeType(conf->resultBuf.stripWhiteSpace()); magicResult->setMimeType(conf->resultBuf.stripWhiteSpace());
magicResult->setAccuracy(conf->accuracy); magicResult->setAccuracy(conf->accuracy);
refineResult(magicResult, fn); refineResult(magicResult, fn);

Loading…
Cancel
Save