Changeset 414a272

Timestamp:

May 25, 2011, 11:10:41 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

697221f (diff), 6476c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 6476c0e00a11e070e7480afa291a8a0976aa7828 into 697221fc51f0060043c93821f0358317f6bc6ab0

File:

• owl.c (modified) (1 diff)

owl.c

@@ -464 +464 @@
   }
   bread = read(rfd, buf, navail);
-  if (buf[navail-1] != '\0') {
-    buf[navail] = '\0';
-  }
-
-  err = g_strdup_printf("[stderr]\n%s", buf);
+  if (bread == -1)
+    return;
+
+  err = g_strdup_printf("[stderr]\n%.*s", bread, buf);
 
   owl_function_log_err(err);