Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge

Conflicts:
	Makefile.flags
	scripts/basic/fixdep.c

1 files changed, 7 insertions, 4 deletions

diff --git a/mailutils/mail.c b/mailutils/mail.c
index 66c79471f..f5260d9db 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -57,10 +57,13 @@ void FAST_FUNC launch_helper(const char **argv)
         G.helper_pid = xvfork();
 
         i = (!G.helper_pid) * 2; // for parent:0, for child:2
-        close(pipes[i + 1]); // 1 or 3 - closing one write end
-        close(pipes[2 - i]); // 2 or 0 - closing one read end
-        xmove_fd(pipes[i], STDIN_FILENO); // 0 or 2 - using other read end
-        xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - other write end
+        close(pipes[i + 1]);     // 1 or 3 - closing one write end
+        close(pipes[2 - i]);     // 2 or 0 - closing one read end
+        xmove_fd(pipes[i], STDIN_FILENO);      // 0 or 2 - using other read end
+        xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - using other write end
+        // End result:
+        // parent stdout [3] -> child stdin [2]
+        // child stdout [1] -> parent stdin [0]
 
         if (!G.helper_pid) {
                 // child: try to execute connection helper