summaryrefslogtreecommitdiff
path: root/movemail
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-10-28 23:20:22 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2010-10-28 23:20:22 +0300
commit4a49f5341ae9005c9ffbd7620efaecffcdfda79f (patch)
tree53ba2d6a638bd9b83747ebd6899931ab89d13ca0 /movemail
parent697384c64dadb0a4db97136a6cbcf2166c48897b (diff)
downloadmailutils-4a49f5341ae9005c9ffbd7620efaecffcdfda79f.tar.gz
mailutils-4a49f5341ae9005c9ffbd7620efaecffcdfda79f.tar.bz2
Add wordsplit module.
The wordsplit module (borrowed from another project of mine, called 'grecs') provides a flexible and powerful mechanism for parsing input in a way similar to posix-shell. In particular, the POSIX function wordexp is a subset of the wordsplit functionality. The argcv module is now deprecated. * include/mailutils/wordsplit.h: New file. * include/mailutils/Makefile.am (pkginclude_HEADERS): Add wordsplit.h * libmailutils/string/wordsplit.c: New file. * libmailutils/string/Makefile.am (libstring_la_SOURCES): Add wordsplit.c. * include/mailutils/argcv.h (mu_argcv_join): New proto. (mu_argcv_get, mu_argcv_get_n, mu_argcv_get_np) (mu_argcv_unquote_char, mu_argcv_quote_char) (mu_argcv_quoted_length, mu_argcv_unquote_copy) (mu_argcv_quote_copy): Mark as deprecated. * include/mailutils/mailutils.h: Include wordsplit.h. * libmailutils/tests/wsp.c: New file. * libmailutils/tests/.gitignore: List wsp. * libmailutils/tests/wordsplit.at: New file. * libmailutils/tests/Makefile.am (noinst_PROGRAMS): Add wsp (TESTSUITE_AT): Add wordsplit.at. * libmailutils/tests/argcv.c: Define MU_ARCGV_DEPRECATED to avoid deprecation warnings. * libmailutils/tests/testsuite.at: Include wordsplit.at. * libmailutils/base/argcvfree.c: New file. * libmailutils/base/argcvjoin.c: New file. * libmailutils/base/argcvrem.c: New file. * libmailutils/base/Makefile.am (libbase_la_SOURCES): Add new files. * libmailutils/base/argcv.c: Define MU_ARCGV_DEPRECATED to avoid deprecation warnings. (argcv_string, argcv_free, argv_free) (mu_argcv_remove): Rewrite in separate modules. * comsat/comsat.h: Include wordsplit.h. * imap4d/imap4d.h: Likewise. * mail/mail.h: Likewise. * mh/mh.h: Likewise. * readmsg/readmsg.h: Likewise. * comsat/action.c: Use wordsplit. * imap4d/fetch.c: Likewise. * lib/mailcap.c: Likewise. * libmailutils/auth/mu_auth.c: Likewise. * libmailutils/base/mutil.c: Likewise. * libmailutils/cfg/format.c: Likewise. * libmailutils/cfg/lexer.l: Likewise. * libmailutils/cfg/parser.y: Likewise. * libmailutils/diag/gdebug.c: Likewise. * libmailutils/mailer/mailer.c: Likewise. * libmailutils/server/acl.c: Likewise. * libmailutils/stream/prog_stream.c: Likewise. * libmailutils/tests/listop.c: Likewise. * libmailutils/url/create.c: Likewise. * libmu_auth/ldap.c: Likewise. * libmu_auth/radius.c: Likewise. * libmu_sieve/sieve.l: Likewise. * libproto/mailer/mbox.c: Likewise. * libproto/mailer/smtp.c: Likewise. * libproto/mailer/smtp_gsasl.c: Likewise. * mail/mailline.c: Likewise. * mail/mailvar.c: Likewise. * mail/send.c: Likewise. * mail/util.c: Likewise. * mh/folder.c: Likewise. * mh/mh_alias.y: Likewise. * mh/mh_argp.c: Likewise. * mh/mh_init.c: Likewise. * mh/mh_list.c: Likewise. * mh/mh_msgset.c: Likewise. * mh/mh_sequence.c: Likewise. * mh/mh_whatnow.c: Likewise. * mh/mh_sequence.c: Likewise. * mh/mh_whatnow.c: Likewise. * mh/mhn.c: Likewise. * mh/send.c: Likewise. * movemail/movemail.c: Likewise. * mu/shell.c: Likewise. * readmsg/readmsg.c: Likewise. * testsuite/smtpsend.c: Likewise. * pop3d/popauth.c: Use wordsplit. Use simplified input format (username and password delimited by any amount of whitespace). Read/produce old format if invoked with the --compatibility option. * examples/aclck.c: Use wordsplit instead of argcv. * examples/header.c: Likewise. * examples/mta.c: Likewise. * examples/.gitignore: Remove pop3client. * examples/Makefile.am: Remove pop3client. * po/POTFILES.in: Add new files.
Diffstat (limited to 'movemail')
-rw-r--r--movemail/movemail.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/movemail/movemail.c b/movemail/movemail.c
index d03082895..61daad6c5 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -267,23 +267,21 @@ cb_mailbox_ownership (mu_debug_t debug, void *data, mu_config_value_t *val)
return _cb_mailbox_ownership (debug, str);
else
{
- int argc;
- char **argv;
+ struct mu_wordsplit ws;
- if (mu_argcv_get_np (str, strlen (str), ",", NULL, 0,
- &argc, &argv, NULL))
+ ws.ws_delim = ",";
+ if (mu_wordsplit (str, &ws, MU_WRDSF_DEFFLAGS|MU_WRDSF_DELIM))
{
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
- _("cannot parse %s"),
- str);
+ _("cannot parse %s: %s"),
+ str, mu_wordsplit_strerror (&ws));
return 1;
}
- for (i = 0; i < argc; i++)
- if (_cb_mailbox_ownership (debug, argv[i]))
+ for (i = 0; i < ws.ws_wordc; i++)
+ if (_cb_mailbox_ownership (debug, ws.ws_wordv[i]))
return 1;
-
- mu_argcv_free (argc, argv);
+ mu_wordsplit_free (&ws);
return 0;
}
}

Return to:

Send suggestions and report system problems to the System administrator.