[GNUnet-SVN] r28588 - msh/src

[gnunet]

Author: harsha
Date: 2013-08-13 23:25:10 +0200 (Tue, 13 Aug 2013)
New Revision: 28588

Modified:
   msh/src/launch.c
   msh/src/mshd-server.c
Log:
- fixes broken pipe bug

Modified: msh/src/launch.c
===================================================================
--- msh/src/launch.c    2013-08-13 21:07:54 UTC (rev 28587)
+++ msh/src/launch.c    2013-08-13 21:25:10 UTC (rev 28588)
@@ -15,9 +15,9 @@
 
   GNUNET_log_setup ("msh-launch", NULL, NULL);
   pin = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 0, 0);
-  pout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 0, 0);
+  pout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_NO, 0, 0);
   proc = GNUNET_OS_start_process_vap (GNUNET_NO,
-                                      GNUNET_OS_INHERIT_STD_ERR,
+                                      GNUNET_OS_INHERIT_STD_NONE,
                                       pin,
                                       pout,
                                       cmd[0], cmd);

Modified: msh/src/mshd-server.c
===================================================================
--- msh/src/mshd-server.c       2013-08-13 21:07:54 UTC (rev 28587)
+++ msh/src/mshd-server.c       2013-08-13 21:25:10 UTC (rev 28588)
@@ -693,7 +693,6 @@
   struct GNUNET_DISK_PipeHandle *pin;
   struct GNUNET_DISK_PipeHandle *pout;
   
-  sleep (10);
   pin = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 0, 0);
   pout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 0, 0);
   GNUNET_assert ((NULL != pin && (NULL != pout)));
@@ -706,12 +705,7 @@
   if (NULL == ctx->proc)
     return GNUNET_SYSERR;
   ctx->fin = GNUNET_DISK_pipe_detach_end (pin, GNUNET_DISK_PIPE_END_WRITE);
-  GNUNET_assert (GNUNET_OK == 
-                 GNUNET_DISK_pipe_close_end (pin, 
-                                             GNUNET_DISK_PIPE_END_READ));
   ctx->fout = GNUNET_DISK_pipe_detach_end (pout, GNUNET_DISK_PIPE_END_READ);
-  GNUNET_assert (GNUNET_OK == 
-                 GNUNET_DISK_pipe_close_end (pout, 
GNUNET_DISK_PIPE_END_WRITE));
   GNUNET_assert ((NULL != ctx->fin && (NULL != ctx->fout)));
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_pipe_close (pin));
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_pipe_close (pout));