diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-06-13 07:56:20 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-06-13 08:15:17 +0300 |
commit | 3a78309aa59c245c14e29d3e7eb953c6a2ea1035 (patch) | |
tree | c50b11921af9b4ea76c3128dbdd7d95eadc7b033 /comsat | |
parent | 16383a0184fd266e33c7d16ef55ce0d39dd1206e (diff) | |
download | mailutils-3a78309aa59c245c14e29d3e7eb953c6a2ea1035.tar.gz mailutils-3a78309aa59c245c14e29d3e7eb953c6a2ea1035.tar.bz2 |
Switch to new locus types
* include/mailutils/types.hin (mu_locus): Remove.
* include/mailutils/diag.h (mu_diag_at_locus): Remove.
(mu_diag_at_locus_point,mu_diag_at_locus_range): New protos.
* include/mailutils/mailutils.h: Include locus.h
* include/mailutils/stream.h (MU_IOCTL_LOGSTREAM_GET_LOCUS)
(MU_IOCTL_LOGSTREAM_SET_LOCUS): Remove.
* libmailutils/stream/logstream.c (_log_ctl): Reflect this.
* libmailutils/tests/logstr.at: Remove the related test.
* libmailutils/tests/logstr.c: Ditto.
* libmailutils/cfg/Makefile.am: Add new header.
* libmailutils/cfg/cfg.h: New file.
* libmailutils/cfg/format.c: Use mu_locus_range
* libmailutils/cfg/lexer.l: Use the mu_linetrack facility
* libmailutils/cfg/parser.y: LIkewise.
* libmailutils/diag/diag.c (mu_diag_at_locus): Remove.
(mu_diag_at_locus_point,mu_diag_at_locus_range): New protos.
* comsat/action.c: Use mu_locus_point and mu_locus_range
instead of the removed mu_locus.
* include/mailutils/auth.h: Likewise.
* include/mailutils/cfg.h: Likewise.
* include/mailutils/sieve.h: Likewise.
* libmailutils/base/wicket.c: Likewise.
* libmailutils/tests/wicket.c: Likewise.
* libmu_auth/radius.c: Likewise.
* libmu_sieve/actions.c: Likewise.
* libmu_sieve/comparator.c: Likewise.
* libmu_sieve/extensions/moderator.c: Likewise.
* libmu_sieve/mem.c: Likewise.
* libmu_sieve/prog.c: Likewise.
* libmu_sieve/require.c: Likewise.
* libmu_sieve/runtime.c: Likewise.
* libmu_sieve/sieve-priv.h: Likewise.
* libmu_sieve/sieve.l: Use the mu_linetrack facility.
* libmu_sieve/sieve.y: Likewise.
* libmu_sieve/util.c: Use mu_locus_point and mu_locus_range
instead of the removed mu_locus
* libmu_sieve/variables.c: Likewise.
* mail/source.c: Likewise.
* mu/libexec/dbm.c: Likewise.
* mu/libexec/logger.c: Likewise.
* mu/libexec/wicket.c: Likewise.
* sieve/sieve.c: Likewise.
* sieve/tests/i-numeric.at: Update expected locations
Diffstat (limited to 'comsat')
-rw-r--r-- | comsat/action.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/comsat/action.c b/comsat/action.c index 6ff766a82..24080a511 100644 --- a/comsat/action.c +++ b/comsat/action.c @@ -298,7 +298,7 @@ struct biffrc_environ mu_stream_t logstr; mu_message_t msg; mu_stream_t input; - struct mu_locus locus; + struct mu_locus_range locus; int use_default; char *errbuf; size_t errsize; @@ -523,16 +523,16 @@ eval_biffrc (struct biffrc_environ *env) ws.ws_comment = "#"; wsflags = MU_WRDSF_DEFFLAGS | MU_WRDSF_COMMENT; mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, - MU_IOCTL_LOGSTREAM_SET_LOCUS, &env->locus); + MU_IOCTL_LOGSTREAM_SET_LOCUS_RANGE, &env->locus); mu_stream_ioctl (env->logstr, MU_IOCTL_LOGSTREAM, - MU_IOCTL_LOGSTREAM_SET_LOCUS, &env->locus); + MU_IOCTL_LOGSTREAM_SET_LOCUS_RANGE, &env->locus); while (mu_stream_getline (env->input, &stmt, &size, &n) == 0 && n > 0) { if (strncmp (stmt, "#line ", 6) == 0) { char *p; - env->locus.mu_line = strtoul (stmt + 6, &p, 10); + env->locus.beg.mu_line = strtoul (stmt + 6, &p, 10); if (*p != '\n') { report_error (env, _("malformed #line directive: %s")); @@ -541,10 +541,10 @@ eval_biffrc (struct biffrc_environ *env) { mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, MU_IOCTL_LOGSTREAM_SET_LOCUS_LINE, - &env->locus.mu_line); + &env->locus.beg.mu_line); mu_stream_ioctl (env->logstr, MU_IOCTL_LOGSTREAM, MU_IOCTL_LOGSTREAM_SET_LOCUS_LINE, - &env->locus.mu_line); + &env->locus.beg.mu_line); } continue; } @@ -600,9 +600,9 @@ eval_biffrc (struct biffrc_environ *env) free (stmt); mu_wordsplit_free (&ws); mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, - MU_IOCTL_LOGSTREAM_SET_LOCUS, NULL); + MU_IOCTL_LOGSTREAM_SET_LOCUS_RANGE, NULL); mu_stream_ioctl (env->logstr, MU_IOCTL_LOGSTREAM, - MU_IOCTL_LOGSTREAM_SET_LOCUS, NULL); + MU_IOCTL_LOGSTREAM_SET_LOCUS_RANGE, NULL); } void @@ -645,13 +645,14 @@ run_user_action (const char *device, mu_message_t msg) if (!rcname) { mu_diag_funcall (MU_DIAG_ERROR, "mu_make_file_name", NULL, ENOMEM); - env.locus.mu_file = BIFF_RC; + env.locus.beg.mu_file = BIFF_RC; } else - env.locus.mu_file = rcname; + env.locus.beg.mu_file = rcname; - env.locus.mu_line = 1; - env.locus.mu_col = 0; + env.locus.beg.mu_line = 1; + env.locus.beg.mu_col = 0; + memset (&env.locus.end, 0, sizeof env.locus.end); env.use_default = 0; eval_biffrc (&env); mu_stream_destroy (&env.input); @@ -679,9 +680,9 @@ run_user_action (const char *device, mu_message_t msg) } else { - env.locus.mu_file = "<default>"; - env.locus.mu_line = 1; - env.locus.mu_col = 0; + env.locus.beg.mu_file = "<default>"; + env.locus.beg.mu_line = 1; + env.locus.beg.mu_col = 0; eval_biffrc (&env); mu_stream_destroy (&env.input); } |