mega_venik/sdcv
1
0
Fork 0
mirror of https://github.com/Dushistov/sdcv.git synced 2025-12-16 09:51:56 +00:00
Code Issues Projects Releases Wiki Activity

- not requeire exact version number for stardict ifo file

Browse Source 
- ignore utf-8 BOM during magic string check
This commit is contained in:
Evgeniy Dushistov
2013-07-07 17:04:51 +00:00
parent 1a8b24dced
commit fae4b432e1
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/lib.cpp
View File

@@ -43,18 +43,6 @@ namespace {
return true; return true;
} }
static inline guint32 get_uint32(const gchar *addr)
{
guint32 result;
memcpy(&result, addr, sizeof(guint32));
return result;
}
static inline void set_uint32(gchar *addr, guint32 val)
{
memcpy(addr, &val, sizeof(guint32));
}
static inline gint stardict_strcmp(const gchar *s1, const gchar *s2) static inline gint stardict_strcmp(const gchar *s1, const gchar *s2)
{ {
gint a=g_ascii_strcasecmp(s1, s2); gint a=g_ascii_strcasecmp(s1, s2);
@@ -82,11 +70,14 @@ bool DictInfo::load_from_ifo_file(const std::string& ifofilename,
if (!g_file_get_contents(ifofilename.c_str(), &buffer, nullptr, nullptr)) if (!g_file_get_contents(ifofilename.c_str(), &buffer, nullptr, nullptr))
return false; return false;
#define TREEDICT_MAGIC_DATA "StarDict's treedict ifo file\nversion=2.4.2\n" static const char TREEDICT_MAGIC_DATA[] = "StarDict's treedict ifo file";
#define DICT_MAGIC_DATA "StarDict's dict ifo file\nversion=2.4.2\n" static const char DICT_MAGIC_DATA[] = "StarDict's dict ifo file";
const gchar *magic_data = istreedict ? TREEDICT_MAGIC_DATA : DICT_MAGIC_DATA; const gchar *magic_data = istreedict ? TREEDICT_MAGIC_DATA : DICT_MAGIC_DATA;
if (!g_str_has_prefix(buffer, magic_data)) { static const unsigned char utf8_bom[] = { 0xEF, 0xBB, 0xBF, '\0'};
if (!g_str_has_prefix(
g_str_has_prefix(buffer, (const gchar *)(utf8_bom)) ? buffer + 3 : buffer,
magic_data)) {
g_free(buffer); g_free(buffer);
return false; return false;
} }
@@ -808,7 +799,6 @@ namespace {
} }
} }
//===================================================================
bool Dict::load(const std::string& ifofilename) bool Dict::load(const std::string& ifofilename)
{ {
gulong idxfilesize; gulong idxfilesize;

14
src/lib/lib.hpp
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include <cstdio> #include <cstdio>
#include <cstring>
#include <list> #include <list>
#include <memory> #include <memory>
#include <string> #include <string>
@@ -12,6 +13,19 @@
const int MAX_MATCH_ITEM_PER_LIB=100; const int MAX_MATCH_ITEM_PER_LIB=100;
const int MAX_FUZZY_DISTANCE= 3; // at most MAX_FUZZY_DISTANCE-1 differences allowed when find similar words const int MAX_FUZZY_DISTANCE= 3; // at most MAX_FUZZY_DISTANCE-1 differences allowed when find similar words
inline guint32 get_uint32(const gchar *addr)
{
guint32 result;
memcpy(&result, addr, sizeof(guint32));
return result;
}
inline void set_uint32(gchar *addr, guint32 val)
{
memcpy(addr, &val, sizeof(guint32));
}
struct cacheItem { struct cacheItem {
guint32 offset; guint32 offset;
gchar *data; gchar *data;