From 57dcff1e359fefd9db03acbff7094c68779b76e5 Mon Sep 17 00:00:00 2001 From: dockes Date: Sun, 30 Apr 2006 07:39:09 +0000 Subject: [PATCH] fbsd4 tweaks --- src/VERSION | 2 +- src/index/indexer.cpp | 6 +- src/index/indexer.h | 4 +- src/lib/Makefile | 142 +++++++++++++++++++++--------------------- src/lib/mkMake | 6 +- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/VERSION b/src/VERSION index 347f5833..9df886c4 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.4.1 +1.4.2 diff --git a/src/index/indexer.cpp b/src/index/indexer.cpp index d47a32b6..405f5e51 100644 --- a/src/index/indexer.cpp +++ b/src/index/indexer.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: indexer.cpp,v 1.33 2006-04-28 07:54:38 dockes Exp $ (C) 2004 J.F.Dockes"; +static char rcsid[] = "@(#$Id: indexer.cpp,v 1.34 2006-04-30 07:39:09 dockes Exp $ (C) 2004 J.F.Dockes"; #endif /* * This program is free software; you can redistribute it and/or modify @@ -100,7 +100,7 @@ bool DbIndexer::indexDb(bool resetbefore, list *topdirs) } } if (m_updater) { - m_updater->status.fn.clear(); + m_updater->status.fn.erase(); m_updater->status.phase = DbIxStatus::DBIXS_PURGE; m_updater->update(); } @@ -137,7 +137,7 @@ bool DbIndexer::indexDb(bool resetbefore, list *topdirs) // The close would be done in our destructor, but we want status here if (m_updater) { m_updater->status.phase = DbIxStatus::DBIXS_CLOSING; - m_updater->status.fn.clear(); + m_updater->status.fn.erase(); m_updater->update(); } if (!m_db.close()) { diff --git a/src/index/indexer.h b/src/index/indexer.h index afedaf1a..23a3aea2 100644 --- a/src/index/indexer.h +++ b/src/index/indexer.h @@ -16,7 +16,7 @@ */ #ifndef _INDEXER_H_INCLUDED_ #define _INDEXER_H_INCLUDED_ -/* @(#$Id: indexer.h,v 1.15 2006-04-12 10:41:39 dockes Exp $ (C) 2004 J.F.Dockes */ +/* @(#$Id: indexer.h,v 1.16 2006-04-30 07:35:18 dockes Exp $ (C) 2004 J.F.Dockes */ #include #include @@ -40,7 +40,7 @@ class DbIxStatus { string fn; // Last file processed int docsdone; // Documents processed int dbtotdocs; // Doc count in index at start - void reset() {phase = DBIXS_FILES;fn.clear();docsdone=dbtotdocs=0;} + void reset() {phase = DBIXS_FILES;fn.erase();docsdone=dbtotdocs=0;} DbIxStatus() {reset();} }; diff --git a/src/lib/Makefile b/src/lib/Makefile index 020608c5..dd445c28 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -16,77 +16,77 @@ librcl.a : $(DEPS) $(OBJS) unac.o $(RANLIB) librcl.a unac.o : $(depth)/unac/unac.c $(depth)/unac/unac.h - $(CC) $(UNACCFLAGS) -c $< + $(CC) $(UNACCFLAGS) -c $(depth)/unac/unac.c conftree.o : ../utils/conftree.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/conftree.cpp csguess.o : ../index/csguess.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../index/csguess.cpp debuglog.o : ../utils/debuglog.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/debuglog.cpp execmd.o : ../utils/execmd.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/execmd.cpp idfile.o : ../utils/idfile.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/idfile.cpp md5.o : ../utils/md5.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/md5.cpp wipedir.o : ../utils/wipedir.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/wipedir.cpp fstreewalk.o : ../utils/fstreewalk.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/fstreewalk.cpp mh_html.o : ../common/mh_html.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/mh_html.cpp mh_mail.o : ../common/mh_mail.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/mh_mail.cpp mh_exec.o : ../common/mh_exec.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/mh_exec.cpp mh_text.o : ../common/mh_text.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/mh_text.cpp htmlparse.o : ../common/htmlparse.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/htmlparse.cpp indexer.o : ../index/indexer.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../index/indexer.cpp internfile.o : ../common/internfile.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/internfile.cpp mimehandler.o : ../common/mimehandler.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/mimehandler.cpp mimeparse.o : ../utils/mimeparse.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/mimeparse.cpp mimetype.o : ../index/mimetype.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../index/mimetype.cpp myhtmlparse.o : ../common/myhtmlparse.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/myhtmlparse.cpp pathhash.o : ../common/pathhash.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/pathhash.cpp pathut.o : ../utils/pathut.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/pathut.cpp rclconfig.o : ../common/rclconfig.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/rclconfig.cpp rcldb.o : ../common/rcldb.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/rcldb.cpp rclinit.o : ../common/rclinit.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/rclinit.cpp stemdb.o : ../common/stemdb.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/stemdb.cpp base64.o : ../utils/base64.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/base64.cpp readfile.o : ../utils/readfile.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/readfile.cpp smallut.o : ../utils/smallut.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/smallut.cpp textsplit.o : ../common/textsplit.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/textsplit.cpp transcode.o : ../utils/transcode.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/transcode.cpp unacpp.o : ../common/unacpp.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../common/unacpp.cpp history.o : ../query/history.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../query/history.cpp docseq.o : ../query/docseq.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../query/docseq.cpp sortseq.o : ../query/sortseq.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../query/sortseq.cpp copyfile.o : ../utils/copyfile.cpp - $(CXX) $(ALL_CXXFLAGS) -c $< + $(CXX) $(ALL_CXXFLAGS) -c ../utils/copyfile.cpp depend: $(DEPS) clean: rm -f $(OBJS) $(LIBS) $(DEPS) unac.o @@ -94,109 +94,109 @@ clean: distclean: clean rm -f *.dep conftree.dep.stamp : ../utils/conftree.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > conftree.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/conftree.cpp > conftree.dep touch conftree.dep.stamp csguess.dep.stamp : ../index/csguess.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > csguess.dep + $(CXX) -M $(ALL_CXXFLAGS) ../index/csguess.cpp > csguess.dep touch csguess.dep.stamp debuglog.dep.stamp : ../utils/debuglog.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > debuglog.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/debuglog.cpp > debuglog.dep touch debuglog.dep.stamp execmd.dep.stamp : ../utils/execmd.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > execmd.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/execmd.cpp > execmd.dep touch execmd.dep.stamp idfile.dep.stamp : ../utils/idfile.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > idfile.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/idfile.cpp > idfile.dep touch idfile.dep.stamp md5.dep.stamp : ../utils/md5.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > md5.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/md5.cpp > md5.dep touch md5.dep.stamp wipedir.dep.stamp : ../utils/wipedir.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > wipedir.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/wipedir.cpp > wipedir.dep touch wipedir.dep.stamp fstreewalk.dep.stamp : ../utils/fstreewalk.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > fstreewalk.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/fstreewalk.cpp > fstreewalk.dep touch fstreewalk.dep.stamp mh_html.dep.stamp : ../common/mh_html.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mh_html.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/mh_html.cpp > mh_html.dep touch mh_html.dep.stamp mh_mail.dep.stamp : ../common/mh_mail.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mh_mail.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/mh_mail.cpp > mh_mail.dep touch mh_mail.dep.stamp mh_exec.dep.stamp : ../common/mh_exec.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mh_exec.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/mh_exec.cpp > mh_exec.dep touch mh_exec.dep.stamp mh_text.dep.stamp : ../common/mh_text.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mh_text.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/mh_text.cpp > mh_text.dep touch mh_text.dep.stamp htmlparse.dep.stamp : ../common/htmlparse.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > htmlparse.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/htmlparse.cpp > htmlparse.dep touch htmlparse.dep.stamp indexer.dep.stamp : ../index/indexer.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > indexer.dep + $(CXX) -M $(ALL_CXXFLAGS) ../index/indexer.cpp > indexer.dep touch indexer.dep.stamp internfile.dep.stamp : ../common/internfile.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > internfile.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/internfile.cpp > internfile.dep touch internfile.dep.stamp mimehandler.dep.stamp : ../common/mimehandler.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mimehandler.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/mimehandler.cpp > mimehandler.dep touch mimehandler.dep.stamp mimeparse.dep.stamp : ../utils/mimeparse.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mimeparse.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/mimeparse.cpp > mimeparse.dep touch mimeparse.dep.stamp mimetype.dep.stamp : ../index/mimetype.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > mimetype.dep + $(CXX) -M $(ALL_CXXFLAGS) ../index/mimetype.cpp > mimetype.dep touch mimetype.dep.stamp myhtmlparse.dep.stamp : ../common/myhtmlparse.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > myhtmlparse.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/myhtmlparse.cpp > myhtmlparse.dep touch myhtmlparse.dep.stamp pathhash.dep.stamp : ../common/pathhash.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > pathhash.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/pathhash.cpp > pathhash.dep touch pathhash.dep.stamp pathut.dep.stamp : ../utils/pathut.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > pathut.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/pathut.cpp > pathut.dep touch pathut.dep.stamp rclconfig.dep.stamp : ../common/rclconfig.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > rclconfig.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/rclconfig.cpp > rclconfig.dep touch rclconfig.dep.stamp rcldb.dep.stamp : ../common/rcldb.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > rcldb.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/rcldb.cpp > rcldb.dep touch rcldb.dep.stamp rclinit.dep.stamp : ../common/rclinit.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > rclinit.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/rclinit.cpp > rclinit.dep touch rclinit.dep.stamp stemdb.dep.stamp : ../common/stemdb.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > stemdb.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/stemdb.cpp > stemdb.dep touch stemdb.dep.stamp base64.dep.stamp : ../utils/base64.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > base64.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/base64.cpp > base64.dep touch base64.dep.stamp readfile.dep.stamp : ../utils/readfile.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > readfile.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/readfile.cpp > readfile.dep touch readfile.dep.stamp smallut.dep.stamp : ../utils/smallut.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > smallut.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/smallut.cpp > smallut.dep touch smallut.dep.stamp textsplit.dep.stamp : ../common/textsplit.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > textsplit.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/textsplit.cpp > textsplit.dep touch textsplit.dep.stamp transcode.dep.stamp : ../utils/transcode.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > transcode.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/transcode.cpp > transcode.dep touch transcode.dep.stamp unacpp.dep.stamp : ../common/unacpp.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > unacpp.dep + $(CXX) -M $(ALL_CXXFLAGS) ../common/unacpp.cpp > unacpp.dep touch unacpp.dep.stamp history.dep.stamp : ../query/history.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > history.dep + $(CXX) -M $(ALL_CXXFLAGS) ../query/history.cpp > history.dep touch history.dep.stamp docseq.dep.stamp : ../query/docseq.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > docseq.dep + $(CXX) -M $(ALL_CXXFLAGS) ../query/docseq.cpp > docseq.dep touch docseq.dep.stamp sortseq.dep.stamp : ../query/sortseq.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > sortseq.dep + $(CXX) -M $(ALL_CXXFLAGS) ../query/sortseq.cpp > sortseq.dep touch sortseq.dep.stamp copyfile.dep.stamp : ../utils/copyfile.cpp - $(CXX) -M $(ALL_CXXFLAGS) $< > copyfile.dep + $(CXX) -M $(ALL_CXXFLAGS) ../utils/copyfile.cpp > copyfile.dep touch copyfile.dep.stamp include conftree.dep include csguess.dep diff --git a/src/lib/mkMake b/src/lib/mkMake index 85deea9c..1a4bc9f8 100755 --- a/src/lib/mkMake +++ b/src/lib/mkMake @@ -54,13 +54,13 @@ librcl.a : \$(DEPS) \$(OBJS) unac.o \$(RANLIB) librcl.a unac.o : \$(depth)/unac/unac.c \$(depth)/unac/unac.h - \$(CC) \$(UNACCFLAGS) -c \$< + \$(CC) \$(UNACCFLAGS) -c \$(depth)/unac/unac.c EOF for c in $SRCS;do o=`basename $c .cpp`.o echo "$o : $c" >> $mk - echo " \$(CXX) \$(ALL_CXXFLAGS) -c \$<" >> $mk + echo " \$(CXX) \$(ALL_CXXFLAGS) -c $c" >> $mk done cat >> $mk <> $mk - echo " \$(CXX) -M \$(ALL_CXXFLAGS) \$< > $d" >> $mk + echo " \$(CXX) -M \$(ALL_CXXFLAGS) $c > $d" >> $mk echo " touch $s" >> $mk done for c in $SRCS;do