Changeset 1057 for trunk/rtorrent/src/rpc/exec_file.cc

Timestamp:

05/01/08 13:14:43 (4 years ago)

Author:

rakshasa

Message:

* Fixed EINTR handling in execute command. Patch by anonymous.

* Fixed a couple of memory leaks in xmlrpc.cc. Reported by Novik.

Files:

• trunk/rtorrent/src/rpc/exec_file.cc (modified) (2 diffs)

trunk/rtorrent/src/rpc/exec_file.cc

@@ -39 +39 @@
 #include <string>
 #include <unistd.h>
+#include <rak/error_number.h>
 #include <rak/path.h>
 #include <sys/types.h>
@@ -91 +92 @@
   } else {
     int status;
+    int wpid = waitpid(childPid, &status, 0);
 
-    if (waitpid(childPid, &status, 0) != childPid)
+    while (wpid == -1 && rak::error_number::current().value() == rak::error_number::e_intr)
+      wpid = waitpid(childPid, &status, 0);
+
+    if (wpid != childPid)
       throw torrent::internal_error("ExecFile::execute(...) waitpid failed.");