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

check fread calls

Browse Source
This commit is contained in:
Evgeniy Dushistov
2013-07-07 23:29:09 +00:00
parent 5f8d2cb174
commit 8298a578b0
4 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libwrapper.cpp
View File

@@ -42,7 +42,6 @@ static const char ESC_GREEN[] = "\033[0;32m";
static const char *SEARCH_TERM_VISFMT = ESC_BOLD; static const char *SEARCH_TERM_VISFMT = ESC_BOLD;
static const char *NAME_OF_DICT_VISFMT = ESC_BLUE; static const char *NAME_OF_DICT_VISFMT = ESC_BLUE;
static const char *TRANSCRIPTION_VISFMT = ESC_BOLD; static const char *TRANSCRIPTION_VISFMT = ESC_BOLD;
static const char *DEF_COLOR_VISFMT = ESC_BLUE;
static const char *EXAMPLE_VISFMT = ESC_LIGHT_GRAY; static const char *EXAMPLE_VISFMT = ESC_LIGHT_GRAY;
static const char *KREF_VISFMT = ESC_BOLD; static const char *KREF_VISFMT = ESC_BOLD;
static const char *ABR_VISFMT = ESC_GREEN; static const char *ABR_VISFMT = ESC_GREEN;

2
src/readline.hpp
View File

@@ -6,7 +6,7 @@ class IReadLine {
public: public:
virtual ~IReadLine() {} virtual ~IReadLine() {}
virtual bool read(const std::string &banner, std::string& line) = 0; virtual bool read(const std::string &banner, std::string& line) = 0;
virtual void add_to_history(const std::string& phrase) {} virtual void add_to_history(const std::string&) {}
}; };
extern std::string sdcv_readline; extern std::string sdcv_readline;

6
src/sdcv.cpp
View File

