devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Adapted Miika's tool to rockbox coding style *oops*

Browse source 
(And removed some tabs from my own last minute edits in dict.c)

Changed the place of endian conversion form the device to the convertor.
Should speed it up a little.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6397 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomas Salfischberger 2005-05-02 16:06:05 +00:00
parent e2f5dba61c
commit 23028f579b
2 changed files with 76 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/plugins/dict.c
View file

@ -52,7 +52,7 @@ void init_screen(void)
}
/* for endian problems */
#ifdef LITTLE_ENDIAN
#ifdef ROCKBOX_BIG_ENDIAN
#define readlong(x) x
#else
long readlong(void* value)
@ -140,7 +140,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
DEBUGF("Not found.\n");
rb->splash(HZ*2, true, "Not found.");
rb->close(fIndex);
rb->close(fIndex);
return PLUGIN_OK;
}
@ -152,7 +152,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
DEBUGF("Err: Failed to open description file.\n");
rb->splash(HZ*2, true, "Failed to open descriptions.");
rb->close(fIndex);
rb->close(fIndex);
return PLUGIN_ERROR;
}
@ -187,14 +187,15 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
/* copy one lcd line */
rb->strncpy(output, ptr, display_columns);
output[display_columns] = '\0';
output[display_columns] = '\0';
/* unsigned to kill a warning... */
if((int)rb->strlen(ptr) < display_columns) {
rb->lcd_puts(0, lines, output);
/* typecast to kill a warning... */
if((int)rb->strlen(ptr) < display_columns)
{
rb->lcd_puts(0, lines, output);
lines++;
break;
}
break;
}
/* get the last spacechar */
@ -210,7 +211,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
next = display_columns;
}
/* put the line on screen */
/* put the line on screen */
rb->lcd_puts(0, lines, output);
/* get output count */
@ -240,6 +241,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
}
rb->close(fIndex);
rb->close(fData);
rb->close(fData);
return PLUGIN_OK;
}

115
tools/rdf2binary.c
View file

@ -30,60 +30,73 @@ This tool converts the rdf file to the binary data used in the dict plugin.
/* maximum word lenght, has to be the same in dict.c */
#define WORDLEN 32
struct word {
char word[WORDLEN];
long offset;
struct word
{
char word[WORDLEN];
long offset;
};
/* convert offsets here, not on device. */
long long_to_big_endian (void* value)
{
unsigned char* bytes = (unsigned char*) value;
return (long)bytes[0] | ((long)bytes[1] << 8) |
((long)bytes[2] << 16) | ((long)bytes[3] << 24);
}
int main()
{
FILE *in;
int idx_out, desc_out;
struct word w;
char buf[10000];
long cur_offset = 0;
in = fopen("dict.preparsed", "r");
idx_out = open("dict.index", O_WRONLY | O_CREAT);
desc_out = open("dict.desc", O_WRONLY | O_CREAT);
if (in == NULL || idx_out < 0 || desc_out < 0) {
fprintf(stderr, "Error: Some files couldn't be opened\n");
return 1;
}
while (fgets(buf, sizeof buf, in) != NULL) {
/* It is safe to use strtok here */
const char *word = strtok(buf, "\t");
const char *desc = strtok(NULL, "\t");
if (word == NULL || desc == NULL) {
fprintf(stderr, "Parse error!\n");
fprintf(stderr, "word: %s\ndesc: %s\n", word, desc);
return 2;
}
/* We will null-terminate the words */
strncpy(w.word, word, WORDLEN - 1);
w.offset = cur_offset;
write(idx_out, &w, sizeof(struct word));
while (1) {
int len = strlen(desc);
cur_offset += len;
write(desc_out, desc, len);
desc = strtok(NULL, "\t");
if (desc == NULL)
break ;
cur_offset++;
write(desc_out, "\n", 1);
}
}
return 0;
FILE *in;
int idx_out, desc_out;
struct word w;
char buf[10000];
long cur_offset = 0;
in = fopen("dict.preparsed", "r");
idx_out = open("dict.index", O_WRONLY | O_CREAT);
desc_out = open("dict.desc", O_WRONLY | O_CREAT);
if (in == NULL || idx_out < 0 || desc_out < 0)
{
fprintf(stderr, "Error: Some files couldn't be opened\n");
return 1;
}
while (fgets(buf, sizeof buf, in) != NULL)
{
/* It is safe to use strtok here */
const char *word = strtok(buf, "\t");
const char *desc = strtok(NULL, "\t");
if (word == NULL || desc == NULL)
{
fprintf(stderr, "Parse error!\n");
fprintf(stderr, "word: %s\ndesc: %s\n", word, desc);
return 2;
}
/* We will null-terminate the words */
strncpy(w.word, word, WORDLEN - 1);
w.offset = long_to_big_endian(&cur_offset);
write(idx_out, &w, sizeof(struct word));
while (1)
{
int len = strlen(desc);
cur_offset += len;
write(desc_out, desc, len);
desc = strtok(NULL, "\t");
if (desc == NULL)
break ;
cur_offset++;
write(desc_out, "\n", 1);
}
}
return 0;
}