alex/zero-epwing
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2016-10-31 19:32:40 -07:00
parent 0d87193cb1
commit 30b0562c90
5 changed files with 224 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
convert.c Normal file
View File

@ -0,0 +1,114 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <iconv.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
/* Reference: https://stackoverflow.com/questions/2162390/iconv-encoding-conversion-problem */
static char * convert (const char *from_charset, const char *to_charset, const char *input) {
size_t inleft, outleft, converted = 0;
char *output, *outbuf, *tmp;
const char *inbuf;
size_t outlen;
iconv_t cd;
if ((cd = iconv_open (to_charset, from_charset)) == (iconv_t) -1)
return NULL;
inleft = strlen (input);
inbuf = input;
/* we'll start off allocating an output buffer which is the same size
* as our input buffer. */
outlen = inleft;
/* we allocate 4 bytes more than what we need for nul-termination... */
if (!(output = malloc (outlen + 4))) {
iconv_close (cd);
return NULL;
}
do {
errno = 0;
outbuf = output + converted;
outleft = outlen - converted;
converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);
if (converted != (size_t) -1 || errno == EINVAL) {
/*
* EINVAL An incomplete multibyte sequence has been encoun­-
* tered in the input.
*
* We'll just truncate it and ignore it.
*/
break;
}
if (errno != E2BIG) {
/*
* EILSEQ An invalid multibyte sequence has been encountered
* in the input.
*
* Bad input, we can't really recover from this.
*/
iconv_close (cd);
free (output);
return NULL;
}
/*
* E2BIG There is not sufficient room at *outbuf.
*
* We just need to grow our outbuffer and try again.
*/
converted = outbuf - output;
outlen += inleft * 2 + 8;
if (!(tmp = realloc (output, outlen + 4))) {
iconv_close (cd);
free (output);
return NULL;
}
output = tmp;
outbuf = output + converted;
} while (1);
/* flush the iconv conversion */
iconv (cd, NULL, NULL, &outbuf, &outleft);
iconv_close (cd);
/* Note: not all charsets can be nul-terminated with a single
* nul byte. UCS2, for example, needs 2 nul bytes and UCS4
* needs 4. I hope that 4 nul bytes is enough to terminate all
* multibyte charsets? */
/* nul-terminate the string */
memset (outbuf, 0, 4);
return output;
}
const char * eucjp_to_utf8(const char src[]) {
return convert("EUC-JP", "UTF-8", src);
}

24
convert.h Normal file
View File

@ -0,0 +1,24 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONVERT_H
#define CONVERT_H
const char * eucjp_to_utf8(const char src[]);
#endif

151
main.c
View File

