Changeset 7f19876

Timestamp:

Apr 5, 2009, 8:09:13 PM (16 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

d1948ce

Parents:

a412918

Message:

fix stderr redirector

Files:

• ChangeLog (modified) (1 diff)
• owl.c (modified) (2 diffs)

ChangeLog

@@ -4 +4 @@
         Fix some strcpy's that could be vulnerable
         Remove an unused function
+        Fix stderr redirector, now creating admin messages
 
 2.2.0

owl.c

@@ -737 +737 @@
 
 /* Sends stderr (read from rfd) messages to the error console */
-void stderr_redirect_handler(int handle, int rfd, int eventmask, void *data) 
+void stderr_redirect_handler(owl_dispatch *d)
 {
   int navail, bread;
-  char *buf;
-  /*owl_function_debugmsg("stderr_redirect: called with rfd=%d\n", rfd);*/
+  char buf[4096];
+  int rfd = d->fd;
   if (rfd<0) return;
   if (-1 == ioctl(rfd, FIONREAD, (void*)&navail)) {
@@ -747 +747 @@
   }
   /*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);
 }