last rewrite in rfc822parse.c

[apps/madmutt.git] / system.c

diff --git a/system.c b/system.c
index d34f2be..2d96430 100644 (file)
--- a/system.c
+++ b/system.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     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, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -21,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>
@@ -109,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);