last rewrite in rfc822parse.c

[apps/madmutt.git] / system.c

diff --git a/system.c b/system.c
index c9612f6..2d96430 100644 (file)
--- a/system.c
+++ b/system.c
@@ -12,11 +12,9 @@
 #endif
 
 #include "mutt.h"
-#ifdef USE_IMAP
-# include "imap.h"
-# include <errno.h>
-#endif
+#include <imap/imap.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
@@ -100,16 +98,11 @@ int _mutt_system (const char *cmd, int flags)
     sigaction (SIGTSTP, &act, NULL);
     sigaction (SIGCONT, &act, NULL);
 
-    execl (EXECSHELL, "sh", "-c", cmd, NULL);
+    execl ("/bin/sh", "sh", "-c", cmd, NULL);
     _exit (127);                /* execl error */
   }
   else if (thepid != -1) {
-#ifndef USE_IMAP
-    /* wait for the (first) child process to finish */
-    waitpid (thepid, &rc, 0);
-#else
     rc = imap_wait_keepalive (thepid);
-#endif
   }
 
   sigaction (SIGCONT, &oldcont, NULL);