tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uncompression+linux port

Browse Source
This commit is contained in:
dockes
2005-02-04 14:21:18 +00:00
parent 1f8fbc0d39
commit 74434a3b02
36 changed files with 781 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/Makefile
+4 -7
View File
@@ -1,4 +1,4 @@
include ../mk/FreeBSD
include ../mk/sysconf
BIGLIB = ../lib/librcl.a
@@ -26,24 +26,21 @@ trexecmd.o : execmd.cpp execmd.h
TRANSCODE_OBJS= trtranscode.o $(BIGLIB)
transcode : $(TRANSCODE_OBJS)
$(CXX) $(CXXFLAGS) -o transcode $(TRANSCODE_OBJS) \
-L/usr/local/lib -liconv
$(CXX) $(CXXFLAGS) -o transcode $(TRANSCODE_OBJS) $(LIBICONV)
trtranscode.o : ../utils/transcode.cpp
$(CXX) $(CXXFLAGS) -DTEST_TRANSCODE -c -o trtranscode.o \
transcode.cpp
MIMEPARSE_OBJS= trmimeparse.o $(BIGLIB)
trmimeparse : $(MIMEPARSE_OBJS)
$(CXX) $(CXXFLAGS) -o mimeparse $(MIMEPARSE_OBJS) \
-L/usr/local/lib -liconv
$(CXX) $(CXXFLAGS) -o mimeparse $(MIMEPARSE_OBJS) $(LIBICONV)
trmimeparse.o : mimeparse.cpp
$(CXX) $(CXXFLAGS) -DTEST_MIMEPARSE -c -o trmimeparse.o \
mimeparse.cpp
SMALLUT_OBJS= trsmallut.o $(BIGLIB)
smallut : $(SMALLUT_OBJS)
$(CXX) $(CXXFLAGS) -o smallut $(SMALLUT_OBJS) \
-L/usr/local/lib -liconv
$(CXX) $(CXXFLAGS) -o smallut $(SMALLUT_OBJS) $(LIBICONV)
trsmallut.o : ../utils/smallut.cpp
$(CXX) $(CXXFLAGS) -DTEST_SMALLUT -c -o trsmallut.o \
smallut.cpp
src/utils/pathut.cpp
+2 -2
View File
@@ -1,9 +1,9 @@
#ifndef lint
static char rcsid[] = "@(#$Id: pathut.cpp,v 1.3 2005-01-31 14:31:10 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: pathut.cpp,v 1.4 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_PATHUT
#include <unistd.h>
#include <pwd.h>
#include <iostream>
src/utils/transcode.cpp
+8 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: transcode.cpp,v 1.2 2004-12-15 15:00:37 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: transcode.cpp,v 1.3 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_TRANSCODE
@@ -40,7 +40,13 @@ bool transcode(const string &in, string &out, const string &icode,
size_t osiz;
op = obuf;
osiz = OBSIZ;
if(iconv(ic, &ip, &isiz, &op, &osiz) == (size_t)-1 && errno != E2BIG){
if(iconv(ic,
#if defined(_LIBICONV_VERSION)
&ip,
#else
(char **)&ip,
#endif
&isiz, &op, &osiz) == (size_t)-1 && errno != E2BIG){
out.erase();
out = string("iconv failed for ") + icode + " -> " + ocode +
" : " + strerror(errno);