[GNUnet-SVN] r29929 - msh/src

[gnunet]

Author: harsha
Date: 2013-10-07 16:55:10 +0200 (Mon, 07 Oct 2013)
New Revision: 29929

Modified:
   msh/src/msh_waiter.c
   msh/src/test_pty.c
Log:
- fixes


Modified: msh/src/msh_waiter.c
===================================================================
--- msh/src/msh_waiter.c        2013-10-07 14:49:05 UTC (rev 29928)
+++ msh/src/msh_waiter.c        2013-10-07 14:55:10 UTC (rev 29929)
@@ -129,6 +129,11 @@
     LOG_ERROR ("Error writing to stdout\n");
     goto err_ret;
   }
+  if (0 != fflush (stdout))
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fflush");
+    goto err_ret;
+  }
   GNUNET_CONNECTION_receive (conn, GNUNET_SERVER_MAX_MESSAGE_SIZE,
                              GNUNET_TIME_UNIT_FOREVER_REL, &receive, NULL);
   return;
@@ -163,9 +168,11 @@
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
+  GNUNET_assert (size_in_buf <= size);
   (void) memcpy (buf, in_buf, size_in_buf);  
   GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh_stdin,
                                   &read_stdin, NULL);
+  return size_in_buf;
 }
 
 
@@ -285,7 +292,7 @@
   tmsg->ispeed = htonl (speed_to_baud (cfgetispeed (&tio)));
   tmsg->nsettings = htons (count);
 
-  ts = &tmsg[1];
+  ts = (uint16_t *) &tmsg[1];
 #define TTYCHAR(NAME,OP)                        \
     *(ts++) = htons (OP);                       \
     *(ts++) = htons (tio.c_cc[NAME]);

Modified: msh/src/test_pty.c
===================================================================
--- msh/src/test_pty.c  2013-10-07 14:49:05 UTC (rev 29928)
+++ msh/src/test_pty.c  2013-10-07 14:55:10 UTC (rev 29929)
@@ -151,12 +151,13 @@
   }
   GNUNET_assert (buf_off <= size);
   (void) memcpy (netbuf, buf, buf_off);
+  size = buf_off;
   buf_off = 0;
-  if (GNUNET_SCHEDULER_NO_TASK != read_child_task)
-    return;
-  read_child_task = 
-      GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, chld_io,
-                                      &read_child, NULL);
+  if (GNUNET_SCHEDULER_NO_TASK == read_child_task)
+    read_child_task = 
+        GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, chld_io,
+                                        &read_child, NULL);
+  return size;
 }