commit 581d0ae328b968f8cc8ae4ad25bc7cb179269660
parent 97a02ac7d6a4e45d2679b4b9bbdaff184a913b11
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 13 Sep 2005 15:42:41 +0000
fixes
Diffstat:
11 files changed, 60 insertions(+), 75 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = config.rpath \
PLATFORMS README.debian
# yayh: automake hacks!
dist-hook:
+ cp -p $(srcdir)/src/plugins/printable/??.txt $(distdir)/src/plugins/printable/
rm -f $(distdir)/src/plugins/printable/??.c
rm -f $(distdir)/src/plugins/printable/peen.c
rm -f $(distdir)/src/plugins/printable/pede.c
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([libextractor], [0.5.5], [bug-libextractor@gnu.org])
+AC_INIT([libextractor], [0.5.5-svn], [bug-libextractor@gnu.org])
AC_REVISION($Revision: 1.67 $)
-AM_INIT_AUTOMAKE([libextractor], [0.5.5])
+AM_INIT_AUTOMAKE([libextractor], [0.5.5-svn])
AM_CONFIG_HEADER(src/include/config.h)
AH_TOP([#define _GNU_SOURCE 1])
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -4,21 +4,9 @@ src/plugins/hash/sha1extractor.c
src/plugins/thumbnail/thumbnailextractor.c
src/plugins/rpm/rpmextractor.c
src/plugins/printable/peXX.c
-src/plugins/printable/printableextractor.c
-src/plugins/printable/bloomfilter.c
-src/plugins/printable/en.c
-src/plugins/printable/it.c
+src/plugins/printable/printableextractor.h
+src/plugins/printable/bloomfilter.h
src/plugins/printable/dictionary-builder.c
-src/plugins/printable/peen.c
-src/plugins/printable/peit.c
-src/plugins/printable/da.c
-src/plugins/printable/peda.c
-src/plugins/printable/de.c
-src/plugins/printable/pede.c
-src/plugins/printable/es.c
-src/plugins/printable/pees.c
-src/plugins/printable/no.c
-src/plugins/printable/peno.c
src/plugins/ole2/ole2extractor.c
src/plugins/oo/ooextractor.c
src/plugins/id3v24extractor.c
@@ -50,7 +38,6 @@ src/plugins/pdf/gtypes.h
src/plugins/pdf/Lexer.h
src/plugins/pdf/FontEncoding.h
src/plugins/pdf/Stream-CCITT.h
-src/plugins/pdf/FontInfo.h
src/plugins/pdf/Params.h
src/plugins/pdf/gfile.h
src/plugins/pdf/parseargs.h
diff --git a/po/de.po b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.0\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2005-09-07 21:46-0700\n"
+"POT-Creation-Date: 2005-09-13 08:34-0700\n"
"PO-Revision-Date: 2005-06-22 15:05+0200\n"
"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "Quell-RPM %d.%d"
msgid "Binary RPM %d.%d"
msgstr "Binäres RPM %d.%d"
-#: src/plugins/printable/dictionary-builder.c:69
+#: src/plugins/printable/dictionary-builder.c:99
#, c-format
msgid ""
"Please provide the name of the language you are building\n"
@@ -37,12 +37,12 @@ msgstr ""
"Bitte geben Sie den Namen der Sprache an, für die Sie ein Wörterbuch\n"
"erstellen. Zum Beispiel:\n"
-#: src/plugins/printable/dictionary-builder.c:82
+#: src/plugins/printable/dictionary-builder.c:112
#, c-format
msgid "Error opening file `%s': %s\n"
msgstr "Fehler beim Öffnen der Datei »%s«: %s\n"
-#: src/plugins/printable/dictionary-builder.c:90
+#: src/plugins/printable/dictionary-builder.c:120
#, c-format
msgid ""
"Error allocating: %s\n"
@@ -51,7 +51,7 @@ msgstr ""
"Fehler beim Allokieren: %s\n"
"."
-#: src/plugins/printable/dictionary-builder.c:102
+#: src/plugins/printable/dictionary-builder.c:132
#, c-format
msgid "Increase ALLOCSIZE (in %s).\n"
msgstr "ALLOCSIZE vergrößern (in %s).\n"
diff --git a/po/libextractor.pot b/po/libextractor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2005-09-07 21:46-0700\n"
+"POT-Creation-Date: 2005-09-13 08:34-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,26 +26,26 @@ msgstr ""
msgid "Binary RPM %d.%d"
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:69
+#: src/plugins/printable/dictionary-builder.c:99
#, c-format
msgid ""
"Please provide the name of the language you are building\n"
"a dictionary for. For example:\n"
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:82
+#: src/plugins/printable/dictionary-builder.c:112
#, c-format
msgid "Error opening file `%s': %s\n"
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:90
+#: src/plugins/printable/dictionary-builder.c:120
#, c-format
msgid ""
"Error allocating: %s\n"
"."
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:102
+#: src/plugins/printable/dictionary-builder.c:132
#, c-format
msgid "Increase ALLOCSIZE (in %s).\n"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2005-09-07 21:46-0700\n"
+"POT-Creation-Date: 2005-09-13 08:34-0700\n"
"PO-Revision-Date: 2005-02-25 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr "Surs
msgid "Binary RPM %d.%d"
msgstr "Binar RPM %d.%d"
-#: src/plugins/printable/dictionary-builder.c:69
+#: src/plugins/printable/dictionary-builder.c:99
#, c-format
msgid ""
"Please provide the name of the language you are building\n"
@@ -37,12 +37,12 @@ msgstr ""
"Vã rugãm furnizaþi numele limbii pentru care contruiþi\n"
"un dicþionar. De exemplu:\n"
-#: src/plugins/printable/dictionary-builder.c:82
+#: src/plugins/printable/dictionary-builder.c:112
#, c-format
msgid "Error opening file `%s': %s\n"
msgstr "Eroare deschidere fiºier `%s': %s\n"
-#: src/plugins/printable/dictionary-builder.c:90
+#: src/plugins/printable/dictionary-builder.c:120
#, c-format
msgid ""
"Error allocating: %s\n"
@@ -51,7 +51,7 @@ msgstr ""
"Eroare de alocare: %s\n"
"."
-#: src/plugins/printable/dictionary-builder.c:102
+#: src/plugins/printable/dictionary-builder.c:132
#, c-format
msgid "Increase ALLOCSIZE (in %s).\n"
msgstr "Creºteþi ALLOCSIZE (în %s).\n"
diff --git a/po/rw.po b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2005-09-07 21:46-0700\n"
+"POT-Creation-Date: 2005-09-13 08:34-0700\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -34,7 +34,7 @@ msgstr ""
msgid "Binary RPM %d.%d"
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:69
+#: src/plugins/printable/dictionary-builder.c:99
#, fuzzy, c-format
msgid ""
"Please provide the name of the language you are building\n"
@@ -42,19 +42,19 @@ msgid ""
msgstr "i Izina: Bya i Ururimi Inkoranyamagambo kugirango Urugero"
# basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: src/plugins/printable/dictionary-builder.c:82
+#: src/plugins/printable/dictionary-builder.c:112
#, fuzzy, c-format
msgid "Error opening file `%s': %s\n"
msgstr "Hari ikibazo mu gufungura dosiye"
-#: src/plugins/printable/dictionary-builder.c:90
+#: src/plugins/printable/dictionary-builder.c:120
#, c-format
msgid ""
"Error allocating: %s\n"
"."
msgstr ""
-#: src/plugins/printable/dictionary-builder.c:102
+#: src/plugins/printable/dictionary-builder.c:132
#, fuzzy, c-format
msgid "Increase ALLOCSIZE (in %s).\n"
msgstr "in"
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -29,7 +29,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00050501
+#define EXTRACTOR_VERSION 0x00050502
#include <stdio.h>
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -63,7 +63,7 @@ if HAVE_VORBISFILE
libextractor_ogg_la_SOURCES = \
oggextractor.c
libextractor_ogg_la_LDFLAGS = \
- -lvorbisfile $(vorbisflag) $(PLUGINFLAGS) $(retaincommand)OGG_SYMBOLS
+ -lvorbisfile $(vorbisflag) $(PLUGINFLAGS) $(retaincommand)
endif
noinst_LTLIBRARIES = \
@@ -73,7 +73,7 @@ noinst_LTLIBRARIES = \
if HAVE_ZLIB
libextractor_qt_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)QT_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_qt_la_LIBADD = \
-lz
libextractor_qt_la_SOURCES = \
@@ -84,81 +84,81 @@ libextractor_ps_la_SOURCES = \
psextractor.c
libextractor_ps_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)PS_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_wav_la_SOURCES = \
wavextractor.c
libextractor_wav_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)WAV_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_mp3_la_SOURCES = \
mp3extractor.c
libextractor_mp3_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)MP3_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_mp3_la_LIBADD = \
libconvert.la
libextractor_id3v2_la_SOURCES = \
id3v2extractor.c
libextractor_id3v2_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)ID3V2_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_id3v2_la_LIBADD = \
libconvert.la
libextractor_id3v23_la_SOURCES = \
id3v23extractor.c
libextractor_id3v23_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)ID3V23_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_id3v23_la_LIBADD = \
libconvert.la
libextractor_id3v24_la_SOURCES = \
id3v24extractor.c
libextractor_id3v24_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)ID3V24_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_id3v24_la_LIBADD = \
libconvert.la
libextractor_dvi_la_SOURCES = \
dviextractor.c
libextractor_dvi_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)DVI_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_asf_la_SOURCES = \
asfextractor.c
libextractor_asf_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)ASF_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_tar_la_SOURCES = \
tarextractor.c
libextractor_tar_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)TAR_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_tar_la_LIBADD = \
$(top_builddir)/src/main/libextractor.la
libextractor_lower_la_SOURCES = \
lowerextractor.c
libextractor_lower_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)LOWER_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_gif_la_SOURCES = \
gifextractor.c
libextractor_gif_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)GIF_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_gif_la_LIBADD = \
libpack.la
libextractor_tiff_la_SOURCES = \
tiffextractor.c
libextractor_tiff_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)TIFF_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_tiff_la_LIBADD = \
libpack.la
libextractor_elf_la_SOURCES = \
elfextractor.c
libextractor_elf_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)ELF_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_elf_la_LIBADD = \
libpack.la
@@ -176,35 +176,35 @@ libextractor_zip_la_SOURCES = \
zipextractor.c
libextractor_zip_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)ZIP_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_jpeg_la_SOURCES = \
jpegextractor.c
libextractor_jpeg_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)JPEG_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_html_la_SOURCES = \
htmlextractor.c
libextractor_html_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)HTML_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_real_la_SOURCES = \
realextractor.c
libextractor_real_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)REAL_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_mime_la_SOURCES = \
mimeextractor.c
libextractor_mime_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)MIME_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_mpeg_la_SOURCES = \
mpegextractor.c
libextractor_mpeg_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)MPEG_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_mpeg_la_LIBADD = \
-lm
@@ -212,13 +212,13 @@ libextractor_man_la_SOURCES = \
manextractor.c
libextractor_man_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)MAN_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_deb_la_SOURCES = \
debextractor.c
libextractor_deb_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)DEB_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_deb_la_LIBADD = \
-lz
@@ -226,7 +226,7 @@ libextractor_riff_la_SOURCES = \
riffextractor.c
libextractor_riff_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)RIFF_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_riff_la_LIBADD = \
-lm
@@ -234,14 +234,14 @@ libextractor_png_la_SOURCES = \
pngextractor.c
libextractor_png_la_LDFLAGS = \
$(top_builddir)/src/main/libextractor.la \
- $(PLUGINFLAGS) $(retaincommand)PNG_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_png_la_LIBADD = \
libconvert.la -lz
libextractor_filename_la_SOURCES = \
filenameextractor.c
libextractor_filename_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)FILENAME_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_filename_la_LIBADD = \
$(top_builddir)/src/main/libextractor.la \
libconvert.la
@@ -249,10 +249,10 @@ libextractor_filename_la_LIBADD = \
libextractor_split_la_SOURCES = \
splitextractor.c
libextractor_split_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)SPLIT_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
libextractor_translit_la_SOURCES = \
translitextractor.c
libextractor_translit_la_LDFLAGS = \
- $(PLUGINFLAGS) $(retaincommand)TRANSLIT_SYMBOLS
+ $(PLUGINFLAGS) $(retaincommand)
diff --git a/src/plugins/debextractor.c b/src/plugins/debextractor.c
@@ -237,10 +237,7 @@ processControlTGZ(const unsigned char * data,
size_t size,
struct EXTRACTOR_Keywords * prev) {
size_t bufSize;
- gzFile gzf;
- int fdes[2];
char * buf;
- void * error;
z_stream strm;
bufSize = data[size-4] + 256 * data[size-3] + 65536 * data[size-2] + 256*65536 * data[size-1];
diff --git a/src/plugins/printable/Makefile.am b/src/plugins/printable/Makefile.am
@@ -57,31 +57,31 @@ libextractor_printable_no_la_LIBADD = \
$(top_builddir)/src/main/libextractor.la
libextractor_printable_en_la_SOURCES = \
- en.c peen.c bloomfilter.h printableextractor.h
+ en.c peen.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_en_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
libextractor_printable_es_la_SOURCES = \
- es.c pees.c bloomfilter.h printableextractor.h
+ es.c pees.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_es_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
libextractor_printable_de_la_SOURCES = \
- de.c pede.c bloomfilter.h printableextractor.h
+ de.c pede.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_de_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
libextractor_printable_it_la_SOURCES = \
- it.c peit.c bloomfilter.h printableextractor.h
+ it.c peit.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_it_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
libextractor_printable_da_la_SOURCES = \
- da.c peda.c bloomfilter.h printableextractor.h
+ da.c peda.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_da_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
libextractor_printable_no_la_SOURCES = \
- no.c peno.c bloomfilter.h printableextractor.h
+ no.c peno.c bloomfilter.h printableextractor.h bloomfilter-def.h
libextractor_printable_no_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
