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

checkpoint after long pause

Browse Source
This commit is contained in:
dockes
2005-03-17 14:02:06 +00:00
parent 670d7c2630
commit 6f66d9cb37
11 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/execmd.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: execmd.cpp,v 1.5 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: execmd.cpp,v 1.6 2005-03-17 14:02:05 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_EXECMD
#include <unistd.h>
@@ -22,7 +22,7 @@ using namespace std;
#define MAX(A,B) (A>B?A:B)
int
ExecCmd::doexec(const string &cmd, const list<string> args,
ExecCmd::doexec(const string &cmd, const list<string>& args,
const string *input, string *output)
{
{
src/utils/execmd.h
+2 -2
View File
@@ -1,6 +1,6 @@
#ifndef _EXECMD_H_INCLUDED_
#define _EXECMD_H_INCLUDED_
/* @(#$Id: execmd.h,v 1.1 2004-12-12 08:58:12 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: execmd.h,v 1.2 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string>
#include <list>
@@ -9,7 +9,7 @@ class ExecCmd {
public:
// ExecCmd() : argv(0) {};
// ~ExeCmd() {delete [] argv;}
int doexec(const std::string &cmd, const std::list<std::string> a,
int doexec(const std::string &cmd, const std::list<std::string>& a,
const std::string *input = 0,
std::string *output = 0);
};
src/utils/mimeparse.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.1 2005-01-26 11:45:55 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.2 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_MIMEPARSE
@@ -36,7 +36,7 @@ MimeHeaderValue parseMimeHeaderValue(const string &ein)
{
string in = ein;
MimeHeaderValue out;
string::size_type pos, pos1;
string::size_type pos;
pos = in.find_first_not_of(WHITE);
if (pos == string::npos)
src/utils/smallut.cpp
+5 -1
View File
@@ -1,10 +1,12 @@
#ifndef lint
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.4 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.5 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_SMALLUT
#include <string>
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -12,6 +14,8 @@ static char rcsid[] = "@(#$Id: smallut.cpp,v 1.4 2005-02-10 15:21:12 dockes Exp
#include "debuglog.h"
#include "pathut.h"
using namespace std;
#define MIN(A,B) ((A)<(B)?(A):(B))
bool maketmpdir(string& tdir)
src/utils/smallut.h
+3 -2
View File
@@ -1,11 +1,12 @@
#ifndef _SMALLUT_H_INCLUDED_
#define _SMALLUT_H_INCLUDED_
/* @(#$Id: smallut.h,v 1.4 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: smallut.h,v 1.5 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string>
#include <list>
#include <ostream>
using std::string;
using std::list;
using std::ostream;
extern int stringicmp(const string& s1, const string& s2);
extern int stringlowercmp(const string& alreadylower, const string& s2);
extern int stringuppercmp(const string& alreadyupper, const string& s2);
src/utils/utf8iter.h
+3 -2
View File
@@ -1,6 +1,6 @@
#ifndef _UTF8ITER_H_INCLUDED_
#define _UTF8ITER_H_INCLUDED_
/* @(#$Id: utf8iter.h,v 1.2 2005-02-11 11:20:02 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: utf8iter.h,v 1.3 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes */
/**
* A small helper class to iterate over utf8 strings. This is not an
@@ -117,9 +117,10 @@ class Utf8Iter {
return (unsigned int)-1;
}
/** Set current position before next utf-8 character */
string::size_type operator++(int) {
if (bad || (!cl && compute_cl() < 0)) {
return string::npos;
return pos = string::npos;
}
pos += cl;
m_charpos++;