@@ -55,8 +55,7 @@ namespace glib {
typedef ResourceWrapper<gchar *, gchar *, free_str_array> StrArr; typedef ResourceWrapper<gchar *, gchar *, free_str_array> StrArr;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[]) try {
{
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
#if ENABLE_NLS #if ENABLE_NLS
bindtextdomain("sdcv", bindtextdomain("sdcv",
@@ -197,4 +196,7 @@ int main(int argc, char *argv[])
fprintf(stderr, _("There are no words/phrases to translate.\n")); fprintf(stderr, _("There are no words/phrases to translate.\n"));
return EXIT_SUCCESS; return EXIT_SUCCESS;
} catch (const std::exception& ex) {
fprintf(stderr, "Internal error: %s\n", ex.what());
exit(EXIT_FAILURE);
} }

89
src/stardict_lib.cpp
View File

@@ -16,6 +16,16 @@
#include "stardict_lib.hpp" #include "stardict_lib.hpp"
#define TO_STR2(xstr) #xstr
#define TO_STR1(xstr) TO_STR2(xstr)
#define THROW_IF_ERROR(expr) do { \
assert((expr)); \
if (!(expr)) \
throw std::runtime_error(#expr " not true at " __FILE__ ": " TO_STR1(__LINE__)); \
} while (false)
// Notice: read src/tools/DICTFILE_FORMAT for the dictionary // Notice: read src/tools/DICTFILE_FORMAT for the dictionary
// file's format information! // file's format information!
@@ -182,12 +192,13 @@ gchar* DictBase::GetWordData(guint32 idxitem_offset, guint32 idxitem_size)
gchar *data; gchar *data;
if (!sametypesequence.empty()) { if (!sametypesequence.empty()) {
gchar *origin_data = (gchar *)g_malloc(idxitem_size); glib::CharStr origin_data((gchar *)g_malloc(idxitem_size));
if (dictfile) if (dictfile) {
fread(origin_data, idxitem_size, 1, dictfile); const size_t nitems = fread(get_impl(origin_data), idxitem_size, 1, dictfile);
else THROW_IF_ERROR(nitems == 1);
dictdzfile->read(origin_data, idxitem_offset, idxitem_size); } else
dictdzfile->read(get_impl(origin_data), idxitem_offset, idxitem_size);
guint32 data_size; guint32 data_size;
gint sametypesequence_len = sametypesequence.length(); gint sametypesequence_len = sametypesequence.length();
@@ -218,7 +229,7 @@ gchar* DictBase::GetWordData(guint32 idxitem_offset, guint32 idxitem_size)
data = (gchar *)g_malloc(data_size); data = (gchar *)g_malloc(data_size);
gchar *p1,*p2; gchar *p1,*p2;
p1 = data + sizeof(guint32); p1 = data + sizeof(guint32);
p2 = origin_data; p2 = get_impl(origin_data);
guint32 sec_size; guint32 sec_size;
//copy the head items. //copy the head items.
for (int i=0; i<sametypesequence_len-1; i++) { for (int i=0; i<sametypesequence_len-1; i++) {
@@ -258,7 +269,7 @@ gchar* DictBase::GetWordData(guint32 idxitem_offset, guint32 idxitem_size)
} }
} }
//calculate the last item 's size. //calculate the last item 's size.
sec_size = idxitem_size - (p2-origin_data); sec_size = idxitem_size - (p2-get_impl(origin_data));
*p1=sametypesequence[sametypesequence_len-1]; *p1=sametypesequence[sametypesequence_len-1];
p1+=sizeof(gchar); p1+=sizeof(gchar);
switch (sametypesequence[sametypesequence_len-1]) { switch (sametypesequence[sametypesequence_len-1]) {
@@ -290,13 +301,13 @@ gchar* DictBase::GetWordData(guint32 idxitem_offset, guint32 idxitem_size)
} }
break; break;
} }
g_free(origin_data);
set_uint32(data, data_size); set_uint32(data, data_size);
} else { } else {
data = (gchar *)g_malloc(idxitem_size + sizeof(guint32)); data = (gchar *)g_malloc(idxitem_size + sizeof(guint32));
if (dictfile) if (dictfile) {
fread(data+sizeof(guint32), idxitem_size, 1, dictfile); const size_t nitems = fread(data+sizeof(guint32), idxitem_size, 1, dictfile);
else THROW_IF_ERROR(nitems == 1);
} else
dictdzfile->read(data+sizeof(guint32), idxitem_offset, idxitem_size); dictdzfile->read(data+sizeof(guint32), idxitem_offset, idxitem_size);
set_uint32(data, idxitem_size+sizeof(guint32)); set_uint32(data, idxitem_size+sizeof(guint32));
} }
@@ -318,9 +329,10 @@ bool DictBase::SearchData(std::vector<std::string> &SearchWords, guint32 idxitem
if (dictfile) if (dictfile)
fseek(dictfile, idxitem_offset, SEEK_SET); fseek(dictfile, idxitem_offset, SEEK_SET);
if (dictfile) if (dictfile) {
fread(origin_data, idxitem_size, 1, dictfile); const size_t nitems = fread(origin_data, idxitem_size, 1, dictfile);
else THROW_IF_ERROR(nitems == 1);
} else
dictdzfile->read(origin_data, idxitem_offset, idxitem_size); dictdzfile->read(origin_data, idxitem_offset, idxitem_size);
gchar *p = origin_data; gchar *p = origin_data;
guint32 sec_size; guint32 sec_size;
@@ -504,10 +516,11 @@ namespace {
inline const gchar *OffsetIndex::read_first_on_page_key(glong page_idx) inline const gchar *OffsetIndex::read_first_on_page_key(glong page_idx)
{ {
fseek(idxfile, wordoffset[page_idx], SEEK_SET); fseek(idxfile, wordoffset[page_idx], SEEK_SET);
guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx]; guint32 page_size = wordoffset[page_idx + 1] - wordoffset[page_idx];
fread(wordentry_buf, const size_t nitems = fread(wordentry_buf,
std::min(sizeof(wordentry_buf), static_cast<size_t>(page_size)), std::min(sizeof(wordentry_buf), static_cast<size_t>(page_size)),
1, idxfile); 1, idxfile);
THROW_IF_ERROR(nitems == 1);
//TODO: check returned values, deal with word entry that strlen>255. //TODO: check returned values, deal with word entry that strlen>255.
return wordentry_buf; return wordentry_buf;
} }
@@ -631,16 +644,18 @@ namespace {
inline gulong OffsetIndex::load_page(glong page_idx) inline gulong OffsetIndex::load_page(glong page_idx)
{ {
gulong nentr=ENTR_PER_PAGE; gulong nentr = ENTR_PER_PAGE;
if (page_idx==glong(wordoffset.size()-2)) if (page_idx == glong(wordoffset.size()-2))
if ((nentr=wordcount%ENTR_PER_PAGE)==0) if ((nentr = (wordcount % ENTR_PER_PAGE)) == 0)
nentr=ENTR_PER_PAGE; nentr = ENTR_PER_PAGE;
if (page_idx!=page.idx) { if (page_idx != page.idx) {
page_data.resize(wordoffset[page_idx+1]-wordoffset[page_idx]); page_data.resize(wordoffset[page_idx+1]-wordoffset[page_idx]);
fseek(idxfile, wordoffset[page_idx], SEEK_SET); fseek(idxfile, wordoffset[page_idx], SEEK_SET);
fread(&page_data[0], 1, page_data.size(), idxfile); const size_t nitems = fread(&page_data[0], 1, page_data.size(), idxfile);
THROW_IF_ERROR(nitems == page_data.size());
page.fill(&page_data[0], nentr, page_idx); page.fill(&page_data[0], nentr, page_idx);
} }
@@ -691,29 +706,29 @@ namespace {
idx = iThisIndex; idx = iThisIndex;
} }
if (!bFound) { if (!bFound) {
gulong netr=load_page(idx); gulong netr = load_page(idx);
iFrom=1; // Needn't search the first word anymore. iFrom = 1; // Needn't search the first word anymore.
iTo=netr-1; iTo = netr-1;
iThisIndex=0; iThisIndex = 0;
while (iFrom<=iTo) { while (iFrom <= iTo) {
iThisIndex=(iFrom+iTo)/2; iThisIndex = (iFrom + iTo) / 2;
cmpint = stardict_strcmp(str, page.entries[iThisIndex].keystr); cmpint = stardict_strcmp(str, page.entries[iThisIndex].keystr);
if (cmpint>0) if (cmpint > 0)
iFrom=iThisIndex+1; iFrom = iThisIndex+1;
else if (cmpint<0) else if (cmpint < 0)
iTo=iThisIndex-1; iTo = iThisIndex-1;
else { else {
bFound=true; bFound = true;
break; break;
} }
} }
idx*=ENTR_PER_PAGE; idx *= ENTR_PER_PAGE;
if (!bFound) if (!bFound)
idx += iFrom; //next idx += iFrom; //next
else else
idx += iThisIndex; idx += iThisIndex;
} else { } else {
idx*=ENTR_PER_PAGE; idx *= ENTR_PER_PAGE;
} }
return bFound; return bFound;
} }