Changeset 924f7cd for owl.c

Timestamp:

Dec 20, 2008, 9:47:21 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

bd8b991

Parents:

df7f364

Message:

Pull data from stderr in larger chunks at a time.

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -750 +750 @@
 {
   int navail, bread;
-  char *buf;
+  char buf[4096];
   int rfd = d->fd;
   if (rfd<0) return;
@@ -757 +757 @@
   }
   /*owl_function_debugmsg("stderr_redirect: navail = %d\n", navail);*/
-  if (navail<=0) return;
-  if (navail>256) { navail = 256; }
-  buf = owl_malloc(navail+1);
+  if (navail <= 0) return;
+  if (navail > sizeof(buf)-1) {
+    navail = sizeof(buf)-1;
+  }
   bread = read(rfd, buf, navail);
   if (buf[navail-1] != '\0') {
     buf[navail] = '\0';
   }
-  owl_function_error("Err: %s", buf);
-  owl_free(buf);
+  owl_function_error("[stderr]\n%s", buf);
 }