summaryrefslogtreecommitdiff
path: root/include/mailutils/stream.h
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-12-20 22:34:02 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2010-12-20 22:34:02 +0200
commit0d0023093b17fdf1ab62d8872307047a8c96d06b (patch)
tree13decae2cc681c8e63b938d4b06418561b61e3a8 /include/mailutils/stream.h
parentbc526de1ba3c279c1751f2792e932e3aae09b984 (diff)
downloadmailutils-0d0023093b17fdf1ab62d8872307047a8c96d06b.tar.gz
mailutils-0d0023093b17fdf1ab62d8872307047a8c96d06b.tar.bz2
Assorted changes
* include/mailutils/debug.h (mu_debug_format_spec): New function. * include/mailutils/stream.h (MU_IOCTL_SYSLOGSTREAM) (MU_IOCTL_FILTER): New ioctls. (MU_IOCTL_LOGSTREAM_GET_SEVERITY_MASK) (MU_IOCTL_LOGSTREAM_SET_SEVERITY_MASK) (MU_IOCTL_LOGSTREAM_CLONE) (MU_IOCTL_SYSLOGSTREAM_SET_LOGGER) (MU_IOCTL_SYSLOGSTREAM_GET_LOGGER) (MU_IOCTL_FILTER_GET_DISABLED) (MU_IOCTL_FILTER_SET_DISABLED): And their opcodes. * include/mailutils/sys/filter.h (_MU_FILTER_DISABLED) (_MU_FILTER_EOF): New defines. (_mu_filter_stream) <eof>: Replace with fltflag (a bitmask). * include/mailutils/sys/logstream.h (_mu_log_stream) <sevmask>: New member. * include/mailutils/sys/syslogstream.h (_mu_syslog_stream) <logger>: New member. * include/mailutils/util.h (mu_onexit_run): New proto. * libmailutils/base/onexit.c (_mu_onexit_run): Extra safety check. (mu_onexit_run): New function. (mu_debug_level_str): New static. (mu_debug_format_spec): New function. * libmailutils/stream/fltstream.c (filter_read, filter_write): Bypass the xcoder if _MU_FILTER_DISABLED is set. Use fltflag instead of the removed eof. (filter_ctl): Handle MU_IOCTL_FILTER. * libmailutils/stream/logstream.c (_log_write): The sevmask member masks out severity prefix output for certain severities. (_log_ctl): Handle new opcodes (see above). * libmailutils/stream/syslogstream.c (_syslog_stream_write): Use <logger>, if supplied, instead of the system syslog(3). (_syslog_ctl): Handle MU_IOCTL_SYSLOGSTREAM. (mu_syslog_stream_create): Initialize logger to NULL. * mu/ldflags.c (lib_descr): Protect entries with the corresponding #ifdef ENABLE_whatever.
Diffstat (limited to 'include/mailutils/stream.h')
-rw-r--r--include/mailutils/stream.h34
1 files changed, 32 insertions, 2 deletions
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index ec6164cb0..6f02d3e6e 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -71,6 +71,8 @@ enum mu_buffer_type
#define MU_IOCTL_LOGSTREAM 7 /* Log stream (see below) */
#define MU_IOCTL_XSCRIPTSTREAM 8 /* Transcript stream (see below) */
#define MU_IOCTL_FD 9 /* File descriptor manipulation */
+#define MU_IOCTL_SYSLOGSTREAM 10 /* Syslog stream (see below) */
+#define MU_IOCTL_FILTER 11 /* Filter streams (see below) */
/* Opcodes common for various families */
#define MU_IOCTL_OP_GET 0
@@ -94,8 +96,8 @@ enum mu_buffer_type
#define MU_IOCTL_NULLSTREAM_CLRSIZE 3
/* Get or set logging severity.
- Arg: unsigned *
- */
+ Arg: unsigned *
+ */
#define MU_IOCTL_LOGSTREAM_GET_SEVERITY 0
#define MU_IOCTL_LOGSTREAM_SET_SEVERITY 1
/* Get or set locus.
@@ -140,6 +142,17 @@ enum mu_buffer_type
*/
#define MU_IOCTL_LOGSTREAM_SUPPRESS_SEVERITY_NAME 11
+ /* Get or set severity output mask.
+ Arg: int *
+ */
+#define MU_IOCTL_LOGSTREAM_GET_SEVERITY_MASK 12
+#define MU_IOCTL_LOGSTREAM_SET_SEVERITY_MASK 13
+
+ /* Clone the stream.
+ Arg: mu_stream_t*
+ */
+#define MU_IOCTL_LOGSTREAM_CLONE 14
+
/* Opcodes for MU_IOCTL_XSCRIPTSTREAM */
/* Swap transcript levels.
Arg: int *X
@@ -158,6 +171,23 @@ enum mu_buffer_type
Arg: int *
*/
#define MU_IOCTL_FD_SET_BORROW 1
+
+ /* Opcodes for MU_IOCTL_SYSLOGSTREAM */
+ /* Set logger function.
+ Arg: void (*) (int, const char *, ...)
+ */
+#define MU_IOCTL_SYSLOGSTREAM_SET_LOGGER 0
+ /* Get logger function.
+ Arg: void (**) (int, const char *, ...)
+ */
+#define MU_IOCTL_SYSLOGSTREAM_GET_LOGGER 1
+
+ /* Filter streams */
+ /* Get or set disabled state:
+ Arg: int*
+ */
+#define MU_IOCTL_FILTER_GET_DISABLED 0
+#define MU_IOCTL_FILTER_SET_DISABLED 1
#define MU_TRANSPORT_INPUT 0
#define MU_TRANSPORT_OUTPUT 1

Return to:

Send suggestions and report system problems to the System administrator.