Changeset 45cf49f

Timestamp:

Feb 23, 2009, 5:42:47 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

5283b01

Parents:

1375a6a

Message:

Don't send stderr to admin messages.

We've been getting a lot of complaints about 'uninitialized use of
...' errors and of spew from buggy zsig randomizers. In both cases,
this was an effect of the way we were sending stderr to error
messages, and those error messages went to admin messages because of a
change in 1.0.5.

We still send stderr to the error message log, but text there will no
longer show up anywhere by default.

Files:

• functions.c (modified) (2 diffs)
• owl.c (modified) (2 diffs)

functions.c

@@ -3352 +3352 @@
 {
   va_list ap;
-  char *buff, *buff2;
+  char *buff;
   char *nl;
-  char *date;
-  time_t now;
-
-  now=time(NULL);
-  date=owl_strdup(ctime(&now));
-  date[strlen(date)-1]='\0';
 
   va_start(ap, fmt);
 
   buff = g_strdup_vprintf(fmt, ap);
-  buff2 = owl_sprintf("%s %s", date, buff);
   owl_function_debugmsg("ERROR: %s", buff);
   nl = strchr(buff, '\n');
@@ -3373 +3366 @@
     owl_function_makemsg("[Error] %s", buff);
   }
-  owl_errqueue_append_err(owl_global_get_errqueue(&g), buff2);
+  owl_function_log_err(buff);
   va_end(ap);
+  owl_free(buff);
+}
+
+void owl_function_log_err(char *string)
+{
+  char *date;
+  time_t now;
+  char *buff;
+
+  now=time(NULL);
+  date=owl_strdup(ctime(&now));
+  date[strlen(date)-1]='\0';
+
+  buff = owl_sprintf("%s %s", date, string);
+
+  owl_errqueue_append_err(owl_global_get_errqueue(&g), buff);
+
+  owl_free(buff);
   owl_free(date);
-  owl_free(buff);
-  owl_free(buff2);
 }
 

owl.c

@@ -717 +717 @@
   char buf[4096];
   int rfd = d->fd;
+  char *err;
+
   if (rfd<0) return;
   if (-1 == ioctl(rfd, FIONREAD, (void*)&navail)) {
@@ -730 +732 @@
     buf[navail] = '\0';
   }
-  owl_function_error("[stderr]\n%s", buf);
+
+  err = owl_sprintf("[stderr]\n%s", buf);
+
+  owl_function_log_err(err);
 }