Merged common utility versions with those in recoll. Keep them identical in the future and make maintenance easier

Jean-Francois Dockes Jean-Francois Dockes 2016-03-22

1 2 > >> (Page 1 of 2)
added src/pathut.h
added src/pathut.cpp
added src/smallut.cpp
added src/smallut.h
added src/readfile.cpp
added src/readfile.h
added src/conf_post.h
changed doc/releases.txt
changed scctl_src/scctl.cpp
changed src/config.h.in
changed src/execmd.cpp
changed src/execmd.h
changed src/httpfs.cxx
changed src/main.cxx
changed src/mpdcli.cxx
changed src/netcon.cpp
changed src/netcon.h
changed src/ohplaylist.cxx
changed src/ohproduct.cxx
changed src/ohradio.cxx
changed src/ohsndrcv.cxx
changed src/upmpdutils.cxx
changed src/upmpdutils.hxx
changed Makefile.am
copied src/conftree.cxx -> src/conftree.cpp
src/pathut.h Diff Switch to side-by-side view
Loading...
src/pathut.cpp Diff Switch to side-by-side view
Loading...
src/smallut.cpp Diff Switch to side-by-side view
Loading...
src/smallut.h Diff Switch to side-by-side view
Loading...
src/readfile.cpp Diff Switch to side-by-side view
Loading...
src/readfile.h Diff Switch to side-by-side view
Loading...
src/conf_post.h Diff Switch to side-by-side view
Loading...
doc/releases.txt Diff Switch to side-by-side view
Loading...
scctl_src/scctl.cpp Diff Switch to side-by-side view
Loading...
src/config.h.in Diff Switch to side-by-side view
Loading...
src/execmd.cpp Diff Switch to side-by-side view
Loading...
src/execmd.h Diff Switch to side-by-side view
Loading...
src/httpfs.cxx Diff Switch to side-by-side view
Loading...
src/main.cxx Diff Switch to side-by-side view
Loading...
src/mpdcli.cxx Diff Switch to side-by-side view
Loading...
src/netcon.cpp Diff Switch to side-by-side view
Loading...
src/netcon.h Diff Switch to side-by-side view
Loading...
src/ohplaylist.cxx Diff Switch to side-by-side view
Loading...
src/ohproduct.cxx Diff Switch to side-by-side view
Loading...
src/ohradio.cxx Diff Switch to side-by-side view
Loading...
src/ohsndrcv.cxx Diff Switch to side-by-side view
Loading...
src/upmpdutils.cxx Diff Switch to side-by-side view
Loading...
src/upmpdutils.hxx Diff Switch to side-by-side view
Loading...
Makefile.am Diff Switch to side-by-side view
Loading...
src/conftree.cxx to src/conftree.cpp
--- a/src/conftree.cxx
+++ b/src/conftree.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 J.F.Dockes
+/* Copyright (C) 2003-2016 J.F.Dockes
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -16,12 +16,24 @@
  */
 #ifndef TEST_CONFTREE
 
-#include "conftree.hxx"
-
+#ifdef BUILDING_RECOLL
+#include "autoconfig.h"
+#else
+#include "config.h"
+#endif
+
+#include "conftree.h"
+
+#include <ctype.h>
 #include <fnmatch.h>
+#ifdef _WIN32
+#include "safesysstat.h"
+#else
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <pwd.h>
+#endif
 
 #include <algorithm>
 #include <cstring>
@@ -30,7 +42,8 @@
 #include <sstream>
 #include <utility>
 
-#include "upmpdutils.hxx"
+#include "pathut.h"
+#include "smallut.h"
 
 using namespace std;
 
@@ -639,8 +652,8 @@
 
     // Look in subkey and up its parents until root ('')
     for (;;) {
-        //  LOGDEB((stderr,"ConfTree::get: looking for '%s' in '%s'\n",
-        //      name.c_str(), msk.c_str()));
+        // LOGDEB((stderr,"ConfTree::get: looking for '%s' in '%s'\n",
+        // name.c_str(), msk.c_str()));
         if (ConfSimple::get(name, value, msk)) {
             return 1;
         }
@@ -669,6 +682,10 @@
 #include <sstream>
 #include <iostream>
 #include <vector>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "conftree.h"
 #include "smallut.h"
1 2 > >> (Page 1 of 2)