Add support for indexing symlinks as such. Use inode/directory instead of application/x-fsdirectory as directory mime type. Fix stat/lstat usage in places (wipedir)

src/internfile/mh_symlink.h

@@ -0,0 +1,70 @@
+/* Copyright (C) 2004 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
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+#ifndef _MH_SYMLINK_H_INCLUDED_
+#define _MH_SYMLINK_H_INCLUDED_
+
+#include <string>
+#include <unistd.h>
+#include <errno.h>
+
+#include "cstr.h"
+#include "mimehandler.h"
+#include "transcode.h"
+#include "pathut.h"
+#include "debuglog.h"
+
+/** Index symlink target 
+ *
+ * Not sure that this is such a good idea, so it's disabled by default in
+ * the config. Add inode/symlink = internal to the index section of mimeconf 
+ * to enable.
+ */
+class MimeHandlerSymlink : public RecollFilter {
+ public:
+    MimeHandlerSymlink(RclConfig *cnf, const std::string& mt) 
+	: RecollFilter(cnf, mt) {}
+    virtual ~MimeHandlerSymlink() {}
+    virtual bool set_document_file(const string& fn) 
+    {
+	RecollFilter::set_document_file(fn);
+	m_fn = fn;
+	return m_havedoc = true;
+    }
+    virtual bool next_document() 
+    {
+	if (m_havedoc == false)
+	    return false;
+	m_havedoc = false; 
+	m_metaData[cstr_dj_keycontent] = cstr_null;
+	char lc[1024];
+	ssize_t bytes = readlink(m_fn.c_str(), lc, 1024);
+	if (bytes != (ssize_t)-1) {
+	    string slc(lc, bytes);
+	    transcode(path_getsimple(slc), m_metaData[cstr_dj_keycontent], 
+		      m_config->getDefCharset(true), "UTF-8");
+	} else {
+	    LOGDEB(("Symlink: readlink [%s] failed, errno %d\n", m_fn.c_str(),
+		    errno));
+	}
+	m_metaData[cstr_dj_keymt] = cstr_textplain;
+	return true;
+    }
+private:
+    std::string m_fn;
+};
+
+#endif /* _MH_SYMLINK_H_INCLUDED_ */

src/internfile/mimehandler.cpp

@@ -37,6 +37,7 @@ using namespace std;
 #include "mh_mail.h"
 #include "mh_mbox.h"
 #include "mh_text.h"
+#include "mh_symlink.h"
 #include "mh_unknown.h"
 #include "ptmutex.h"
 
@@ -148,6 +149,9 @@ static Dijon::Filter *mhFactory(RclConfig *config, const string &mime)
     } else if ("message/rfc822" == lmime) {
 	LOGDEB2(("mhFactory(%s): returning MimeHandlerMail\n", mime.c_str()));
 	return new MimeHandlerMail(config, lmime);
+    } else if ("inode/symlink" == lmime) {
+	LOGDEB2(("mhFactory(%s): ret MimeHandlerSymlink\n", mime.c_str()));
+	return new MimeHandlerSymlink(config, lmime);
     } else if (lmime.find("text/") == 0) {
         // Try to handle unknown text/xx as text/plain. This
         // only happen if the text/xx was defined as "internal" in