uncompression+linux port

src/index/Makefile

@@ -1,5 +1,4 @@
-
-include ../mk/FreeBSD
+include ../mk/sysconf
 
 BIGLIB = ../lib/librcl.a
 
@@ -9,12 +8,12 @@ all: $(PROGS)
 IDXDRIVER_OBJS= idxdriver.o $(BIGLIB)
 idxdriver : $(IDXDRIVER_OBJS)
 	$(CXX) $(CXXFLAGS) -o idxdriver $(IDXDRIVER_OBJS) \
-	       -L/usr/local/lib -lxapian -liconv
+		$(LIBXAPIAN) $(LIBICONV) $(LIBSYS)
 
 CSGUESS_OBJS= trcsguess.o  $(BIGLIB) 
 csguess : $(CSGUESS_OBJS)
 	$(CXX) $(CXXFLAGS) -o csguess $(CSGUESS_OBJS) \
-	       -L/usr/local/lib -liconv
+	       $(LIBICONV)
 trcsguess.o : csguess.cpp
 	$(CXX) $(CXXFLAGS) -DTEST_CSGUESS -c -o trcsguess.o \
 	       csguess.cpp

src/index/csguess.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.2 2004-12-15 15:00:37 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.3 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_CSGUESS
@@ -54,7 +54,13 @@ static int transcodeErrCnt(const char *ptr, int size,
     while(isiz > 0){
 	osiz = 2*ICONVCHECKSIZ;
 	wp = obuf;
-	if(iconv(ic, (const char **)&rp, &isiz, &wp, &osiz) == (size_t)-1){
+	if(iconv(ic, 
+#if defined(_LIBICONV_VERSION)
+		 (const char **)&rp, 
+#else
+		 (char **)&rp, 
+#endif
+		 &isiz, &wp, &osiz) == (size_t)-1){
 	    if(errno == EILSEQ || errno == EINVAL){
 		rp++;
 		isiz--;

src/index/indexer.cpp

@@ -1,6 +1,7 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.3 2005-02-04 09:39:44 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.4 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
+#include <stdio.h>
 #include <sys/stat.h>
 
 #include <strings.h>