summaryrefslogtreecommitdiffstats
path: root/tdeioslave/man
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-05-05 04:50:18 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-05-05 04:50:18 +0200
commit2b6bc47289c47d4c5322ac25b688d0b3027a31d0 (patch)
tree930adb699da2e0257033c4052bcedbfabc5768a0 /tdeioslave/man
parent8bdb01112167d8d83b75353064c3c94a1a1c27a8 (diff)
downloadtdebase-2b6bc47289c47d4c5322ac25b688d0b3027a31d0.tar.gz
tdebase-2b6bc47289c47d4c5322ac25b688d0b3027a31d0.zip
Added support for makewhatis in tdeio-man
This resolves Bug 714
Diffstat (limited to 'tdeioslave/man')
-rw-r--r--tdeioslave/man/tdeio_man.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index d48fd9746..07636c0a3 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -46,6 +46,8 @@
#include <kfilterbase.h>
#include <kfilterdev.h>
+#include "config.h"
+
using namespace TDEIO;
MANProtocol *MANProtocol::_self = 0;
@@ -569,6 +571,26 @@ char *MANProtocol::readManPage(const char *_filename)
}
lastdir = filename.left(filename.findRev('/'));
+#ifdef WITH_MAKEWHATIS
+ TQIODevice *fd= KFilterDev::deviceForFile(filename);
+
+ if ( !fd || !fd->open(IO_ReadOnly))
+ {
+ delete fd;
+ return 0;
+ }
+ TQByteArray array(fd->readAll());
+ kdDebug(7107) << "read " << array.size() << endl;
+ fd->close();
+ delete fd;
+
+ if (array.isEmpty())
+ return 0;
+
+ const int len = array.size();
+ buf = new char[len + 4];
+ tqmemmove(buf + 1, array.data(), len);
+#else
myStdStream = TQString::null;
TDEProcess proc;
/* TODO: detect availability of 'man --recode' so that this can go
@@ -583,6 +605,7 @@ char *MANProtocol::readManPage(const char *_filename)
const int len = cstr.size()-1;
buf = new char[len + 4];
tqmemmove(buf + 1, cstr.data(), len);
+#endif
buf[0]=buf[len]='\n'; // Start and end with a end of line
buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
}