Switch to unified view

a/src/index/recollindex.cpp b/src/index/recollindex.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.30 2006-12-24 07:40:26 dockes Exp $ (C) 2004 J.F.Dockes";
2
static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.31 2007-02-02 10:09:10 dockes Exp $ (C) 2004 J.F.Dockes";
3
#endif
3
#endif
4
/*
4
/*
5
 *   This program is free software; you can redistribute it and/or modify
5
 *   This program is free software; you can redistribute it and/or modify
6
 *   it under the terms of the GNU General Public License as published by
6
 *   it under the terms of the GNU General Public License as published by
7
 *   the Free Software Foundation; either version 2 of the License, or
7
 *   the Free Software Foundation; either version 2 of the License, or
...
...
35
#include "rclinit.h"
35
#include "rclinit.h"
36
#include "indexer.h"
36
#include "indexer.h"
37
#include "smallut.h"
37
#include "smallut.h"
38
#include "pathut.h"
38
#include "pathut.h"
39
#include "rclmon.h"
39
#include "rclmon.h"
40
#include "x11mon.h"
40
41
41
// Globals for exit cleanup
42
// Globals for exit cleanup
42
ConfIndexer *confindexer;
43
ConfIndexer *confindexer;
43
DbIndexer *dbindexer;
44
DbIndexer *dbindexer;
44
45
...
...
351
    }
352
    }
352
    if (sleepsecs > 0) {
353
    if (sleepsecs > 0) {
353
        LOGDEB(("recollindex: sleeping %d\n", sleepsecs));
354
        LOGDEB(("recollindex: sleeping %d\n", sleepsecs));
354
        sleep(sleepsecs);
355
        sleep(sleepsecs);
355
    }
356
    }
357
  // Check that x11 did not go away while we were sleeping.
358
  if (!(op_flags & OPT_x) && !x11IsAlive())
359
      exit(0);
360
356
    confindexer = new ConfIndexer(config, &updater);
361
    confindexer = new ConfIndexer(config, &updater);
357
    confindexer->index(rezero);
362
    confindexer->index(rezero);
358
    delete confindexer;
363
    delete confindexer;
359
    int opts = RCLMON_NONE;
364
    int opts = RCLMON_NONE;
360
    if (op_flags & OPT_D)
365
    if (op_flags & OPT_D)