1st successful use of mh_exec (direct antiword exec)

--HG--
branch : WINDOWSPORT

src/internfile/mh_exec.cpp

@@ -17,10 +17,10 @@
 #include "autoconfig.h"
 
 #include <sys/types.h>
-#include <sys/wait.h>
+#include <time.h>
+#include "safesyswait.h"
 
 #include <list>
-using namespace std;
 
 #include "cstr.h"
 #include "execmd.h"
@@ -32,6 +32,8 @@ using namespace std;
 #include "md5ut.h"
 #include "rclconfig.h"
 
+using namespace std;
+
 // This is called periodically by ExeCmd when it is waiting for data,
 // or when it does receive some. We may choose to interrupt the
 // command.

src/internfile/mh_execm.cpp

@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 J.F.Dockes 
+	/* Copyright (C) 2005 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
@@ -32,7 +32,7 @@ using namespace std;
 #include "idfile.h"
 
 #include <sys/types.h>
-#include <sys/wait.h>
+#include "safesyswait.h"
 
 bool MimeHandlerExecMultiple::startCmd()
 {

src/internfile/mh_execm.h

@@ -98,9 +98,7 @@ text/plainData: 10
 class MimeHandlerExecMultiple : public MimeHandlerExec {
     /////////
     // Things not reset by "clear()", additionally to those in MimeHandlerExec
-#ifndef _WIN32
     ExecCmd  m_cmd;
-#endif
     /////// End un-cleared stuff.
 
  public:

src/internfile/mimehandler.cpp

@@ -195,9 +195,6 @@ static const string cstr_mh_charset("charset");
 MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
                                bool multiple, const string& id)
 {
-#ifdef _WIN32
-	return 0;
-#else
     ConfSimple attrs;
     string cmdstr;
 
@@ -241,7 +238,6 @@ MimeHandlerExec *mhExecFactory(RclConfig *cfg, const string& mtype, string& hs,
 #endif
 
     return h;
-#endif
 }
 
 /* Get handler/filter object for given mime type: */