@ -17,154 +17,18 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <iconv.h>
#include <string.h> #include "convert.h"
#include <errno.h> #include "util.h"
#include <stdlib.h>
#include "eb/eb/eb.h" #include "eb/eb/eb.h"
#include "eb/eb/error.h" #include "eb/eb/error.h"
#include "eb/eb/text.h" #include "eb/eb/text.h"
/*
Constants
*/
#define MAX_ENTRY_HITS 128 #define MAX_ENTRY_HITS 128
#define MAX_ENTRY_TEXT 1024 #define MAX_ENTRY_TEXT 1024
#define MAX_ENTRY_HEADER 512 #define MAX_ENTRY_HEADER 512
/*
Array functions
*/
typedef struct {
char header[MAX_ENTRY_HEADER];
char text[MAX_ENTRY_TEXT];
} Entry;
typedef struct {
Entry* ptr;
size_t used;
size_t size;
} Array;
void array_init(Array* arr, size_t init_size) {
arr->ptr = (Entry *)malloc(init_size * sizeof(Entry));
arr->used = 0;
arr->size = init_size;
}
Entry* array_new(Array* arr) {
if (arr->used == arr->size) {
arr->size *= 2;
arr->ptr = (Entry *)realloc(arr->ptr, arr->size * sizeof(Entry));
}
return &arr->ptr[arr->used++];
}
void array_free(Array* arr) {
free(arr->ptr);
arr->ptr = NULL;
arr->used = arr->size = 0;
}
/*
Local functions
*/
// From https://stackoverflow.com/questions/2162390/iconv-encoding-conversion-problem
static char * convert (const char *from_charset, const char *to_charset, const char *input) {
size_t inleft, outleft, converted = 0;
char *output, *outbuf, *tmp;
const char *inbuf;
size_t outlen;
iconv_t cd;
if ((cd = iconv_open (to_charset, from_charset)) == (iconv_t) -1)
return NULL;
inleft = strlen (input);
inbuf = input;
/* we'll start off allocating an output buffer which is the same size
* as our input buffer. */
outlen = inleft;
/* we allocate 4 bytes more than what we need for nul-termination... */
if (!(output = malloc (outlen + 4))) {
iconv_close (cd);
return NULL;
}
do {
errno = 0;
outbuf = output + converted;
outleft = outlen - converted;
converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);
if (converted != (size_t) -1 || errno == EINVAL) {
/*
* EINVAL An incomplete multibyte sequence has been encoun­-
* tered in the input.
*
* We'll just truncate it and ignore it.
*/
break;
}
if (errno != E2BIG) {
/*
* EILSEQ An invalid multibyte sequence has been encountered
* in the input.
*
* Bad input, we can't really recover from this.
*/
iconv_close (cd);
free (output);
return NULL;
}
/*
* E2BIG There is not sufficient room at *outbuf.
*
* We just need to grow our outbuffer and try again.
*/
converted = outbuf - output;
outlen += inleft * 2 + 8;
if (!(tmp = realloc (output, outlen + 4))) {
iconv_close (cd);
free (output);
return NULL;
}
output = tmp;
outbuf = output + converted;
} while (1);
/* flush the iconv conversion */
iconv (cd, NULL, NULL, &outbuf, &outleft);
iconv_close (cd);
/* Note: not all charsets can be nul-terminated with a single
* nul byte. UCS2, for example, needs 2 nul bytes and UCS4
* needs 4. I hope that 4 nul bytes is enough to terminate all
* multibyte charsets? */
/* nul-terminate the string */
memset (outbuf, 0, 4);
return output;
}
static const char * eucjp_to_utf8(const char src[]) {
return convert("EUC-JP", "UTF-8", src);
}
static void dump_hits(EB_Book* book) { static void dump_hits(EB_Book* book) {
EB_Hit hits[MAX_ENTRY_HITS]; EB_Hit hits[MAX_ENTRY_HITS];
int hit_count = 0; int hit_count = 0;
@ -183,7 +47,10 @@ static void dump_hits(EB_Book* book) {
eb_read_text(book, NULL, NULL, NULL, MAX_ENTRY_TEXT, text, &text_length); eb_read_text(book, NULL, NULL, NULL, MAX_ENTRY_TEXT, text, &text_length);
const char* text_utf8 = eucjp_to_utf8(text); const char* text_utf8 = eucjp_to_utf8(text);
puts(text_utf8); if (text_utf8 != NULL) {
puts(text_utf8);
}
/* (void) text_utf8; */ /* (void) text_utf8; */
} }
} }
@ -252,10 +119,6 @@ static int process(const char path[]) {
return 0; return 0;
} }
/*
Entry point
*/
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "usage: %s path\n", argv[0]); fprintf(stderr, "usage: %s path\n", argv[0]);

40
util.c Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "util.h"
void array_init(Array* arr, size_t init_size) {
arr->ptr = (Entry *)malloc(init_size * sizeof(Entry));
arr->used = 0;
arr->size = init_size;
}
Entry* array_new(Array* arr) {
if (arr->used == arr->size) {
arr->size *= 2;
arr->ptr = (Entry *)realloc(arr->ptr, arr->size * sizeof(Entry));
}
return &arr->ptr[arr->used++];
}
void array_free(Array* arr) {
free(arr->ptr);
arr->ptr = NULL;
arr->used = arr->size = 0;
}

39
util.h Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef UTIL_H
#define UTIL_H
#include <stdlib.h>
typedef struct {
char* header;
char* text;
} Entry;
typedef struct {
Entry* ptr;
size_t used;
size_t size;
} Array;
void array_init(Array* arr, size_t init_size);
Entry* array_new(Array* arr);
void array_free(Array* arr);
#endif