summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2005-08-16 11:13:32 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2005-08-16 11:13:32 (GMT)
commitad2a23ef65bb48246c9d3eed3e7a07f89af67f24 (patch) (side-by-side diff)
tree7abb1a566e693f762bb98aa45885076a30089a49
parentea4dcf344a94aca38ddd1b7319b1b6194c2cbbf4 (diff)
downloadmailutils-ad2a23ef65bb48246c9d3eed3e7a07f89af67f24.tar.gz
mailutils-ad2a23ef65bb48246c9d3eed3e7a07f89af67f24.tar.bz2
Remove __P() and __PMT() wrappers.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog54
-rw-r--r--auth/lbuf.h29
-rw-r--r--comsat/comsat.c4
-rw-r--r--examples/mta.c6
-rw-r--r--guimb/guimb.h12
-rw-r--r--imap4d/auth_gsasl.c2
-rw-r--r--imap4d/fetch.c58
-rw-r--r--imap4d/imap4d.c8
-rw-r--r--imap4d/imap4d.h240
-rw-r--r--imap4d/list.c10
-rw-r--r--imap4d/namespace.c4
-rw-r--r--imap4d/search.c74
-rw-r--r--imap4d/status.c14
-rw-r--r--imap4d/util.c6
-rw-r--r--include/mailutils/address.h53
-rw-r--r--include/mailutils/argcv.h34
-rw-r--r--include/mailutils/argp.h24
-rw-r--r--include/mailutils/attribute.h106
-rw-r--r--include/mailutils/auth.h63
-rw-r--r--include/mailutils/body.h30
-rw-r--r--include/mailutils/daemon.h6
-rw-r--r--include/mailutils/debug.h26
-rw-r--r--include/mailutils/envelope.h22
-rw-r--r--include/mailutils/error.h12
-rw-r--r--include/mailutils/filter.h6
-rw-r--r--include/mailutils/folder.h54
-rw-r--r--include/mailutils/gsasl.h10
-rw-r--r--include/mailutils/guile.h44
-rw-r--r--include/mailutils/header.h119
-rw-r--r--include/mailutils/iterator.h16
-rw-r--r--include/mailutils/libsieve.h222
-rw-r--r--include/mailutils/list.h40
-rw-r--r--include/mailutils/locker.h48
-rw-r--r--include/mailutils/mailbox.h80
-rw-r--r--include/mailutils/mailcap.h86
-rw-r--r--include/mailutils/mailer.h34
-rw-r--r--include/mailutils/message.h130
-rw-r--r--include/mailutils/mime.h24
-rw-r--r--include/mailutils/monitor.h18
-rw-r--r--include/mailutils/mu_auth.h68
-rw-r--r--include/mailutils/mutil.h87
-rw-r--r--include/mailutils/nls.h4
-rw-r--r--include/mailutils/observer.h35
-rw-r--r--include/mailutils/parse822.h98
-rw-r--r--include/mailutils/property.h21
-rw-r--r--include/mailutils/refcount.h10
-rw-r--r--include/mailutils/registrar.h77
-rw-r--r--include/mailutils/stream.h168
-rw-r--r--include/mailutils/tls.h30
-rw-r--r--include/mailutils/types.h16
-rw-r--r--include/mailutils/url.h42
-rw-r--r--lib/md5.h27
-rw-r--r--lib/mu_asprintf.h8
-rw-r--r--lib/mu_dbm.h18
-rw-r--r--lib/strsignal.c8
-rw-r--r--libmu_scm/mu_address.c4
-rw-r--r--libsieve/argp.c3
-rw-r--r--libsieve/sieve.h110
-rw-r--r--libsieve/sieve.l42
-rw-r--r--libsieve/sieve.y4
-rw-r--r--mail.local/mail.local.h12
-rw-r--r--mail.local/main.c12
-rw-r--r--mail/alias.c16
-rw-r--r--mail/decode.c12
-rw-r--r--mail/folders.c4
-rw-r--r--mail/mail.c2
-rw-r--r--mail/mail.h433
-rw-r--r--mail/mailline.c4
-rw-r--r--mail/msgset.y22
-rw-r--r--mail/send.c4
-rw-r--r--mail/util.c4
-rw-r--r--mailbox/amd.c84
-rw-r--r--mailbox/attribute.c4
-rw-r--r--mailbox/auth.c6
-rw-r--r--mailbox/body.c26
-rw-r--r--mailbox/debug.c4
-rw-r--r--mailbox/envelope.c6
-rw-r--r--mailbox/filter.c4
-rw-r--r--mailbox/filter_rfc822.c12
-rw-r--r--mailbox/filter_trans.c6
-rw-r--r--mailbox/folder.c6
-rw-r--r--mailbox/header.c25
-rw-r--r--mailbox/imap/folder.c78
-rw-r--r--mailbox/imap/mbox.c97
-rw-r--r--mailbox/include/amd.h22
-rw-r--r--mailbox/include/attribute0.h8
-rw-r--r--mailbox/include/auth0.h10
-rw-r--r--mailbox/include/debug0.h4
-rw-r--r--mailbox/include/envelope0.h8
-rw-r--r--mailbox/include/filter0.h10
-rw-r--r--mailbox/include/folder0.h26
-rw-r--r--mailbox/include/header0.h14
-rw-r--r--mailbox/include/imap0.h14
-rw-r--r--mailbox/include/list0.h4
-rw-r--r--mailbox/include/mailbox0.h38
-rw-r--r--mailbox/include/mailer0.h10
-rw-r--r--mailbox/include/message0.h16
-rw-r--r--mailbox/include/observer0.h6
-rw-r--r--mailbox/include/registrar0.h38
-rw-r--r--mailbox/include/stream0.h28
-rw-r--r--mailbox/include/url0.h20
-rw-r--r--mailbox/locker.c18
-rw-r--r--mailbox/mailbox.c4
-rw-r--r--mailbox/maildir/maildir.h6
-rw-r--r--mailbox/mailer.c4
-rw-r--r--mailbox/mbox/folder.c34
-rw-r--r--mailbox/mbox/mbox.c83
-rw-r--r--mailbox/mbox/mbox0.h7
-rw-r--r--mailbox/message.c53
-rw-r--r--mailbox/mu_argp.c8
-rw-r--r--mailbox/mu_auth.c10
-rw-r--r--mailbox/nntp/folder.c8
-rw-r--r--mailbox/nntp/mbox.c44
-rw-r--r--mailbox/nntp/nntp0.h8
-rw-r--r--mailbox/observer.c8
-rw-r--r--mailbox/pop/folder.c10
-rw-r--r--mailbox/pop/mbox.c80
-rw-r--r--mailbox/property.c5
-rw-r--r--mailbox/registrar.c32
-rw-r--r--mailbox/stream.c4
-rw-r--r--mailbox/ticket.c6
-rw-r--r--mailbox/wicket.c14
-rw-r--r--mh/fmtcheck.c4
-rw-r--r--mh/mh.h233
-rw-r--r--mh/mh_alias.l12
-rw-r--r--mh/mh_alias.y14
-rw-r--r--mh/mh_format.c2
-rw-r--r--mh/mh_getopt.h23
-rw-r--r--mh/mh_list.c4
-rw-r--r--mh/mh_msgset.c8
-rw-r--r--mh/mhn.c22
-rw-r--r--mh/pick.h8
-rw-r--r--mh/refile.c4
-rw-r--r--mh/scan.c8
-rw-r--r--mh/sortm.c12
-rw-r--r--po/ca.po1429
-rw-r--r--po/es.po1423
-rw-r--r--po/fr.po952
-rw-r--r--po/pl.po1281
-rw-r--r--po/ro.po950
-rw-r--r--po/ru.po1353
-rw-r--r--po/rw.po3687
-rw-r--r--po/uk.po1286
-rw-r--r--pop3d/pop3d.c13
-rw-r--r--pop3d/pop3d.h90
-rw-r--r--pop3d/popauth.c21
-rw-r--r--readmsg/readmsg.c13
-rw-r--r--readmsg/readmsg.h4
-rw-r--r--sieve/sieve.c4
149 files changed, 9463 insertions, 7710 deletions
diff --git a/ChangeLog b/ChangeLog
index c6c9e1d..4854135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2005-08-16 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * auth/lbuf.h,comsat/comsat.c,examples/mta.c,guimb/guimb.h,
+ imap4d/auth_gsasl.c,imap4d/fetch.c,imap4d/imap4d.c,
+ imap4d/imap4d.h,imap4d/list.c,imap4d/namespace.c,imap4d/search.c,
+ imap4d/status.c,imap4d/util.c,include/mailutils/address.h,
+ include/mailutils/argcv.h,include/mailutils/argp.h,
+ include/mailutils/attribute.h,include/mailutils/auth.h,
+ include/mailutils/body.h,include/mailutils/daemon.h,
+ include/mailutils/debug.h,include/mailutils/envelope.h,
+ include/mailutils/error.h,include/mailutils/filter.h,
+ include/mailutils/folder.h,include/mailutils/gsasl.h,
+ include/mailutils/guile.h,include/mailutils/header.h,
+ include/mailutils/iterator.h,include/mailutils/libsieve.h,
+ include/mailutils/list.h,include/mailutils/locker.h,
+ include/mailutils/mailbox.h,include/mailutils/mailcap.h,
+ include/mailutils/mailer.h,include/mailutils/message.h,
+ include/mailutils/mime.h,include/mailutils/monitor.h,
+ include/mailutils/mu_auth.h,include/mailutils/mutil.h,
+ include/mailutils/nls.h,include/mailutils/observer.h,
+ include/mailutils/parse822.h,include/mailutils/property.h,
+ include/mailutils/refcount.h,include/mailutils/registrar.h,
+ include/mailutils/stream.h,include/mailutils/tls.h,
+ include/mailutils/types.h,include/mailutils/url.h,lib/md5.h,
+ lib/mu_asprintf.h,lib/mu_dbm.h,lib/strsignal.c,
+ libmu_scm/mu_address.c,libsieve/argp.c,libsieve/sieve.h,
+ libsieve/sieve.l,libsieve/sieve.y,mail/alias.c,mail/decode.c,
+ mail/folders.c,mail/mail.c,mail/mail.h,mail/mailline.c,
+ mail/msgset.y,mail/send.c,mail/util.c,mail.local/mail.local.h,
+ mail.local/main.c,mailbox/amd.c,mailbox/attribute.c,
+ mailbox/auth.c,mailbox/body.c,mailbox/debug.c,mailbox/envelope.c,
+ mailbox/filter.c,mailbox/filter_rfc822.c,mailbox/filter_trans.c,
+ mailbox/folder.c,mailbox/header.c,mailbox/locker.c,
+ mailbox/mailbox.c,mailbox/mailer.c,mailbox/message.c,
+ mailbox/mu_argp.c,mailbox/mu_auth.c,mailbox/observer.c,
+ mailbox/property.c,mailbox/registrar.c,mailbox/stream.c,
+ mailbox/ticket.c,mailbox/wicket.c,mailbox/imap/folder.c,
+ mailbox/imap/mbox.c,mailbox/include/amd.h,
+ mailbox/include/attribute0.h,mailbox/include/auth0.h,
+ mailbox/include/debug0.h,mailbox/include/envelope0.h,
+ mailbox/include/filter0.h,mailbox/include/folder0.h,
+ mailbox/include/header0.h,mailbox/include/imap0.h,
+ mailbox/include/list0.h,mailbox/include/mailbox0.h,
+ mailbox/include/mailer0.h,mailbox/include/message0.h,
+ mailbox/include/observer0.h,mailbox/include/registrar0.h,
+ mailbox/include/stream0.h,mailbox/include/url0.h,
+ mailbox/maildir/maildir.h,mailbox/mbox/folder.c,
+ mailbox/mbox/mbox.c,mailbox/mbox/mbox0.h,mailbox/nntp/folder.c,
+ mailbox/nntp/mbox.c,mailbox/nntp/nntp0.h,mh/fmtcheck.c,mh/mh.h,
+ mh/mh_alias.l,mh/mh_alias.y,mh/mh_format.c,mh/mh_getopt.h,
+ mh/mh_list.c,mh/mh_msgset.c,mh/mhn.c,mh/pick.h,mh/refile.c,
+ mh/scan.c,mh/sortm.c,readmsg/readmsg.c,readmsg/readmsg.h,
+ sieve/sieve.c: Remove __P() and __PMT() wrappers.
+
2005-08-15 Sergey Poznyakoff <gray@gnu.org.ua>
* mh/mhn.c (has_nonascii,finish_text_msg): New functions
diff --git a/auth/lbuf.h b/auth/lbuf.h
index bdc8053..a0dfff4 100644
--- a/auth/lbuf.h
+++ b/auth/lbuf.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -20,19 +20,18 @@
struct _line_buffer;
-int _auth_lb_create __P((struct _line_buffer **s));
-void _auth_lb_destroy __P((struct _line_buffer **s));
-void _auth_lb_drop __P((struct _line_buffer *s));
-
-int _auth_lb_grow __P((struct _line_buffer *s, const char *ptr, size_t size));
-int _auth_lb_read __P((struct _line_buffer *s, char *ptr, size_t size));
-int _auth_lb_readline __P((struct _line_buffer *s, char *ptr, size_t size));
-int _auth_lb_writelines __P((struct _line_buffer *s, const char *iptr,
- size_t isize, off_t offset,
- int (*wr) __PMT ((void *data, char *start,
- char *end)),
- void *data, size_t *nbytes));
-int _auth_lb_level __P((struct _line_buffer *s));
-char *_auth_lb_data __P((struct _line_buffer *s));
+int _auth_lb_create (struct _line_buffer **s);
+void _auth_lb_destroy (struct _line_buffer **s);
+void _auth_lb_drop (struct _line_buffer *s);
+
+int _auth_lb_grow (struct _line_buffer *s, const char *ptr, size_t size);
+int _auth_lb_read (struct _line_buffer *s, char *ptr, size_t size);
+int _auth_lb_readline (struct _line_buffer *s, char *ptr, size_t size);
+int _auth_lb_writelines (struct _line_buffer *s, const char *iptr,
+ size_t isize, off_t offset,
+ int (*wr) (void *data, char *start, char *end),
+ void *data, size_t *nbytes);
+int _auth_lb_level (struct _line_buffer *s);
+char *_auth_lb_data (struct _line_buffer *s);
diff --git a/comsat/comsat.c b/comsat/comsat.c
index a920bf7..d70ef66 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -30,8 +30,8 @@
#endif
#ifndef HAVE_GETUTENT_CALLS
-extern void setutent __P((void));
-extern struct utmp *getutent __P((void));
+extern void setutent (void);
+extern struct utmp *getutent (void);
#endif
#ifdef UTMPX
diff --git a/examples/mta.c b/examples/mta.c
index 69b545f..24e195d 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -75,9 +75,9 @@ int dot = 1; /* Message is terminated by a lone dot on a line */
address_t recipients = NULL;
char *progname;
-int mta_stdin __P((int argc, char **argv));
-int mta_smtp __P((int argc, char **argv));
-void register_handlers __P((void));
+int mta_stdin (int argc, char **argv);
+int mta_smtp (int argc, char **argv);
+void register_handlers (void);
int
main (int argc, char **argv)
diff --git a/guimb/guimb.h b/guimb/guimb.h
index e406143..1ffea68 100644
--- a/guimb/guimb.h
+++ b/guimb/guimb.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -58,11 +58,11 @@ extern message_t current_message;
extern int debug_guile;
extern char *maildir;
-void collect_open_default __P((void));
-void collect_open_mailbox_file __P ((void));
-int collect_append_file __P ((char *name));
-void collect_create_mailbox __P ((void));
-void collect_drop_mailbox __P ((void));
+void collect_open_default (void);
+void collect_open_mailbox_file (void);
+int collect_append_file (char *name);
+void collect_create_mailbox (void);
+void collect_drop_mailbox (void);
int collect_output (void);
void util_error (char *fmt, ...);
diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c
index 2ac9637..42649d5 100644
--- a/imap4d/auth_gsasl.c
+++ b/imap4d/auth_gsasl.c
@@ -26,7 +26,7 @@
static Gsasl_ctx *ctx;
static Gsasl_session_ctx *sess_ctx;
-static void auth_gsasl_capa_init __P((int disable));
+static void auth_gsasl_capa_init (int disable);
static int
create_gsasl_stream (stream_t *newstr, stream_t transport, int flags)
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index bdf2b0b..2cbb4b0 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,40 +36,40 @@
struct fetch_command;
-static int fetch_all __P ((struct fetch_command *, char**));
-static int fetch_full __P ((struct fetch_command *, char**));
-static int fetch_fast __P ((struct fetch_command *, char**));
-static int fetch_envelope __P ((struct fetch_command *, char**));
-static int fetch_flags __P ((struct fetch_command *, char**));
-static int fetch_internaldate __P ((struct fetch_command *, char**));
-static int fetch_rfc822_header __P ((struct fetch_command *, char**));
-static int fetch_rfc822_size __P ((struct fetch_command *, char**));
-static int fetch_rfc822_text __P ((struct fetch_command *, char**));
-static int fetch_rfc822 __P ((struct fetch_command *, char**));
-static int fetch_bodystructure __P ((struct fetch_command *, char**));
-static int fetch_body __P ((struct fetch_command *, char**));
-static int fetch_uid __P ((struct fetch_command *, char**));
+static int fetch_all (struct fetch_command *, char**);
+static int fetch_full (struct fetch_command *, char**);
+static int fetch_fast (struct fetch_command *, char**);
+static int fetch_envelope (struct fetch_command *, char**);
+static int fetch_flags (struct fetch_command *, char**);
+static int fetch_internaldate (struct fetch_command *, char**);
+static int fetch_rfc822_header (struct fetch_command *, char**);
+static int fetch_rfc822_size (struct fetch_command *, char**);
+static int fetch_rfc822_text (struct fetch_command *, char**);
+static int fetch_rfc822 (struct fetch_command *, char**);
+static int fetch_bodystructure (struct fetch_command *, char**);
+static int fetch_body (struct fetch_command *, char**);
+static int fetch_uid (struct fetch_command *, char**);
/* Helper functions. */
-static int fetch_envelope0 __P ((message_t));
-static int fetch_bodystructure0 __P ((message_t, int));
-static int bodystructure __P ((message_t, int));
-static void send_parameter_list __P ((const char *));
-static int fetch_operation __P ((message_t, char **, int));
-static int fetch_message __P ((message_t, unsigned long, unsigned long));
-static int fetch_header __P ((message_t, unsigned long, unsigned long));
-static int fetch_body_content __P ((message_t, unsigned long, unsigned long));
-static int fetch_io __P ((stream_t, unsigned long, unsigned long, unsigned long));
-static int fetch_header_fields __P ((message_t, char **, unsigned long, unsigned long));
-static int fetch_header_fields_not __P ((message_t, char **, unsigned long, unsigned long));
-static int fetch_send_address __P ((const char *));
-
-static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command*));
+static int fetch_envelope0 (message_t);
+static int fetch_bodystructure0 (message_t, int);
+static int bodystructure (message_t, int);
+static void send_parameter_list (const char *);
+static int fetch_operation (message_t, char **, int);
+static int fetch_message (message_t, unsigned long, unsigned long);
+static int fetch_header (message_t, unsigned long, unsigned long);
+static int fetch_body_content (message_t, unsigned long, unsigned long);
+static int fetch_io (stream_t, unsigned long, unsigned long, unsigned long);
+static int fetch_header_fields (message_t, char **, unsigned long, unsigned long);
+static int fetch_header_fields_not (message_t, char **, unsigned long, unsigned long);
+static int fetch_send_address (const char *);
+
+static struct fetch_command* fetch_getcommand (char *, struct fetch_command*);
struct fetch_command
{
const char *name;
- int (*func) __P ((struct fetch_command *, char **));
+ int (*func) (struct fetch_command *, char **);
message_t msg;
} fetch_command_table [] =
{
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index a2ef25a..0a1de30 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -90,9 +90,9 @@ static const char *imap4d_capa[] = {
NULL
};
-static void imap4d_daemon_init __P ((void));
-static void imap4d_daemon __P ((unsigned int, unsigned int));
-static int imap4d_mainloop __P ((int, FILE *, FILE *));
+static void imap4d_daemon_init (void);
+static void imap4d_daemon (unsigned int, unsigned int);
+static int imap4d_mainloop (int, FILE *, FILE *);
static error_t
imap4d_parse_opt (int key, char *arg, struct argp_state *state)
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index a4c80c9..40ed9c5 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -103,7 +103,7 @@ extern "C" {
struct imap4d_command
{
const char *name;
- int (*func) __P ((struct imap4d_command *, char *));
+ int (*func) (struct imap4d_command *, char *);
int states;
int failure;
int success;
@@ -166,157 +166,157 @@ extern int login_disabled;
extern int tls_required;
#ifndef HAVE_STRTOK_R
-extern char *strtok_r __P((char *s, const char *delim, char **save_ptr));
+extern char *strtok_r (char *s, const char *delim, char **save_ptr);
#endif
/* Imap4 commands */
-extern int imap4d_append __P ((struct imap4d_command *, char *));
-extern int imap4d_append0 __P((mailbox_t mbox, int flags, char *text));
-extern int imap4d_authenticate __P ((struct imap4d_command *, char *));
-extern void imap4d_auth_capability __P((void));
-extern int imap4d_capability __P ((struct imap4d_command *, char *));
-extern int imap4d_check __P ((struct imap4d_command *, char *));
-extern int imap4d_close __P ((struct imap4d_command *, char *));
-extern int imap4d_copy __P ((struct imap4d_command *, char *));
-extern int imap4d_copy0 __P ((char *, int, char *, size_t));
-extern int imap4d_create __P ((struct imap4d_command *, char *));
-extern int imap4d_delete __P ((struct imap4d_command *, char *));
-extern int imap4d_examine __P ((struct imap4d_command *, char *));
-extern int imap4d_expunge __P ((struct imap4d_command *, char *));
-extern int imap4d_fetch __P ((struct imap4d_command *, char *));
-extern int imap4d_fetch0 __P ((char *, int, char *, size_t));
-extern int imap4d_list __P ((struct imap4d_command *, char *));
-extern int imap4d_lsub __P ((struct imap4d_command *, char *));
-extern int imap4d_login __P ((struct imap4d_command *, char *));
-extern int imap4d_logout __P ((struct imap4d_command *, char *));
-extern int imap4d_noop __P ((struct imap4d_command *, char *));
-extern int imap4d_rename __P ((struct imap4d_command *, char *));
-extern int imap4d_search __P ((struct imap4d_command *, char *));
-extern int imap4d_search0 __P((char *arg, int isuid, char *replybuf, size_t replysize));
-extern int imap4d_select __P ((struct imap4d_command *, char *));
-extern int imap4d_select0 __P ((struct imap4d_command *, char *, int));
-extern int imap4d_select_status __P((void));
+extern int imap4d_append (struct imap4d_command *, char *);
+extern int imap4d_append0 (mailbox_t mbox, int flags, char *text);
+extern int imap4d_authenticate (struct imap4d_command *, char *);
+extern void imap4d_auth_capability (void);
+extern int imap4d_capability (struct imap4d_command *, char *);
+extern int imap4d_check (struct imap4d_command *, char *);
+extern int imap4d_close (struct imap4d_command *, char *);
+extern int imap4d_copy (struct imap4d_command *, char *);
+extern int imap4d_copy0 (char *, int, char *, size_t);
+extern int imap4d_create (struct imap4d_command *, char *);
+extern int imap4d_delete (struct imap4d_command *, char *);
+extern int imap4d_examine (struct imap4d_command *, char *);
+extern int imap4d_expunge (struct imap4d_command *, char *);
+extern int imap4d_fetch (struct imap4d_command *, char *);
+extern int imap4d_fetch0 (char *, int, char *, size_t);
+extern int imap4d_list (struct imap4d_command *, char *);
+extern int imap4d_lsub (struct imap4d_command *, char *);
+extern int imap4d_login (struct imap4d_command *, char *);
+extern int imap4d_logout (struct imap4d_command *, char *);
+extern int imap4d_noop (struct imap4d_command *, char *);
+extern int imap4d_rename (struct imap4d_command *, char *);
+extern int imap4d_search (struct imap4d_command *, char *);
+extern int imap4d_search0 (char *arg, int isuid, char *replybuf, size_t replysize);
+extern int imap4d_select (struct imap4d_command *, char *);
+extern int imap4d_select0 (struct imap4d_command *, char *, int);
+extern int imap4d_select_status (void);
#ifdef WITH_TLS
-extern int imap4d_starttls __P ((struct imap4d_command *, char *));
-extern void starttls_init __P((void));
+extern int imap4d_starttls (struct imap4d_command *, char *);
+extern void starttls_init (void);
#endif /* WITH_TLS */
-extern int imap4d_status __P ((struct imap4d_command *, char *));
-extern int imap4d_store __P ((struct imap4d_command *, char *));
-extern int imap4d_store0 __P ((char *, int, char *, size_t));
-extern int imap4d_subscribe __P ((struct imap4d_command *, char *));
-extern int imap4d_uid __P ((struct imap4d_command *, char *));
-extern int imap4d_unsubscribe __P ((struct imap4d_command *, char *));
-extern int imap4d_namespace __P ((struct imap4d_command *, char *));
-extern int imap4d_version __P ((struct imap4d_command *, char *));
-extern int imap4d_idle __P ((struct imap4d_command *, char *));
+extern int imap4d_status (struct imap4d_command *, char *);
+extern int imap4d_store (struct imap4d_command *, char *);
+extern int imap4d_store0 (char *, int, char *, size_t);
+extern int imap4d_subscribe (struct imap4d_command *, char *);
+extern int imap4d_uid (struct imap4d_command *, char *);
+extern int imap4d_unsubscribe (struct imap4d_command *, char *);
+extern int imap4d_namespace (struct imap4d_command *, char *);
+extern int imap4d_version (struct imap4d_command *, char *);
+extern int imap4d_idle (struct imap4d_command *, char *);
/* Shared between fetch and store */
extern void fetch_flags0 (const char *prefix, message_t msg, int isuid);
/* Synchronisation on simultaneous access. */
-extern int imap4d_sync __P ((void));
-extern int imap4d_sync_flags __P ((size_t));
-extern size_t uid_to_msgno __P ((size_t));
+extern int imap4d_sync (void);
+extern int imap4d_sync_flags (size_t);
+extern size_t uid_to_msgno (size_t);
extern void imap4d_set_observer (mailbox_t mbox);
/* Signal handling. */
-extern RETSIGTYPE imap4d_sigchld __P ((int));
-extern RETSIGTYPE imap4d_signal __P ((int));
-extern int imap4d_bye __P ((int));
-extern int imap4d_bye0 __P ((int reason, struct imap4d_command *command));
+extern RETSIGTYPE imap4d_sigchld (int);
+extern RETSIGTYPE imap4d_signal (int);
+extern int imap4d_bye (int);
+extern int imap4d_bye0 (int reason, struct imap4d_command *command);
/* Namespace functions */
-extern int set_namespace __P((int i, char *str));
-extern int namespace_init __P((char *path));
-extern char * namespace_getfullpath __P((char *name, const char *delim));
-extern char * namespace_checkfullpath __P((char *name, const char *pattern,
- const char *delim));
+extern int set_namespace (int i, char *str);
+extern int namespace_init (char *path);
+extern char * namespace_getfullpath (char *name, const char *delim);
+extern char * namespace_checkfullpath (char *name, const char *pattern,
+ const char *delim);
/* Capability functions */
-extern void imap4d_capability_add __P((const char *str));
-extern void imap4d_capability_remove __P((const char *str));
-extern void imap4d_capability_init __P((void));
+extern void imap4d_capability_add (const char *str);
+extern void imap4d_capability_remove (const char *str);
+extern void imap4d_capability_init (void);
/* Helper functions. */
-extern int util_out __P ((int, const char *, ...));
-extern int util_send __P ((const char *, ...));
-extern int util_send_qstring __P ((const char *));
-extern int util_send_literal __P ((const char *));
-extern int util_start __P ((char *));
-extern int util_finish __P ((struct imap4d_command *, int, const char *, ...));
-extern int util_getstate __P ((void));
-extern int util_do_command __P ((char *));
-extern char *imap4d_readline __P ((void));
-extern char *imap4d_readline_ex __P ((void));
-extern char *util_getword __P ((char *, char **));
-extern char *util_getitem __P ((char *, const char *, char **));
-extern int util_token __P ((char *, size_t, char **));
-extern void util_unquote __P ((char **));
-extern char *util_tilde_expansion __P ((const char *, const char *));
-extern char *util_getfullpath __P ((char *, const char *));
-extern int util_msgset __P ((char *, size_t **, int *, int));
-extern int util_upper __P ((char *));
-extern struct imap4d_command *util_getcommand __P ((char *,
- struct imap4d_command []));
-extern int util_parse_internal_date0 __P((char *date, time_t *timep, char **endp));
-extern int util_parse_internal_date __P((char *date, time_t *timep));
-extern int util_parse_822_date __P((char *date, time_t *timep));
-extern int util_parse_ctime_date __P((const char *date, time_t *timep));
-extern char *util_strcasestr __P((const char *haystack, const char *needle));
-extern int util_parse_attributes __P((char *items, char **save, int *flags));
-
-extern int util_base64_encode __P((const unsigned char *input,
- size_t input_len,
- unsigned char **output,
- size_t *output_len));
-extern int util_base64_decode __P((const unsigned char *input,
- size_t input_len,
- unsigned char **output,
- size_t *output_len));
-extern char *util_localname __P((void));
-
-extern int util_wcard_match __P((const char *string, const char *pattern,
- const char *delim));
-void util_print_flags __P((attribute_t attr));
-int util_attribute_to_type __P((const char *item, int *type));
-int util_type_to_attribute __P((int type, char **attr_str));
-int util_attribute_matches_flag __P((attribute_t attr, const char *item));
-int util_uidvalidity __P((mailbox_t smbox, unsigned long *uidvp));
-
-void util_setio __P((FILE*, FILE*));
-void util_flush_output __P((void));
-void util_get_input __P((stream_t *pstr));
-void util_get_output __P((stream_t *pstr));
-void util_set_input __P((stream_t str));
-void util_set_output __P((stream_t str));
-int util_wait_input __P((int));
+extern int util_out (int, const char *, ...);
+extern int util_send (const char *, ...);
+extern int util_send_qstring (const char *);
+extern int util_send_literal (const char *);
+extern int util_start (char *);
+extern int util_finish (struct imap4d_command *, int, const char *, ...);
+extern int util_getstate (void);
+extern int util_do_command (char *);
+extern char *imap4d_readline (void);
+extern char *imap4d_readline_ex (void);
+extern char *util_getword (char *, char **);
+extern char *util_getitem (char *, const char *, char **);
+extern int util_token (char *, size_t, char **);
+extern void util_unquote (char **);
+extern char *util_tilde_expansion (const char *, const char *);
+extern char *util_getfullpath (char *, const char *);
+extern int util_msgset (char *, size_t **, int *, int);
+extern int util_upper (char *);
+extern struct imap4d_command *util_getcommand (char *,
+ struct imap4d_command []);
+extern int util_parse_internal_date0 (char *date, time_t *timep, char **endp);
+extern int util_parse_internal_date (char *date, time_t *timep);
+extern int util_parse_822_date (char *date, time_t *timep);
+extern int util_parse_ctime_date (const char *date, time_t *timep);
+extern char *util_strcasestr (const char *haystack, const char *needle);
+extern int util_parse_attributes (char *items, char **save, int *flags);
+
+extern int util_base64_encode (const unsigned char *input,
+ size_t input_len,
+ unsigned char **output,
+ size_t *output_len);
+extern int util_base64_decode (const unsigned char *input,
+ size_t input_len,
+ unsigned char **output,
+ size_t *output_len);
+extern char *util_localname (void);
+
+extern int util_wcard_match (const char *string, const char *pattern,
+ const char *delim);
+void util_print_flags (attribute_t attr);
+int util_attribute_to_type (const char *item, int *type);
+int util_type_to_attribute (int type, char **attr_str);
+int util_attribute_matches_flag (attribute_t attr, const char *item);
+int util_uidvalidity (mailbox_t smbox, unsigned long *uidvp);
+
+void util_setio (FILE*, FILE*);
+void util_flush_output (void);
+void util_get_input (stream_t *pstr);
+void util_get_output (stream_t *pstr);
+void util_set_input (stream_t str);
+void util_set_output (stream_t str);
+int util_wait_input (int);
-void util_register_event __P((int old_state, int new_state,
- list_action_t *action, void *data));
-void util_event_remove __P((void *id));
-void util_run_events __P((int old_state, int new_state));
+void util_register_event (int old_state, int new_state,
+ list_action_t *action, void *data);
+void util_event_remove (void *id);
+void util_run_events (int old_state, int new_state);
-int util_is_master __P((void));
-void util_bye __P((void));
-void util_atexit __P((void (*fp) __PMT((void))));
+int util_is_master (void);
+void util_bye (void);
+void util_atexit (void (*fp) (void));
#ifdef WITH_TLS
-int imap4d_init_tls_server __P((void));
+int imap4d_init_tls_server (void);
#endif /* WITH_TLS */
-typedef int (*imap4d_auth_handler_fp) __PMT((struct imap4d_command *,
- char *, char *, char **));
+typedef int (*imap4d_auth_handler_fp) (struct imap4d_command *,
+ char *, char *, char **);
-extern void auth_add __P((char *name, imap4d_auth_handler_fp handler));
-extern void auth_remove __P((char *name));
+extern void auth_add (char *name, imap4d_auth_handler_fp handler);
+extern void auth_remove (char *name);
#ifdef WITH_GSSAPI
-extern void auth_gssapi_init __P((void));
+extern void auth_gssapi_init (void);
#else
# define auth_gssapi_init()
#endif
#ifdef WITH_GSASL
-extern void auth_gsasl_init __P((void));
+extern void auth_gsasl_init (void);
#else
# define auth_gsasl_init()
#endif
diff --git a/imap4d/list.c b/imap4d/list.c
index b07ac64..6e4ea52 100644
--- a/imap4d/list.c
+++ b/imap4d/list.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -53,10 +53,10 @@ struct inode_list
at this position. The charcater "%" is similar to "*",
but it does not match ahierarchy delimiter. */
-static int match __P ((const char *, const char *, const char *));
-static void list_file __P ((const char *, const char *, const char *, const char *, struct inode_list *));
-static void print_file __P ((const char *, const char *, const char *));
-static void print_dir __P ((const char *, const char *, const char *));
+static int match (const char *, const char *, const char *);
+static void list_file (const char *, const char *, const char *, const char *, struct inode_list *);
+static void print_file (const char *, const char *, const char *);
+static void print_dir (const char *, const char *, const char *);
int
imap4d_list (struct imap4d_command *command, char *arg)
diff --git a/imap4d/namespace.c b/imap4d/namespace.c
index b1f8c74..3c453e1 100644
--- a/imap4d/namespace.c
+++ b/imap4d/namespace.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
#include "imap4d.h"
/*FIXME: should be global? */
-typedef int (*nsfp_t) __P ((void *closure, int ns, char *path, int delim));
+typedef int (*nsfp_t) (void *closure, int ns, char *path, int delim);
struct namespace_t
{
diff --git a/imap4d/search.c b/imap4d/search.c
index ec3f7c3..8fc6036 100644
--- a/imap4d/search.c
+++ b/imap4d/search.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,32 +38,32 @@
search queries. */
struct parsebuf;
-typedef void (*inst_t) __P((struct parsebuf *pb));
-
-static void cond_and __P((struct parsebuf *pb));
-static void cond_or __P((struct parsebuf *pb));
-static void cond_not __P((struct parsebuf *pb));
-
-static void cond_all __P((struct parsebuf *pb));
-static void cond_msgset __P((struct parsebuf *pb));
-static void cond_bcc __P((struct parsebuf *pb));
-static void cond_before __P((struct parsebuf *pb));
-static void cond_body __P((struct parsebuf *pb));
-static void cond_cc __P((struct parsebuf *pb));
-static void cond_from __P((struct parsebuf *pb));
-static void cond_header __P((struct parsebuf *pb));
-static void cond_keyword __P((struct parsebuf *pb));
-static void cond_larger __P((struct parsebuf *pb));
-static void cond_on __P((struct parsebuf *pb));
-static void cond_sentbefore __P((struct parsebuf *pb));
-static void cond_senton __P((struct parsebuf *pb));
-static void cond_sentsince __P((struct parsebuf *pb));
-static void cond_since __P((struct parsebuf *pb));
-static void cond_smaller __P((struct parsebuf *pb));
-static void cond_subject __P((struct parsebuf *pb));
-static void cond_text __P((struct parsebuf *pb));
-static void cond_to __P((struct parsebuf *pb));
-static void cond_uid __P((struct parsebuf *pb));
+typedef void (*inst_t) (struct parsebuf *pb);
+
+static void cond_and (struct parsebuf *pb);
+static void cond_or (struct parsebuf *pb);
+static void cond_not (struct parsebuf *pb);
+
+static void cond_all (struct parsebuf *pb);
+static void cond_msgset (struct parsebuf *pb);
+static void cond_bcc (struct parsebuf *pb);
+static void cond_before (struct parsebuf *pb);
+static void cond_body (struct parsebuf *pb);
+static void cond_cc (struct parsebuf *pb);
+static void cond_from (struct parsebuf *pb);
+static void cond_header (struct parsebuf *pb);
+static void cond_keyword (struct parsebuf *pb);
+static void cond_larger (struct parsebuf *pb);
+static void cond_on (struct parsebuf *pb);
+static void cond_sentbefore (struct parsebuf *pb);
+static void cond_senton (struct parsebuf *pb);
+static void cond_sentsince (struct parsebuf *pb);
+static void cond_since (struct parsebuf *pb);
+static void cond_smaller (struct parsebuf *pb);
+static void cond_subject (struct parsebuf *pb);
+static void cond_text (struct parsebuf *pb);
+static void cond_to (struct parsebuf *pb);
+static void cond_uid (struct parsebuf *pb);
/* A basic condition structure */
struct cond
@@ -178,16 +178,16 @@ struct parsebuf
message_t msg; /* Current message */
};
-static void put_code __P((struct parsebuf *pb, inst_t inst));
-static void parse_free_mem __P((struct parsebuf *pb));
-static void *parse_regmem __P((struct parsebuf *pb, void *mem));
-static char *parse_strdup __P((struct parsebuf *pb, char *s));
-static void *parse_alloc __P((struct parsebuf *pb, size_t size));
-static int parse_search_key_list __P((struct parsebuf *pb));
-static int parse_search_key __P((struct parsebuf *pb));
-static int parse_gettoken __P((struct parsebuf *pb, int req));
-static int search_run __P((struct parsebuf *pb));
-static void do_search __P((struct parsebuf *pb));
+static void put_code (struct parsebuf *pb, inst_t inst);
+static void parse_free_mem (struct parsebuf *pb);
+static void *parse_regmem (struct parsebuf *pb, void *mem);
+static char *parse_strdup (struct parsebuf *pb, char *s);
+static void *parse_alloc (struct parsebuf *pb, size_t size);
+static int parse_search_key_list (struct parsebuf *pb);
+static int parse_search_key (struct parsebuf *pb);
+static int parse_gettoken (struct parsebuf *pb, int req);
+static int search_run (struct parsebuf *pb);
+static void do_search (struct parsebuf *pb);
int
imap4d_search (struct imap4d_command *command, char *arg)
diff --git a/imap4d/status.c b/imap4d/status.c
index 294bd8a..41ecc1c 100644
--- a/imap4d/status.c
+++ b/imap4d/status.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,13 +22,13 @@
*
*/
-typedef int (*status_funcp) __P ((mailbox_t));
+typedef int (*status_funcp) (mailbox_t);
-static int status_messages __P ((mailbox_t));
-static int status_recent __P ((mailbox_t));
-static int status_uidnext __P ((mailbox_t));
-static int status_uidvalidity __P ((mailbox_t));
-static int status_unseen __P ((mailbox_t));
+static int status_messages (mailbox_t);
+static int status_recent (mailbox_t);
+static int status_uidnext (mailbox_t);
+static int status_uidvalidity (mailbox_t);
+static int status_unseen (mailbox_t);
struct status_table {
char *name;
diff --git a/imap4d/util.c b/imap4d/util.c
index 19ac9cb..58770bf 100644
--- a/imap4d/util.c
+++ b/imap4d/util.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
static stream_t istream;
static stream_t ostream;
-static int add2set __P ((size_t **, int *, unsigned long));
-static const char *sc2string __P ((int));
+static int add2set (size_t **, int *, unsigned long);
+static const char *sc2string (int);
/* Get the next space/CR/NL separated word, some words are between double
quotes, strtok() can not handle it. */
diff --git a/include/mailutils/address.h b/include/mailutils/address.h
index 6914702..496566e 100644
--- a/include/mailutils/address.h
+++ b/include/mailutils/address.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,53 +25,52 @@
extern "C" {
#endif
-extern int address_create __P ((address_t *, const char *));
-extern int address_createv __P ((address_t *, const char *v[], size_t));
-extern void address_destroy __P ((address_t *));
+extern int address_create (address_t *, const char *);
+extern int address_createv (address_t *, const char *v[], size_t);
+extern void address_destroy (address_t *);
-extern address_t address_dup __P ((address_t src));
+extern address_t address_dup (address_t src);
/* Set FROM to null, after adding its addresses to TO. */
-extern int address_concatenate __P ((address_t to, address_t* from));
+extern int address_concatenate (address_t to, address_t* from);
extern int address_get_nth
- __P ((address_t addr, size_t no, address_t *pret));
+ (address_t addr, size_t no, address_t *pret);
extern int address_get_email
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_get_local_part
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_get_domain
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_get_personal
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_get_comments
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_get_route
- __P ((address_t, size_t, char *, size_t, size_t *));
+ (address_t, size_t, char *, size_t, size_t *);
extern int address_aget_email
- __P ((address_t, size_t, char **));
+ (address_t, size_t, char **);
extern int address_aget_local_part
- __P ((address_t addr, size_t no, char **buf));
+ (address_t addr, size_t no, char **buf);
extern int address_aget_domain
- __P ((address_t addr, size_t no, char **buf));
+ (address_t addr, size_t no, char **buf);
extern int address_aget_personal
- __P ((address_t addr, size_t no, char **buf));
+ (address_t addr, size_t no, char **buf);
extern int address_is_group
- __P ((address_t, size_t, int*));
+ (address_t, size_t, int*);
-extern int address_to_string __P ((address_t, char *, size_t, size_t *));
-extern int address_get_count __P ((address_t, size_t *));
-extern int address_get_group_count __P ((address_t, size_t *));
-extern int address_get_email_count __P ((address_t, size_t *));
-extern int address_get_unix_mailbox_count __P ((address_t, size_t *));
+extern int address_to_string (address_t, char *, size_t, size_t *);
+extern int address_get_count (address_t, size_t *);
+extern int address_get_group_count (address_t, size_t *);
+extern int address_get_email_count (address_t, size_t *);
+extern int address_get_unix_mailbox_count (address_t, size_t *);
-extern int address_contains_email __P((address_t addr, const char *email));
-extern int address_union __P((address_t *a, address_t b));
+extern int address_contains_email (address_t addr, const char *email);
+extern int address_union (address_t *a, address_t b);
-extern size_t address_format_string __P((address_t addr, char *buf,
- size_t buflen));
+extern size_t address_format_string (address_t addr, char *buf, size_t buflen);
#ifdef __cplusplus
}
diff --git a/include/mailutils/argcv.h b/include/mailutils/argcv.h
index c179c74..6a165a0 100644
--- a/include/mailutils/argcv.h
+++ b/include/mailutils/argcv.h
@@ -28,28 +28,20 @@
extern "C" {
#endif
-#ifndef __P
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define __P(args) args
-# else
-# define __P(args) ()
-# endif
-#endif /*__P */
-
-extern int argcv_get __P ((const char *command, const char *delim,
- const char* cmnt,
- int *argc, char ***argv));
-extern int argcv_get_n __P((const char *command, int len,
- const char *delim, const char *cmnt,
- int *argc, char ***argv));
+extern int argcv_get (const char *command, const char *delim,
+ const char* cmnt,
+ int *argc, char ***argv);
+extern int argcv_get_n (const char *command, int len,
+ const char *delim, const char *cmnt,
+ int *argc, char ***argv);
-extern int argcv_string __P ((int argc, char **argv, char **string));
-extern int argcv_free __P ((int argc, char **argv));
-extern int argcv_unquote_char __P((int c));
-extern int argcv_quote_char __P((int c));
-extern size_t argcv_quoted_length __P((const char *str, int *quote));
-extern void argcv_unquote_copy __P((char *dst, const char *src, size_t n));
-extern void argcv_quote_copy __P((char *dst, const char *src));
+extern int argcv_string (int argc, char **argv, char **string);
+extern int argcv_free (int argc, char **argv);
+extern int argcv_unquote_char (int c);
+extern int argcv_quote_char (int c);
+extern size_t argcv_quoted_length (const char *str, int *quote);
+extern void argcv_unquote_copy (char *dst, const char *src, size_t n);
+extern void argcv_quote_copy (char *dst, const char *src);
#ifdef __cplusplus
}
diff --git a/include/mailutils/argp.h b/include/mailutils/argp.h
index 4be28b2..73c75ac 100644
--- a/include/mailutils/argp.h
+++ b/include/mailutils/argp.h
@@ -46,20 +46,20 @@ extern char *mu_license_text;
extern "C" {
#endif
-extern void mu_argp_init __P ((const char *vers, const char *bugaddr));
+extern void mu_argp_init (const char *vers, const char *bugaddr);
-extern void mu_create_argcv __P ((const char *capa[],
- int argc, char **argv,
- int *p_argc, char ***p_argv));
-extern error_t mu_argp_parse __P ((const struct argp * argp,
- int *p_argc, char ***p_argv,
- unsigned flags,
- const char *capa[],
- int *arg_index, void *input));
-extern int mu_register_capa __P((const char *name, struct argp_child *child));
+extern void mu_create_argcv (const char *capa[],
+ int argc, char **argv,
+ int *p_argc, char ***p_argv);
+extern error_t mu_argp_parse (const struct argp * argp,
+ int *p_argc, char ***p_argv,
+ unsigned flags,
+ const char *capa[],
+ int *arg_index, void *input);
+extern int mu_register_capa (const char *name, struct argp_child *child);
-extern void mu_print_options __P((void));
-extern const char *mu_check_option __P((char *name));
+extern void mu_print_options (void);
+extern const char *mu_check_option (char *name);
#ifdef __cplusplus
}
diff --git a/include/mailutils/attribute.h b/include/mailutils/attribute.h
index b0280dc..693061e 100644
--- a/include/mailutils/attribute.h
+++ b/include/mailutils/attribute.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -45,57 +45,59 @@ extern "C" {
#define MU_ATTRIBUTE_IS_UNREAD(f) \
((f) == 0 || ! ((f) & MU_ATTRIBUTE_READ))
-extern int attribute_create __P ((attribute_t *, void *));
-extern void attribute_destroy __P ((attribute_t *, void *));
-extern void * attribute_get_owner __P ((attribute_t));
-extern int attribute_is_modified __P ((attribute_t));
-extern int attribute_clear_modified __P ((attribute_t));
-extern int attribute_set_modified __P ((attribute_t attr));
-
-extern int attribute_is_userflag __P ((attribute_t, int));
-extern int attribute_is_seen __P ((attribute_t));
-extern int attribute_is_answered __P ((attribute_t));
-extern int attribute_is_flagged __P ((attribute_t));
-extern int attribute_is_deleted __P ((attribute_t));
-extern int attribute_is_draft __P ((attribute_t));
-extern int attribute_is_recent __P ((attribute_t));
-extern int attribute_is_read __P ((attribute_t));
-
-extern int attribute_set_userflag __P ((attribute_t, int));
-extern int attribute_set_seen __P ((attribute_t));
-extern int attribute_set_answered __P ((attribute_t));
-extern int attribute_set_flagged __P ((attribute_t));
-extern int attribute_set_deleted __P ((attribute_t));
-extern int attribute_set_draft __P ((attribute_t));
-extern int attribute_set_recent __P ((attribute_t));
-extern int attribute_set_read __P ((attribute_t));
-
-extern int attribute_unset_userflag __P ((attribute_t, int));
-extern int attribute_unset_seen __P ((attribute_t));
-extern int attribute_unset_answered __P ((attribute_t));
-extern int attribute_unset_flagged __P ((attribute_t));
-extern int attribute_unset_deleted __P ((attribute_t));
-extern int attribute_unset_draft __P ((attribute_t));
-extern int attribute_unset_recent __P ((attribute_t));
-extern int attribute_unset_read __P ((attribute_t));
-
-extern int attribute_get_flags __P ((attribute_t, int *));
-extern int attribute_set_flags __P ((attribute_t, int));
-extern int attribute_unset_flags __P ((attribute_t, int));
-
-extern int attribute_set_set_flags __P ((attribute_t, int (*_set_flags)
- __PMT ((attribute_t, int)), void *));
-extern int attribute_set_unset_flags __P ((attribute_t, int (*_unset_flags)
- __PMT ((attribute_t, int)), void *));
-extern int attribute_set_get_flags __P ((attribute_t, int (*_get_flags)
- __PMT ((attribute_t, int *)), void *));
-extern int attribute_is_equal __P ((attribute_t, attribute_t att2));
-
-extern int attribute_copy __P ((attribute_t, attribute_t));
-
-extern int attribute_to_string __P ((attribute_t, char *, size_t,
- size_t *));
-extern int string_to_flags __P ((const char *, int *));
+extern int attribute_create (attribute_t *, void *);
+extern void attribute_destroy (attribute_t *, void *);
+extern void * attribute_get_owner (attribute_t);
+extern int attribute_is_modified (attribute_t);
+extern int attribute_clear_modified (attribute_t);
+extern int attribute_set_modified (attribute_t attr);
+
+extern int attribute_is_userflag (attribute_t, int);
+extern int attribute_is_seen (attribute_t);
+extern int attribute_is_answered (attribute_t);
+extern int attribute_is_flagged (attribute_t);
+extern int attribute_is_deleted (attribute_t);
+extern int attribute_is_draft (attribute_t);
+extern int attribute_is_recent (attribute_t);
+extern int attribute_is_read (attribute_t);
+
+extern int attribute_set_userflag (attribute_t, int);
+extern int attribute_set_seen (attribute_t);
+extern int attribute_set_answered (attribute_t);
+extern int attribute_set_flagged (attribute_t);
+extern int attribute_set_deleted (attribute_t);
+extern int attribute_set_draft (attribute_t);
+extern int attribute_set_recent (attribute_t);
+extern int attribute_set_read (attribute_t);
+
+extern int attribute_unset_userflag (attribute_t, int);
+extern int attribute_unset_seen (attribute_t);
+extern int attribute_unset_answered (attribute_t);
+extern int attribute_unset_flagged (attribute_t);
+extern int attribute_unset_deleted (attribute_t);
+extern int attribute_unset_draft (attribute_t);
+extern int attribute_unset_recent (attribute_t);
+extern int attribute_unset_read (attribute_t);
+
+extern int attribute_get_flags (attribute_t, int *);
+extern int attribute_set_flags (attribute_t, int);
+extern int attribute_unset_flags (attribute_t, int);
+
+extern int attribute_set_set_flags (attribute_t,
+ int (*_set_flags) (attribute_t, int),
+ void *);
+extern int attribute_set_unset_flags (attribute_t,
+ int (*_unset_flags) (attribute_t, int),
+ void *);
+extern int attribute_set_get_flags (attribute_t,
+ int (*_get_flags) (attribute_t, int *),
+ void *);
+extern int attribute_is_equal (attribute_t, attribute_t att2);
+
+extern int attribute_copy (attribute_t, attribute_t);
+
+extern int attribute_to_string (attribute_t, char *, size_t, size_t *);
+extern int string_to_flags (const char *, int *);
#ifdef __cplusplus
}
diff --git a/include/mailutils/auth.h b/include/mailutils/auth.h
index b4332f0..abeb5c7 100644
--- a/include/mailutils/auth.h
+++ b/include/mailutils/auth.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,37 +25,36 @@
extern "C" {
#endif
-extern int ticket_create __P ((ticket_t *, void *owner));
-extern void ticket_destroy __P ((ticket_t *, void *owner));
-extern int ticket_set_destroy __P ((ticket_t, void (*)
- __PMT ((ticket_t)), void *owner));
-extern void *ticket_get_owner __P ((ticket_t));
-
-extern int ticket_set_pop __P ((ticket_t, int (*_pop)
- __PMT ((ticket_t, url_t, const char *, char **)), void *));
-extern int ticket_pop __P ((ticket_t, url_t, const char *, char **));
-extern int ticket_set_data __P ((ticket_t, void *, void *owner));
-extern int ticket_get_data __P ((ticket_t, void **));
-
-extern int authority_create __P ((authority_t *, ticket_t, void *));
-extern void authority_destroy __P ((authority_t *, void *));
-extern void *authority_get_owner __P ((authority_t));
-extern int authority_set_ticket __P ((authority_t, ticket_t));
-extern int authority_get_ticket __P ((authority_t, ticket_t *));
-extern int authority_authenticate __P ((authority_t));
-extern int authority_set_authenticate __P ((authority_t,
- int (*_authenticate) __PMT ((authority_t)), void *));
-
-extern int authority_create_null __P ((authority_t *pauthority, void *owner));
-
-extern int wicket_create __P ((wicket_t *, const char *));
-extern void wicket_destroy __P ((wicket_t *));
-extern int wicket_set_filename __P ((wicket_t, const char *));
-extern int wicket_get_filename __P ((wicket_t, char *, size_t, size_t *));
-extern int wicket_set_ticket __P ((wicket_t, int (*)
- __PMT ((wicket_t, const char *,
- const char *, ticket_t *))));
-extern int wicket_get_ticket __P ((wicket_t, ticket_t *, const char *, const char *));
+extern int ticket_create (ticket_t *, void *owner);
+extern void ticket_destroy (ticket_t *, void *owner);
+extern int ticket_set_destroy (ticket_t, void (*) (ticket_t), void *);
+extern void *ticket_get_owner (ticket_t);
+
+extern int ticket_set_pop (ticket_t,
+ int (*_pop) (ticket_t, url_t, const char *, char **), void *);
+extern int ticket_pop (ticket_t, url_t, const char *, char **);
+extern int ticket_set_data (ticket_t, void *, void *owner);
+extern int ticket_get_data (ticket_t, void **);
+
+extern int authority_create (authority_t *, ticket_t, void *);
+extern void authority_destroy (authority_t *, void *);
+extern void *authority_get_owner (authority_t);
+extern int authority_set_ticket (authority_t, ticket_t);
+extern int authority_get_ticket (authority_t, ticket_t *);
+extern int authority_authenticate (authority_t);
+extern int authority_set_authenticate (authority_t,
+ int (*_authenticate) (authority_t), void *);
+
+extern int authority_create_null (authority_t *pauthority, void *owner);
+
+extern int wicket_create (wicket_t *, const char *);
+extern void wicket_destroy (wicket_t *);
+extern int wicket_set_filename (wicket_t, const char *);
+extern int wicket_get_filename (wicket_t, char *, size_t, size_t *);
+extern int wicket_set_ticket (wicket_t,
+ int (*) (wicket_t, const char *,
+ const char *, ticket_t *));
+extern int wicket_get_ticket (wicket_t, ticket_t *, const char *, const char *);
#ifdef __cplusplus
}
diff --git a/include/mailutils/body.h b/include/mailutils/body.h
index fd8db9b..a03c100 100644
--- a/include/mailutils/body.h
+++ b/include/mailutils/body.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,23 +25,23 @@
extern "C" {
#endif
-extern int body_create __P ((body_t *, void *owner));
-extern void body_destroy __P ((body_t *, void *owner));
-extern void * body_get_owner __P ((body_t));
-extern int body_is_modified __P ((body_t));
-extern int body_clear_modified __P ((body_t));
+extern int body_create (body_t *, void *owner);
+extern void body_destroy (body_t *, void *owner);
+extern void * body_get_owner (body_t);
+extern int body_is_modified (body_t);
+extern int body_clear_modified (body_t);
-extern int body_get_stream __P ((body_t, stream_t *));
-extern int body_set_stream __P ((body_t, stream_t, void *owner));
+extern int body_get_stream (body_t, stream_t *);
+extern int body_set_stream (body_t, stream_t, void *owner);
-extern int body_get_filename __P ((body_t, char *, size_t, size_t *));
+extern int body_get_filename (body_t, char *, size_t, size_t *);
-extern int body_size __P ((body_t, size_t*));
-extern int body_set_size __P ((body_t, int (*_size)
- __PMT ((body_t, size_t*)), void *owner));
-extern int body_lines __P ((body_t, size_t *));
-extern int body_set_lines __P ((body_t, int (*_lines)
- __PMT ((body_t, size_t*)), void *owner));
+extern int body_size (body_t, size_t*);
+extern int body_set_size (body_t,
+ int (*_size) (body_t, size_t*), void *owner);
+extern int body_lines (body_t, size_t *);
+extern int body_set_lines (body_t,
+ int (*_lines) (body_t, size_t*), void *owner);
#ifdef __cplusplus
}
diff --git a/include/mailutils/daemon.h b/include/mailutils/daemon.h
index f3960ac..57a8833 100644
--- a/include/mailutils/daemon.h
+++ b/include/mailutils/daemon.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,8 +25,8 @@
extern "C" {
#endif
-extern int daemon_create_pidfile __P ((const char *));
-extern void daemon_remove_pidfile __P ((void));
+extern int daemon_create_pidfile (const char *);
+extern void daemon_remove_pidfile (void);
#ifdef __cplusplus
}
diff --git a/include/mailutils/debug.h b/include/mailutils/debug.h
index cd43266..2ba7b68 100644
--- a/include/mailutils/debug.h
+++ b/include/mailutils/debug.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -31,17 +31,19 @@ extern "C" {
#define MU_DEBUG_TRACE 0x0002
#define MU_DEBUG_PROT 0x0004
-extern int mu_debug_create __P ((mu_debug_t *, void *owner));
-extern void mu_debug_destroy __P ((mu_debug_t *, void *owner));
-extern void * mu_debug_get_owner __P ((mu_debug_t));
-extern int mu_debug_set_level __P ((mu_debug_t, size_t level));
-extern int mu_debug_get_level __P ((mu_debug_t, size_t *plevel));
-extern int mu_debug_print __P ((mu_debug_t debug, size_t level,
- const char *format, ...));
-extern int mu_debug_printv __P ((mu_debug_t debug, size_t level,
- const char *format, va_list argp));
-extern int mu_debug_set_print __P ((mu_debug_t,
- int (*_print) __PMT ((mu_debug_t, size_t level, const char *, va_list)), void *owner));
+extern int mu_debug_create (mu_debug_t *, void *owner);
+extern void mu_debug_destroy (mu_debug_t *, void *owner);
+extern void * mu_debug_get_owner (mu_debug_t);
+extern int mu_debug_set_level (mu_debug_t, size_t level);
+extern int mu_debug_get_level (mu_debug_t, size_t *plevel);
+extern int mu_debug_print (mu_debug_t debug, size_t level,
+ const char *format, ...);
+extern int mu_debug_printv (mu_debug_t debug, size_t level,
+ const char *format, va_list argp);
+extern int mu_debug_set_print (mu_debug_t,
+ int (*_print) (mu_debug_t, size_t level,
+ const char *, va_list),
+ void *owner);
#ifdef __cplusplus
}
diff --git a/include/mailutils/envelope.h b/include/mailutils/envelope.h
index ddf8bed..cbaefaf 100644
--- a/include/mailutils/envelope.h
+++ b/include/mailutils/envelope.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,15 +25,17 @@
extern "C" { /*}*/
#endif
-int envelope_create __P((envelope_t *, void *));
-void envelope_destroy __P((envelope_t *, void *));
-void * envelope_get_owner __P((envelope_t));
-int envelope_set_sender __P((envelope_t,
- int (*_sender) __PMT ((envelope_t, char *, size_t, size_t*)), void *));
-int envelope_sender __P((envelope_t, char *, size_t, size_t *));
-int envelope_set_date __P((envelope_t,
- int (*_date) __PMT ((envelope_t, char *, size_t , size_t *)), void *));
-int envelope_date __P((envelope_t, char *, size_t, size_t *));
+int envelope_create (envelope_t *, void *);
+void envelope_destroy (envelope_t *, void *);
+void * envelope_get_owner (envelope_t);
+int envelope_set_sender (envelope_t,
+ int (*_sender) (envelope_t, char *, size_t, size_t*),
+ void *);
+int envelope_sender (envelope_t, char *, size_t, size_t *);
+int envelope_set_date (envelope_t,
+ int (*_date) (envelope_t, char *, size_t , size_t *),
+ void *);
+int envelope_date (envelope_t, char *, size_t, size_t *);
#ifdef __cplusplus
}
diff --git a/include/mailutils/error.h b/include/mailutils/error.h
index 4f45924..f6824ef 100644
--- a/include/mailutils/error.h
+++ b/include/mailutils/error.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,12 +29,12 @@ extern "C" {
typedef int (*error_pfn_t) __PMT ((const char *fmt, va_list ap));
-extern int mu_verror __P ((const char *fmt, va_list ap));
-extern int mu_error __P ((const char *fmt, ...));
-extern void mu_error_set_print __P ((error_pfn_t));
+extern int mu_verror (const char *fmt, va_list ap);
+extern int mu_error (const char *fmt, ...);
+extern void mu_error_set_print (error_pfn_t);
-int mu_default_error_printer __P ((const char *fmt, va_list ap));
-int mu_syslog_error_printer __P((const char *fmt, va_list ap));
+int mu_default_error_printer (const char *fmt, va_list ap);
+int mu_syslog_error_printer (const char *fmt, va_list ap);
#ifdef __cplusplus
}
diff --git a/include/mailutils/filter.h b/include/mailutils/filter.h
index ba51103..20329c8 100644
--- a/include/mailutils/filter.h
+++ b/include/mailutils/filter.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -46,8 +46,8 @@ struct _filter_record
};
-extern int filter_create __P ((stream_t *, stream_t, const char*, int, int));
-extern int filter_get_list __P ((list_t *));
+extern int filter_create (stream_t *, stream_t, const char*, int, int);
+extern int filter_get_list (list_t *);
/* List of defaults. */
extern filter_record_t rfc822_filter;
diff --git a/include/mailutils/folder.h b/include/mailutils/folder.h
index 8e22a65..797704c 100644
--- a/include/mailutils/folder.h
+++ b/include/mailutils/folder.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -39,44 +39,44 @@ struct folder_list
};
/* Constructor/destructor and possible types. */
-extern int folder_create __P ((folder_t *, const char *));
-extern void folder_destroy __P ((folder_t *));
-
-extern int folder_open __P ((folder_t, int flag));
-extern int folder_close __P ((folder_t));
-
-extern int folder_delete __P ((folder_t, const char *));
-extern int folder_rename __P ((folder_t, const char *, const char *));
-extern int folder_subscribe __P ((folder_t, const char *));
-extern int folder_unsubscribe __P ((folder_t, const char *));
-extern int folder_list __P ((folder_t, const char *, const char *,
- struct folder_list *));
-extern int folder_lsub __P ((folder_t, const char *, const char *,
- struct folder_list *));
-extern int folder_list_destroy __P ((struct folder_list *));
+extern int folder_create (folder_t *, const char *);
+extern void folder_destroy (folder_t *);
+
+extern int folder_open (folder_t, int flag);
+extern int folder_close (folder_t);
+
+extern int folder_delete (folder_t, const char *);
+extern int folder_rename (folder_t, const char *, const char *);
+extern int folder_subscribe (folder_t, const char *);
+extern int folder_unsubscribe (folder_t, const char *);
+extern int folder_list (folder_t, const char *, const char *,
+ struct folder_list *);
+extern int folder_lsub (folder_t, const char *, const char *,
+ struct folder_list *);
+extern int folder_list_destroy (struct folder_list *);
/* Stream settings. */
-extern int folder_get_stream __P ((folder_t, stream_t *));
-extern int folder_set_stream __P ((folder_t, stream_t));
+extern int folder_get_stream (folder_t, stream_t *);
+extern int folder_set_stream (folder_t, stream_t);
/* Notifications. */
-extern int folder_get_observable __P ((folder_t, observable_t *));
+extern int folder_get_observable (folder_t, observable_t *);
/* Debug. */
-extern int folder_has_debug __P ((folder_t folder));
-extern int folder_get_debug __P ((folder_t, mu_debug_t *));
-extern int folder_set_debug __P ((folder_t, mu_debug_t));
+extern int folder_has_debug (folder_t folder);
+extern int folder_get_debug (folder_t, mu_debug_t *);
+extern int folder_set_debug (folder_t, mu_debug_t);
/* Authentication. */
-extern int folder_get_authority __P ((folder_t, authority_t *));
-extern int folder_set_authority __P ((folder_t, authority_t));
+extern int folder_get_authority (folder_t, authority_t *);
+extern int folder_set_authority (folder_t, authority_t);
/* URL. */
-extern int folder_get_url __P ((folder_t, url_t *));
-extern int folder_set_url __P ((folder_t, url_t));
+extern int folder_get_url (folder_t, url_t *);
+extern int folder_set_url (folder_t, url_t);
/* FIXME: not implemented */
-extern int folder_decrement __P ((folder_t));
+extern int folder_decrement (folder_t);
#ifdef __cplusplus
diff --git a/include/mailutils/gsasl.h b/include/mailutils/gsasl.h
index d68859a..3432d91 100644
--- a/include/mailutils/gsasl.h
+++ b/include/mailutils/gsasl.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,11 +21,11 @@
#include <gsasl.h>
-int gsasl_stream_create __P((stream_t *stream, stream_t transport,
- Gsasl_session_ctx *ctx,
- int flags));
+int gsasl_stream_create (stream_t *stream, stream_t transport,
+ Gsasl_session_ctx *ctx,
+ int flags);
-void mu_gsasl_init_argp __P((void));
+void mu_gsasl_init_argp (void);
extern char *gsasl_cram_md5_pwd;
diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
index 368d838..fb2aa03 100644
--- a/include/mailutils/guile.h
+++ b/include/mailutils/guile.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -59,35 +59,35 @@ typedef struct
extern "C" {
#endif
-extern SCM scm_makenum __P((unsigned long val));
-extern void mu_set_variable __P((const char *name, SCM value));
-extern void mu_scm_init __P((void));
+extern SCM scm_makenum (unsigned long val);
+extern void mu_set_variable (const char *name, SCM value);
+extern void mu_scm_init (void);
-extern void mu_scm_mailbox_init __P((void));
-extern SCM mu_scm_mailbox_create __P((mailbox_t mbox));
-extern int mu_scm_is_mailbox __P((SCM scm));
+extern void mu_scm_mailbox_init (void);
+extern SCM mu_scm_mailbox_create (mailbox_t mbox);
+extern int mu_scm_is_mailbox (SCM scm);
-extern void mu_scm_message_init __P((void));
-extern SCM mu_scm_message_create __P((SCM owner, message_t msg));
-extern int mu_scm_is_message __P((SCM scm));
-extern const message_t mu_scm_message_get __P((SCM MESG));
+extern void mu_scm_message_init (void);
+extern SCM mu_scm_message_create (SCM owner, message_t msg);
+extern int mu_scm_is_message (SCM scm);
+extern const message_t mu_scm_message_get (SCM MESG);
-extern int mu_scm_is_body __P((SCM scm));
-extern void mu_scm_body_init __P((void));
-extern SCM mu_scm_body_create __P((SCM mesg, body_t body));
+extern int mu_scm_is_body (SCM scm);
+extern void mu_scm_body_init (void);
+extern SCM mu_scm_body_create (SCM mesg, body_t body);
-extern void mu_scm_address_init __P((void));
-extern void mu_scm_logger_init __P((void));
+extern void mu_scm_address_init (void);
+extern void mu_scm_logger_init (void);
-extern void mu_scm_port_init __P((void));
-extern SCM mu_port_make_from_stream __P((SCM msg, stream_t stream, long mode));
+extern void mu_scm_port_init (void);
+extern SCM mu_port_make_from_stream (SCM msg, stream_t stream, long mode);
-extern void mu_scm_mime_init __P((void));
-extern void mu_scm_message_add_owner __P((SCM MESG, SCM owner));
+extern void mu_scm_mime_init (void);
+extern void mu_scm_message_add_owner (SCM MESG, SCM owner);
-extern void mu_process_mailbox __P((int argc, char *argv[], guimb_param_t *param));
+extern void mu_process_mailbox (int argc, char *argv[], guimb_param_t *param);
-extern void mu_scm_mutil_init __P((void));
+extern void mu_scm_mutil_init (void);
#ifdef __cplusplus
}
diff --git a/include/mailutils/header.h b/include/mailutils/header.h
index 561de29..7d2c45f 100644
--- a/include/mailutils/header.h
+++ b/include/mailutils/header.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -72,78 +72,65 @@ extern "C" {
/* Mime support header attribute */
-extern int header_create __P ((header_t *, const char *, size_t, void *));
-extern void header_destroy __P ((header_t *, void *));
-extern void *header_get_owner __P ((header_t));
+extern int header_create (header_t *, const char *, size_t, void *);
+extern void header_destroy (header_t *, void *);
+extern void *header_get_owner (header_t);
-extern int header_is_modified __P ((header_t));
-extern int header_clear_modified __P ((header_t));
+extern int header_is_modified (header_t);
+extern int header_clear_modified (header_t);
/* Set and get field values by field name. */
-extern int header_set_value __P ((header_t, const char *, const char *, int));
-extern int header_get_value __P ((header_t, const char *, char *, size_t, size_t *));
-extern int header_aget_value __P ((header_t, const char *, char **));
+extern int header_set_value (header_t, const char *, const char *, int);
+extern int header_get_value (header_t, const char *, char *, size_t, size_t *);
+extern int header_aget_value (header_t, const char *, char **);
/* Get field values as an address_t. */
-extern int header_get_address __P ((header_t, const char *, address_t *));
+extern int header_get_address (header_t, const char *, address_t *);
/* Set and get field values by field index (1-based). */
-extern int header_get_field_count __P ((header_t, size_t *count));
-extern int header_get_field_value __P ((header_t, size_t index, char *, size_t, size_t *));
-extern int header_get_field_name __P ((header_t, size_t index, char *, size_t, size_t *));
-extern int header_aget_field_value __P ((header_t, size_t index, char **));
-extern int header_aget_field_name __P ((header_t, size_t index, char **));
-
-extern int header_get_value_unfold __P((header_t header, const char *name,
- char *buffer, size_t buflen,
- size_t *pn));
-extern int header_aget_value_unfold __P((header_t header, const char *name,
- char **pvalue));
-extern int header_get_field_value_unfold __P((header_t header, size_t num,
- char *buf, size_t buflen,
- size_t *nwritten));
-extern int header_aget_field_value_unfold __P((header_t header, size_t num,
- char **pvalue));
-
-extern int header_get_stream __P ((header_t, stream_t *));
-extern int header_set_stream __P ((header_t, stream_t, void *));
-
-extern int header_size __P ((header_t, size_t *));
-extern int header_lines __P ((header_t, size_t *));
-
-
-extern int header_set_set_value __P ((header_t,
- int (*_set_value) __PMT ((header_t,
- const char *,
- const char *,
- int)), void *));
-
-extern int header_set_get_value __P ((header_t,
- int (*_get_value) __PMT ((header_t,
- const char *,
- char *,
- size_t,
- size_t *)),
- void *));
-extern int header_set_get_fvalue __P ((header_t,
- int (*_get_value) __PMT ((header_t,
- const char *,
- char *,
- size_t,
- size_t *)),
- void *));
-
-extern int header_set_size __P ((header_t, int (*_size)
- __PMT ((header_t, size_t *)), void *));
-
-extern int header_set_lines __P ((header_t,
- int (*_lines) __PMT ((header_t,
- size_t *)), void *));
-
-extern int header_set_fill __P ((header_t,
- int (*_fill) __PMT ((header_t, char *,
- size_t, off_t,
- size_t *)), void *owner));
+extern int header_get_field_count (header_t, size_t *count);
+extern int header_get_field_value (header_t, size_t index, char *, size_t, size_t *);
+extern int header_get_field_name (header_t, size_t index, char *, size_t, size_t *);
+extern int header_aget_field_value (header_t, size_t index, char **);
+extern int header_aget_field_name (header_t, size_t index, char **);
+
+extern int header_get_value_unfold (header_t header, const char *name,
+ char *buffer, size_t buflen,
+ size_t *pn);
+extern int header_aget_value_unfold (header_t header, const char *name,
+ char **pvalue);
+extern int header_get_field_value_unfold (header_t header, size_t num,
+ char *buf, size_t buflen,
+ size_t *nwritten);
+extern int header_aget_field_value_unfold (header_t header, size_t num,
+ char **pvalue);
+
+extern int header_get_stream (header_t, stream_t *);
+extern int header_set_stream (header_t, stream_t, void *);
+
+extern int header_size (header_t, size_t *);
+extern int header_lines (header_t, size_t *);
+
+
+extern int header_set_set_value (header_t,
+ int (*_set_value) (header_t, const char *, const char *, int),
+ void *);
+
+extern int header_set_get_value (header_t,
+ int (*_get_value) (header_t, const char *, char *, size_t, size_t *),
+ void *);
+extern int header_set_get_fvalue (header_t,
+ int (*_get_value) (header_t, const char *, char *, size_t, size_t *),
+ void *);
+
+extern int header_set_size (header_t,
+ int (*_size) (header_t, size_t *), void *);
+
+extern int header_set_lines (header_t,
+ int (*_lines) (header_t, size_t *), void *);
+
+extern int header_set_fill (header_t,
+ int (*_fill) (header_t, char *, size_t, off_t, size_t *), void *owner);
#ifdef __cplusplus
diff --git a/include/mailutils/iterator.h b/include/mailutils/iterator.h
index 144a7e2..41a173a 100644
--- a/include/mailutils/iterator.h
+++ b/include/mailutils/iterator.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,13 +25,13 @@
extern "C" {
#endif
-extern int iterator_create __P ((iterator_t *, void *));
-extern int iterator_dup __P ((iterator_t *piterator, iterator_t orig));
-extern void iterator_destroy __P ((iterator_t *));
-extern int iterator_first __P ((iterator_t));
-extern int iterator_next __P ((iterator_t));
-extern int iterator_current __P ((iterator_t, void * const *pitem));
-extern int iterator_is_done __P ((iterator_t));
+extern int iterator_create (iterator_t *, void *);
+extern int iterator_dup (iterator_t *piterator, iterator_t orig);
+extern void iterator_destroy (iterator_t *);
+extern int iterator_first (iterator_t);
+extern int iterator_next (iterator_t);
+extern int iterator_current (iterator_t, void * const *pitem);
+extern int iterator_is_done (iterator_t);
extern int iterator_attach (iterator_t *root, iterator_t iterator);
extern int iterator_detach (iterator_t *root, iterator_t iterator);
diff --git a/include/mailutils/libsieve.h b/include/mailutils/libsieve.h
index f6031db..5933d0c 100644
--- a/include/mailutils/libsieve.h
+++ b/include/mailutils/libsieve.h
@@ -37,25 +37,25 @@ typedef struct {
size_t source_line;
} sieve_locus_t;
-typedef int (*sieve_handler_t) __PMT((sieve_machine_t mach,
- list_t args, list_t tags));
-typedef int (*sieve_printf_t) __PMT((void *data, const char *fmt, va_list ap));
-typedef int (*sieve_parse_error_t) __PMT((void *data,
- const char *filename, int lineno,
- const char *fmt, va_list ap));
-typedef void (*sieve_action_log_t) __PMT((void *data,
- const sieve_locus_t *locus,
- size_t msgno, message_t msg,
- const char *action,
- const char *fmt, va_list ap));
-
-typedef int (*sieve_relcmp_t) __PMT((int, int));
-typedef int (*sieve_relcmpn_t) __PMT((size_t, size_t));
-typedef int (*sieve_comparator_t) __PMT((const char *, const char *));
-typedef int (*sieve_retrieve_t) __PMT((void *item, void *data, int idx, char **pval));
-typedef void (*sieve_destructor_t) __PMT((void *data));
-typedef int (*sieve_tag_checker_t) __PMT((const char *name,
- list_t tags, list_t args));
+typedef int (*sieve_handler_t) (sieve_machine_t mach,
+ list_t args, list_t tags);
+typedef int (*sieve_printf_t) (void *data, const char *fmt, va_list ap);
+typedef int (*sieve_parse_error_t) (void *data,
+ const char *filename, int lineno,
+ const char *fmt, va_list ap);
+typedef void (*sieve_action_log_t) (void *data,
+ const sieve_locus_t *locus,
+ size_t msgno, message_t msg,
+ const char *action,
+ const char *fmt, va_list ap);
+
+typedef int (*sieve_relcmp_t) (int, int);
+typedef int (*sieve_relcmpn_t) (size_t, size_t);
+typedef int (*sieve_comparator_t) (const char *, const char *);
+typedef int (*sieve_retrieve_t) (void *item, void *data, int idx, char **pval);
+typedef void (*sieve_destructor_t) (void *data);
+typedef int (*sieve_tag_checker_t) (const char *name,
+ list_t tags, list_t args);
typedef enum {
SVT_VOID,
@@ -122,123 +122,119 @@ extern list_t sieve_include_path;
extern list_t sieve_library_path;
/* Memory allocation functions */
-void *sieve_alloc __P((size_t size));
-void *sieve_palloc __P((list_t *pool, size_t size));
-void *sieve_prealloc __P((list_t *pool, void *ptr, size_t size));
-void sieve_pfree __P((list_t *pool, void *ptr));
-char *sieve_pstrdup __P((list_t *pool, const char *str));
+void *sieve_alloc (size_t size);
+void *sieve_palloc (list_t *pool, size_t size);
+void *sieve_prealloc (list_t *pool, void *ptr, size_t size);
+void sieve_pfree (list_t *pool, void *ptr);
+char *sieve_pstrdup (list_t *pool, const char *str);
-void *sieve_malloc __P((sieve_machine_t mach, size_t size));
-char *sieve_mstrdup __P((sieve_machine_t mach, const char *str));
-void *sieve_mrealloc __P((sieve_machine_t mach, void *ptr, size_t size));
-void sieve_mfree __P((sieve_machine_t mach, void *ptr));
+void *sieve_malloc (sieve_machine_t mach, size_t size);
+char *sieve_mstrdup (sieve_machine_t mach, const char *str);
+void *sieve_mrealloc (sieve_machine_t mach, void *ptr, size_t size);
+void sieve_mfree (sieve_machine_t mach, void *ptr);
-sieve_value_t *sieve_value_create __P((sieve_data_type type, void *data));
-void sieve_slist_destroy __P((list_t *plist));
+sieve_value_t *sieve_value_create (sieve_data_type type, void *data);
+void sieve_slist_destroy (list_t *plist);
/* Symbol space functions */
-sieve_register_t *sieve_test_lookup __P((sieve_machine_t mach,
- const char *name));
-sieve_register_t *sieve_action_lookup __P((sieve_machine_t mach,
- const char *name));
-int sieve_register_test __P((sieve_machine_t mach,
- const char *name, sieve_handler_t handler,
- sieve_data_type *arg_types,
- sieve_tag_group_t *tags, int required));
-int sieve_register_action __P((sieve_machine_t mach,
- const char *name, sieve_handler_t handler,
- sieve_data_type *arg_types,
- sieve_tag_group_t *tags, int required));
-int sieve_register_comparator __P((sieve_machine_t mach,
- const char *name,
- int required,
- sieve_comparator_t is,
- sieve_comparator_t contains,
- sieve_comparator_t matches,
- sieve_comparator_t regex,
- sieve_comparator_t eq));
-int sieve_require_action __P((sieve_machine_t mach, const char *name));
-int sieve_require_test __P((sieve_machine_t mach, const char *name));
-int sieve_require_comparator __P((sieve_machine_t mach, const char *name));
-int sieve_require_relational __P((sieve_machine_t mach, const char *name));
+sieve_register_t *sieve_test_lookup (sieve_machine_t mach,
+ const char *name);
+sieve_register_t *sieve_action_lookup (sieve_machine_t mach,
+ const char *name);
+int sieve_register_test (sieve_machine_t mach,
+ const char *name, sieve_handler_t handler,
+ sieve_data_type *arg_types,
+ sieve_tag_group_t *tags, int required);
+int sieve_register_action (sieve_machine_t mach,
+ const char *name, sieve_handler_t handler,
+ sieve_data_type *arg_types,
+ sieve_tag_group_t *tags, int required);
+int sieve_register_comparator (sieve_machine_t mach, const char *name,
+ int required, sieve_comparator_t is,
+ sieve_comparator_t contains,
+ sieve_comparator_t matches,
+ sieve_comparator_t regex,
+ sieve_comparator_t eq);
+int sieve_require_action (sieve_machine_t mach, const char *name);
+int sieve_require_test (sieve_machine_t mach, const char *name);
+int sieve_require_comparator (sieve_machine_t mach, const char *name);
+int sieve_require_relational (sieve_machine_t mach, const char *name);
-sieve_comparator_t sieve_comparator_lookup __P((sieve_machine_t mach,
- const char *name,
- int matchtype));
-
-sieve_comparator_t sieve_get_comparator __P((sieve_machine_t mach,
- list_t tags));
-int sieve_str_to_relcmp __P((const char *str,
- sieve_relcmp_t *test, sieve_relcmpn_t *stest));
-sieve_relcmp_t sieve_get_relcmp __P((sieve_machine_t mach, list_t tags));
+sieve_comparator_t sieve_comparator_lookup (sieve_machine_t mach,
+ const char *name,
+ int matchtype);
+
+sieve_comparator_t sieve_get_comparator (sieve_machine_t mach, list_t tags);
+int sieve_str_to_relcmp (const char *str,
+ sieve_relcmp_t *test, sieve_relcmpn_t *stest);
+sieve_relcmp_t sieve_get_relcmp (sieve_machine_t mach, list_t tags);
-void sieve_require __P((list_t slist));
-int sieve_tag_lookup __P((list_t taglist, char *name, sieve_value_t **arg));
-int sieve_load_ext __P((sieve_machine_t mach, const char *name));
-int sieve_match_part_checker __P((const char *name, list_t tags, list_t args));
+void sieve_require (list_t slist);
+int sieve_tag_lookup (list_t taglist, char *name, sieve_value_t **arg);
+int sieve_load_ext (sieve_machine_t mach, const char *name);
+int sieve_match_part_checker (const char *name, list_t tags, list_t args);
/* Operations in value lists */
-sieve_value_t *sieve_value_get __P((list_t vlist, size_t index));
-int sieve_vlist_do __P((sieve_value_t *val, list_action_t *ac, void *data));
-int sieve_vlist_compare __P((sieve_value_t *a, sieve_value_t *b,
- sieve_comparator_t comp, sieve_relcmp_t test,
- sieve_retrieve_t ac,
- void *data,
- size_t *count));
+sieve_value_t *sieve_value_get (list_t vlist, size_t index);
+int sieve_vlist_do (sieve_value_t *val, list_action_t *ac, void *data);
+int sieve_vlist_compare (sieve_value_t *a, sieve_value_t *b,
+ sieve_comparator_t comp, sieve_relcmp_t test,
+ sieve_retrieve_t ac,
+ void *data,
+ size_t *count);
/* Functions to create and destroy sieve machine */
-int sieve_machine_init __P((sieve_machine_t *mach, void *data));
-void sieve_machine_destroy __P((sieve_machine_t *pmach));
-int sieve_machine_add_destructor __P((sieve_machine_t mach,
- sieve_destructor_t destr,
- void *ptr));
+int sieve_machine_init (sieve_machine_t *mach, void *data);
+void sieve_machine_destroy (sieve_machine_t *pmach);
+int sieve_machine_add_destructor (sieve_machine_t mach,
+ sieve_destructor_t destr,
+ void *ptr);
/* Functions for accessing sieve machine internals */
-void *sieve_get_data __P((sieve_machine_t mach));
-message_t sieve_get_message __P((sieve_machine_t mach));
-size_t sieve_get_message_num __P((sieve_machine_t mach));
-int sieve_get_debug_level __P((sieve_machine_t mach));
-ticket_t sieve_get_ticket __P((sieve_machine_t mach));
-mailer_t sieve_get_mailer __P((sieve_machine_t mach));
-int sieve_get_locus __P((sieve_machine_t mach, sieve_locus_t *));
-char *sieve_get_daemon_email __P((sieve_machine_t mach));
-const char *sieve_get_identifier __P((sieve_machine_t mach));
+void *sieve_get_data (sieve_machine_t mach);
+message_t sieve_get_message (sieve_machine_t mach);
+size_t sieve_get_message_num (sieve_machine_t mach);
+int sieve_get_debug_level (sieve_machine_t mach);
+ticket_t sieve_get_ticket (sieve_machine_t mach);
+mailer_t sieve_get_mailer (sieve_machine_t mach);
+int sieve_get_locus (sieve_machine_t mach, sieve_locus_t *);
+char *sieve_get_daemon_email (sieve_machine_t mach);
+const char *sieve_get_identifier (sieve_machine_t mach);
-void sieve_set_error __P((sieve_machine_t mach, sieve_printf_t error_printer));
-void sieve_set_parse_error __P((sieve_machine_t mach, sieve_parse_error_t p));
-void sieve_set_debug __P((sieve_machine_t mach, sieve_printf_t debug));
-void sieve_set_debug_level __P((sieve_machine_t mach, mu_debug_t dbg,
- int level));
-void sieve_set_logger __P((sieve_machine_t mach, sieve_action_log_t logger));
-void sieve_set_ticket __P((sieve_machine_t mach, ticket_t ticket));
-void sieve_set_mailer __P((sieve_machine_t mach, mailer_t mailer));
-void sieve_set_daemon_email __P((sieve_machine_t mach, const char *email));
-
-int sieve_get_message_sender __P((message_t msg, char **ptext));
+void sieve_set_error (sieve_machine_t mach, sieve_printf_t error_printer);
+void sieve_set_parse_error (sieve_machine_t mach, sieve_parse_error_t p);
+void sieve_set_debug (sieve_machine_t mach, sieve_printf_t debug);
+void sieve_set_debug_level (sieve_machine_t mach, mu_debug_t dbg, int level);
+void sieve_set_logger (sieve_machine_t mach, sieve_action_log_t logger);
+void sieve_set_ticket (sieve_machine_t mach, ticket_t ticket);
+void sieve_set_mailer (sieve_machine_t mach, mailer_t mailer);
+void sieve_set_daemon_email (sieve_machine_t mach, const char *email);
+
+int sieve_get_message_sender (message_t msg, char **ptext);
/* Logging and diagnostic functions */
-void sieve_error __P((sieve_machine_t mach, const char *fmt, ...));
-void sieve_debug __P((sieve_machine_t mach, const char *fmt, ...));
-void sieve_log_action __P((sieve_machine_t mach, const char *action,
- const char *fmt, ...));
-void sieve_abort __P((sieve_machine_t mach));
-int stream_printf __P((stream_t stream, size_t *off, const char *fmt, ...));
-void sieve_arg_error __P((sieve_machine_t mach, int n));
+void sieve_error (sieve_machine_t mach, const char *fmt, ...);
+void sieve_debug (sieve_machine_t mach, const char *fmt, ...);
+void sieve_log_action (sieve_machine_t mach, const char *action,
+ const char *fmt, ...);
+void sieve_abort (sieve_machine_t mach);
+int stream_printf (stream_t stream, size_t *off, const char *fmt, ...);
+void sieve_arg_error (sieve_machine_t mach, int n);
-int sieve_is_dry_run __P((sieve_machine_t mach));
-const char *sieve_type_str __P((sieve_data_type type));
+int sieve_is_dry_run (sieve_machine_t mach);
+const char *sieve_type_str (sieve_data_type type);
/* Principal entry points */
-int sieve_compile __P((sieve_machine_t mach, const char *name));
-int sieve_mailbox __P((sieve_machine_t mach, mailbox_t mbox));
-int sieve_message __P((sieve_machine_t mach, message_t message));
-int sieve_disass __P((sieve_machine_t mach));
+int sieve_compile (sieve_machine_t mach, const char *name);
+int sieve_mailbox (sieve_machine_t mach, mailbox_t mbox);
+int sieve_message (sieve_machine_t mach, message_t message);
+int sieve_disass (sieve_machine_t mach);
/* Command line handling */
-extern void sieve_argp_init __P((void));
+extern void sieve_argp_init (void);
#ifdef __cplusplus
}
diff --git a/include/mailutils/list.h b/include/mailutils/list.h
index 47b8b17..9ea44f5 100644
--- a/include/mailutils/list.h
+++ b/include/mailutils/list.h
@@ -25,30 +25,30 @@
extern "C" {
#endif
-extern int list_create __P ((list_t *));
-extern void list_destroy __P ((list_t *));
-extern int list_append __P ((list_t, void *item));
-extern int list_prepend __P ((list_t, void *item));
-extern int list_insert __P ((list_t list, void *item, void *new_item,
- int insert_before));
-extern int list_is_empty __P ((list_t));
-extern int list_count __P ((list_t, size_t *pcount));
-extern int list_remove __P ((list_t, void *item));
-extern int list_replace __P ((list_t list, void *old_item, void *new_item));
-extern int list_get __P ((list_t, size_t _index, void **pitem));
-extern int list_to_array __P ((list_t list, void **array, size_t count, size_t *pcount));
-extern int list_locate __P ((list_t list, void *item, void **ret_item));
-extern int list_get_iterator __P ((list_t, iterator_t *));
-
-typedef int list_action_t __PMT ((void* item, void* cbdata));
+extern int list_create (list_t *);
+extern void list_destroy (list_t *);
+extern int list_append (list_t, void *item);
+extern int list_prepend (list_t, void *item);
+extern int list_insert (list_t list, void *item, void *new_item,
+ int insert_before);
+extern int list_is_empty (list_t);
+extern int list_count (list_t, size_t *pcount);
+extern int list_remove (list_t, void *item);
+extern int list_replace (list_t list, void *old_item, void *new_item);
+extern int list_get (list_t, size_t _index, void **pitem);
+extern int list_to_array (list_t list, void **array, size_t count, size_t *pcount);
+extern int list_locate (list_t list, void *item, void **ret_item);
+extern int list_get_iterator (list_t, iterator_t *);
+
+typedef int list_action_t (void* item, void* cbdata);
-extern int list_do __P ((list_t list, list_action_t * action, void *cbdata));
+extern int list_do (list_t list, list_action_t * action, void *cbdata);
-typedef int (*list_comparator_t) __PMT((const void*, const void*));
+typedef int (*list_comparator_t) (const void*, const void*);
-extern list_comparator_t list_set_comparator __P((list_t, list_comparator_t));
+extern list_comparator_t list_set_comparator (list_t, list_comparator_t);
-extern int list_set_destroy_item __P ((list_t list, void (*destoy_item) __PMT((void *))));
+extern int list_set_destroy_item (list_t list, void (*destoy_item) (void *));
#ifdef __cplusplus
diff --git a/include/mailutils/locker.h b/include/mailutils/locker.h
index 9e7efaa..89b2db6 100644
--- a/include/mailutils/locker.h
+++ b/include/mailutils/locker.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -80,34 +80,34 @@ enum mu_locker_set_mode
* to MU_LOCKER_DEFAULT). A flags of 0 resets the flags back to the
* the default.
*/
-extern int locker_set_default_flags __P((int flags, enum mu_locker_set_mode mode));
-extern void locker_set_default_retry_timeout __P((time_t to));
-extern void locker_set_default_retry_count __P((size_t n));
-extern void locker_set_default_expire_timeout __P((time_t t));
-extern void locker_set_default_external_program __P((char *path));
+extern int locker_set_default_flags (int flags, enum mu_locker_set_mode mode);
+extern void locker_set_default_retry_timeout (time_t to);
+extern void locker_set_default_retry_count (size_t n);
+extern void locker_set_default_expire_timeout (time_t t);
+extern void locker_set_default_external_program (char *path);
/* A flags of 0 means that the default will be used. */
-extern int locker_create __P ((locker_t *, const char *filename, int flags));
-extern void locker_destroy __P ((locker_t *));
+extern int locker_create (locker_t *, const char *filename, int flags);
+extern void locker_destroy (locker_t *);
/* Time is measured in seconds. */
-extern int locker_set_flags __P ((locker_t, int));
-extern int locker_set_expire_time __P ((locker_t, int));
-extern int locker_set_retries __P ((locker_t, int));
-extern int locker_set_retry_sleep __P ((locker_t, int));
-extern int locker_set_external __P ((locker_t, const char* program));
-
-extern int locker_get_flags __P ((locker_t, int*));
-extern int locker_get_expire_time __P ((locker_t, int*));
-extern int locker_get_retries __P ((locker_t, int*));
-extern int locker_get_retry_sleep __P ((locker_t, int*));
-extern int locker_get_external __P ((locker_t, char**));
-
-extern int locker_lock __P ((locker_t));
-extern int locker_touchlock __P ((locker_t));
-extern int locker_unlock __P ((locker_t));
-extern int locker_remove_lock __P ((locker_t));
+extern int locker_set_flags (locker_t, int);
+extern int locker_set_expire_time (locker_t, int);
+extern int locker_set_retries (locker_t, int);
+extern int locker_set_retry_sleep (locker_t, int);
+extern int locker_set_external (locker_t, const char* program);
+
+extern int locker_get_flags (locker_t, int*);
+extern int locker_get_expire_time (locker_t, int*);
+extern int locker_get_retries (locker_t, int*);
+extern int locker_get_retry_sleep (locker_t, int*);
+extern int locker_get_external (locker_t, char**);
+
+extern int locker_lock (locker_t);
+extern int locker_touchlock (locker_t);
+extern int locker_unlock (locker_t);
+extern int locker_remove_lock (locker_t);
#ifdef __cplusplus
}
diff --git a/include/mailutils/mailbox.h b/include/mailutils/mailbox.h
index bda0d7a..244accd 100644
--- a/include/mailutils/mailbox.h
+++ b/include/mailutils/mailbox.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,65 +27,65 @@
extern "C" {
#endif
-int mu_set_mail_directory __P ((const char *p));
-void mu_set_folder_directory __P ((const char *p));
-const char *mu_mail_directory __P ((void));
-const char *mu_folder_directory __P ((void));
-int mu_construct_user_mailbox_url __P ((char **pout, const char *name));
+int mu_set_mail_directory (const char *p);
+void mu_set_folder_directory (const char *p);
+const char *mu_mail_directory (void);
+const char *mu_folder_directory (void);
+int mu_construct_user_mailbox_url (char **pout, const char *name);
/* Constructor/destructor and possible types. */
-extern int mailbox_create __P ((mailbox_t *, const char *));
-extern void mailbox_destroy __P ((mailbox_t *));
-extern int mailbox_create_default __P ((mailbox_t *, const char *));
-
-extern int mailbox_open __P ((mailbox_t, int flag));
-extern int mailbox_close __P ((mailbox_t));
-extern int mailbox_flush __P ((mailbox_t mbox, int expunge));
-extern int mailbox_get_folder __P ((mailbox_t, folder_t *));
-extern int mailbox_set_folder __P ((mailbox_t, folder_t));
-extern int mailbox_uidvalidity __P ((mailbox_t, unsigned long *));
-extern int mailbox_uidnext __P ((mailbox_t, size_t *));
+extern int mailbox_create (mailbox_t *, const char *);
+extern void mailbox_destroy (mailbox_t *);
+extern int mailbox_create_default (mailbox_t *, const char *);
+
+extern int mailbox_open (mailbox_t, int flag);
+extern int mailbox_close (mailbox_t);
+extern int mailbox_flush (mailbox_t mbox, int expunge);
+extern int mailbox_get_folder (mailbox_t, folder_t *);
+extern int mailbox_set_folder (mailbox_t, folder_t);
+extern int mailbox_uidvalidity (mailbox_t, unsigned long *);
+extern int mailbox_uidnext (mailbox_t, size_t *);
/* Messages. */
-extern int mailbox_get_message __P ((mailbox_t, size_t msgno, message_t *));
-extern int mailbox_append_message __P ((mailbox_t, message_t));
-extern int mailbox_messages_count __P ((mailbox_t, size_t *));
-extern int mailbox_messages_recent __P ((mailbox_t, size_t *));
-extern int mailbox_message_unseen __P ((mailbox_t, size_t *));
-extern int mailbox_expunge __P ((mailbox_t));
-extern int mailbox_save_attributes __P ((mailbox_t));
+extern int mailbox_get_message (mailbox_t, size_t msgno, message_t *);
+extern int mailbox_append_message (mailbox_t, message_t);
+extern int mailbox_messages_count (mailbox_t, size_t *);
+extern int mailbox_messages_recent (mailbox_t, size_t *);
+extern int mailbox_message_unseen (mailbox_t, size_t *);
+extern int mailbox_expunge (mailbox_t);
+extern int mailbox_save_attributes (mailbox_t);
/* Update and scanning. */
-extern int mailbox_get_size __P ((mailbox_t, off_t *size));
-extern int mailbox_is_updated __P ((mailbox_t));
-extern int mailbox_scan __P ((mailbox_t, size_t no, size_t *count));
+extern int mailbox_get_size (mailbox_t, off_t *size);
+extern int mailbox_is_updated (mailbox_t);
+extern int mailbox_scan (mailbox_t, size_t no, size_t *count);
/* Mailbox Stream. */
-extern int mailbox_set_stream __P ((mailbox_t, stream_t));
-extern int mailbox_get_stream __P ((mailbox_t, stream_t *));
+extern int mailbox_set_stream (mailbox_t, stream_t);
+extern int mailbox_get_stream (mailbox_t, stream_t *);
/* Lock settings. */
-extern int mailbox_get_locker __P ((mailbox_t, locker_t *));
-extern int mailbox_set_locker __P ((mailbox_t, locker_t));
+extern int mailbox_get_locker (mailbox_t, locker_t *);
+extern int mailbox_set_locker (mailbox_t, locker_t);
/* Property. */
-extern int mailbox_get_flags __P ((mailbox_t, int *));
-extern int mailbox_get_property __P ((mailbox_t, property_t *));
+extern int mailbox_get_flags (mailbox_t, int *);
+extern int mailbox_get_property (mailbox_t, property_t *);
/* URL. */
-extern int mailbox_get_url __P ((mailbox_t, url_t *));
+extern int mailbox_get_url (mailbox_t, url_t *);
/* For any debuging */
-extern int mailbox_has_debug __P ((mailbox_t));
-extern int mailbox_get_debug __P ((mailbox_t, mu_debug_t *));
-extern int mailbox_set_debug __P ((mailbox_t, mu_debug_t));
+extern int mailbox_has_debug (mailbox_t);
+extern int mailbox_get_debug (mailbox_t, mu_debug_t *);
+extern int mailbox_set_debug (mailbox_t, mu_debug_t);
/* Events. */
-extern int mailbox_get_observable __P ((mailbox_t, observable_t *));
+extern int mailbox_get_observable (mailbox_t, observable_t *);
/* Locking */
-extern int mailbox_lock __P ((mailbox_t mbox));
-extern int mailbox_unlock __P ((mailbox_t mbox));
+extern int mailbox_lock (mailbox_t mbox);
+extern int mailbox_unlock (mailbox_t mbox);
#ifdef __cplusplus
}
diff --git a/include/mailutils/mailcap.h b/include/mailutils/mailcap.h
index 9819ce7..15a1acb 100644
--- a/include/mailutils/mailcap.h
+++ b/include/mailutils/mailcap.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,90 +29,90 @@ extern "C" {
#endif
/* Create a mailcap from stream. */
-int mu_mailcap_create __P((mu_mailcap_t * mailcap, stream_t stream));
+int mu_mailcap_create (mu_mailcap_t * mailcap, stream_t stream);
/* Destroy mailcap object. */
-void mu_mailcap_destroy __P((mu_mailcap_t * mailcap));
+void mu_mailcap_destroy (mu_mailcap_t * mailcap);
/* Return the number of entries in the mailcap file. */
-int mu_mailcap_entries_count __P((mu_mailcap_t mailcap, size_t *pno));
+int mu_mailcap_entries_count (mu_mailcap_t mailcap, size_t *pno);
/* Return the mailcap record number, no, of the mailcap file . */
-int mu_mailcap_get_entry __P((mu_mailcap_t mailcap, size_t no,
- mu_mailcap_entry_t *entry));
+int mu_mailcap_get_entry (mu_mailcap_t mailcap, size_t no,
+ mu_mailcap_entry_t *entry);
/* Return the number of fields in a mailcap entry */
-int mu_mailcap_entry_fields_count __P((mu_mailcap_entry_t entry,
- size_t *pcount));
+int mu_mailcap_entry_fields_count (mu_mailcap_entry_t entry,
+ size_t *pcount);
/* Save in buffer[] the content-type of the record. */
-int mu_mailcap_entry_get_typefield __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_typefield (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Save in buffer[] the view command of the record. */
-int mu_mailcap_entry_get_viewcommand __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_viewcommand (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Save in buffer[] the field number no the record . */
-int mu_mailcap_entry_get_field __P((mu_mailcap_entry_t entry, size_t no,
- char *buffer, size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_field (mu_mailcap_entry_t entry, size_t no,
+ char *buffer, size_t buflen, size_t *pn);
/* Save in buffer the value of a key:
- * mu_mailcap_entry_get_value __P((entry, "compose", buffer, buflen, pn));
+ * mu_mailcap_entry_get_value (entry, "compose", buffer, buflen, pn);
* i.e compose="lynx %s" --> "lynx %s" will be saved in the buffer without
* the quotes. */
-int mu_mailcap_entry_get_value __P((mu_mailcap_entry_t entry, const char *key,
- char *buffer, size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_value (mu_mailcap_entry_t entry, const char *key,
+ char *buffer, size_t buflen, size_t *pn);
/* Helper function saving in buffer, the argument of "compose" field. */
-int mu_mailcap_entry_get_compose __P((mu_mailcap_entry_t entry, char *buffer,
- size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_compose (mu_mailcap_entry_t entry, char *buffer,
+ size_t buflen, size_t *pn);
/* Helper function saving in buffer, the argument of "composetyped" field. */
-int mu_mailcap_entry_get_composetyped __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_composetyped (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Helper function saving in buffer, the argument of "edit" field. */
-int mu_mailcap_entry_get_edit __P((mu_mailcap_entry_t entry, char *buffer,
- size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_edit (mu_mailcap_entry_t entry, char *buffer,
+ size_t buflen, size_t *pn);
/* Helper function saving in buffer, the argument of "textualnewlines" field. */
-int mu_mailcap_entry_get_textualnewlines __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_textualnewlines (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Helper function saving in buffer, the argument of "test" field. */
-int mu_mailcap_entry_get_test __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_test (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen, size_t *pn);
/* Helper function saving in buffer, the argument of "x11-bitmap" field. */
-int mu_mailcap_entry_get_x11bitmap __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_x11bitmap (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen, size_t *pn);
/* Helper function saving in buffer, the argument of "description" field. */
-int mu_mailcap_entry_get_description __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_description (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Helper function saving in buffer, the argument of "nametemplate" field. */
-int mu_mailcap_entry_get_nametemplate __P((mu_mailcap_entry_t entry,
- char *buffer, size_t buflen,
- size_t *pn));
+int mu_mailcap_entry_get_nametemplate (mu_mailcap_entry_t entry,
+ char *buffer, size_t buflen,
+ size_t *pn);
/* Helper function saving in buffer, the argument of "notes" field. */
-int mu_mailcap_entry_get_notes __P((mu_mailcap_entry_t entry, char *buffer,
- size_t buflen, size_t *pn));
+int mu_mailcap_entry_get_notes (mu_mailcap_entry_t entry, char *buffer,
+ size_t buflen, size_t *pn);
/* Helper function. Returns *on != 0 if the flag "needsterminal" is in the
record. */
-int mu_mailcap_entry_needsterminal __P((mu_mailcap_entry_t entry, int *on));
+int mu_mailcap_entry_needsterminal (mu_mailcap_entry_t entry, int *on);
/* Helper function. Returns *on != 0 if the flag "copiousoutput" is in the
record. */
-int mu_mailcap_entry_copiousoutput __P((mu_mailcap_entry_t entry, int *on));
+int mu_mailcap_entry_copiousoutput (mu_mailcap_entry_t entry, int *on);
#ifdef __cplusplus
}
diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h
index 2a24873..6a794ec 100644
--- a/include/mailutils/mailer.h
+++ b/include/mailutils/mailer.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,33 +29,33 @@ extern "C" {
#define MAILER_FLAG_DEBUG_DATA 0x0001
/* A url of NULL will cause the default to be used. */
-extern int mailer_create __P ((mailer_t *, const char *url));
-extern void mailer_destroy __P ((mailer_t *));
-extern int mailer_open __P ((mailer_t, int flags));
-extern int mailer_close __P ((mailer_t));
-extern int mailer_send_message __P ((mailer_t, message_t, address_t from, address_t to));
+extern int mailer_create (mailer_t *, const char *url);
+extern void mailer_destroy (mailer_t *);
+extern int mailer_open (mailer_t, int flags);
+extern int mailer_close (mailer_t);
+extern int mailer_send_message (mailer_t, message_t, address_t from, address_t to);
/* Called to set or get the default mailer url. */
-extern int mailer_set_url_default __P ((const char* url));
-extern int mailer_get_url_default __P ((const char** url));
+extern int mailer_set_url_default (const char* url);
+extern int mailer_get_url_default (const char** url);
/* Accessor functions. */
-extern int mailer_get_property __P ((mailer_t, property_t *));
-extern int mailer_get_stream __P ((mailer_t, stream_t *));
-extern int mailer_set_stream __P ((mailer_t, stream_t));
-extern int mailer_get_debug __P ((mailer_t, mu_debug_t *));
-extern int mailer_set_debug __P ((mailer_t, mu_debug_t));
-extern int mailer_get_observable __P ((mailer_t, observable_t *));
-extern int mailer_get_url __P ((mailer_t, url_t *));
+extern int mailer_get_property (mailer_t, property_t *);
+extern int mailer_get_stream (mailer_t, stream_t *);
+extern int mailer_set_stream (mailer_t, stream_t);
+extern int mailer_get_debug (mailer_t, mu_debug_t *);
+extern int mailer_set_debug (mailer_t, mu_debug_t);
+extern int mailer_get_observable (mailer_t, observable_t *);
+extern int mailer_get_url (mailer_t, url_t *);
/* Utility functions, primarily for use of implementing concrete mailers. */
/* A valid from address_t contains a single address that has a qualified
email address. */
-extern int mailer_check_from __P((address_t from));
+extern int mailer_check_from (address_t from);
/* A valid to address_t contains 1 or more addresses, that are
qualified email addresses. */
-extern int mailer_check_to __P((address_t to));
+extern int mailer_check_to (address_t to);
#ifdef __cplusplus
}
diff --git a/include/mailutils/message.h b/include/mailutils/message.h
index 2a66eb6..1c04bdf 100644
--- a/include/mailutils/message.h
+++ b/include/mailutils/message.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,87 +28,89 @@ extern "C" {
/* A message is considered to be a container for:
header_t, body_t, and its attribute_t. */
-extern int message_create __P ((message_t *, void *owner));
-extern void message_destroy __P ((message_t *, void *owner));
+extern int message_create (message_t *, void *owner);
+extern void message_destroy (message_t *, void *owner);
-extern int message_create_copy __P ((message_t *to, message_t from));
+extern int message_create_copy (message_t *to, message_t from);
-extern void * message_get_owner __P ((message_t));
-extern int message_is_modified __P ((message_t));
-extern int message_clear_modified __P ((message_t));
-extern int message_get_mailbox __P ((message_t, mailbox_t *));
-extern int message_set_mailbox __P ((message_t, mailbox_t, void *));
+extern void * message_get_owner (message_t);
+extern int message_is_modified (message_t);
+extern int message_clear_modified (message_t);
+extern int message_get_mailbox (message_t, mailbox_t *);
+extern int message_set_mailbox (message_t, mailbox_t, void *);
-extern int message_ref __P ((message_t));
+extern int message_ref (message_t);
#define message_unref(msg) message_destroy (&msg, NULL)
-extern int message_get_envelope __P ((message_t, envelope_t *));
-extern int message_set_envelope __P ((message_t, envelope_t, void *));
+extern int message_get_envelope (message_t, envelope_t *);
+extern int message_set_envelope (message_t, envelope_t, void *);
-extern int message_get_header __P ((message_t, header_t *));
-extern int message_set_header __P ((message_t, header_t, void *));
+extern int message_get_header (message_t, header_t *);
+extern int message_set_header (message_t, header_t, void *);
-extern int message_get_body __P ((message_t, body_t *));
-extern int message_set_body __P ((message_t, body_t, void *));
+extern int message_get_body (message_t, body_t *);
+extern int message_set_body (message_t, body_t, void *);
-extern int message_get_stream __P ((message_t, stream_t *));
-extern int message_set_stream __P ((message_t, stream_t, void *));
+extern int message_get_stream (message_t, stream_t *);
+extern int message_set_stream (message_t, stream_t, void *);
-extern int message_get_attribute __P ((message_t, attribute_t *));
-extern int message_set_attribute __P ((message_t, attribute_t, void *));
+extern int message_get_attribute (message_t, attribute_t *);
+extern int message_set_attribute (message_t, attribute_t, void *);
-extern int message_get_observable __P ((message_t, observable_t *));
+extern int message_get_observable (message_t, observable_t *);
-extern int message_is_multipart __P ((message_t, int *));
-extern int message_set_is_multipart __P ((message_t, int (*_is_multipart)
- __PMT ((message_t, int *)), void *));
+extern int message_is_multipart (message_t, int *);
+extern int message_set_is_multipart (message_t,
+ int (*_is_multipart) (message_t, int *),
+ void *);
-extern int message_size __P ((message_t, size_t *));
-extern int message_set_size __P ((message_t, int (*_size)
- __PMT ((message_t, size_t *)),
- void *owner));
+extern int message_size (message_t, size_t *);
+extern int message_set_size (message_t,
+ int (*_size) (message_t, size_t *),
+ void *owner);
-extern int message_lines __P ((message_t, size_t *));
-extern int message_set_lines __P ((message_t, int (*_lines)
- __PMT ((message_t, size_t *)),
- void *owner));
+extern int message_lines (message_t, size_t *);
+extern int message_set_lines (message_t,
+ int (*_lines) (message_t, size_t *),
+ void *owner);
-extern int message_get_num_parts __P ((message_t, size_t *nparts));
-extern int message_set_get_num_parts __P ((message_t, int (*_get_num_parts)
- __PMT ((message_t, size_t *)),
- void *owner));
+extern int message_get_num_parts (message_t, size_t *nparts);
+extern int message_set_get_num_parts (message_t,
+ int (*_get_num_parts) (message_t,
+ size_t *),
+ void *owner);
-extern int message_get_part __P ((message_t, size_t, message_t *));
-extern int message_set_get_part __P ((message_t, int (*_get_part)
- __PMT ((message_t, size_t,
- message_t *)), void *owner));
+extern int message_get_part (message_t, size_t, message_t *);
+extern int message_set_get_part (message_t,
+ int (*_get_part) (message_t, size_t,
+ message_t *),
+ void *owner);
-extern int message_get_uidl __P ((message_t, char *, size_t, size_t *));
-extern int message_set_uidl __P ((message_t, int (*_get_uidl)
- __PMT ((message_t, char *, size_t,
- size_t *)), void *owner));
-extern int message_get_uid __P ((message_t, size_t *));
-extern int message_set_uid __P ((message_t, int (*_get_uid)
- __PMT ((message_t, size_t *)),
- void *owner));
+extern int message_get_uidl (message_t, char *, size_t, size_t *);
+extern int message_set_uidl (message_t,
+ int (*_get_uidl) (message_t, char *,
+ size_t, size_t *),
+ void *owner);
+extern int message_get_uid (message_t, size_t *);
+extern int message_set_uid (message_t,
+ int (*_get_uid) (message_t, size_t *),
+ void *owner);
/* misc functions */
-extern int message_create_attachment __P ((const char *content_type,
- const char *encoding,
- const char *filename,
- message_t *newmsg));
-extern int message_save_attachment __P ((message_t msg,
- const char *filename, void **data));
-extern int message_encapsulate __P ((message_t msg, message_t *newmsg,
- void **data));
-extern int message_unencapsulate __P ((message_t msg, message_t *newmsg,
- void **data));
-
-extern int message_get_attachment_name __P ((message_t, char *name, size_t bufsz, size_t* sz));
-extern int message_aget_attachment_name __P ((message_t, char **name));
-
-extern int message_save_to_mailbox __P ((message_t msg, ticket_t ticket,
- mu_debug_t debug, const char *toname));
+extern int message_create_attachment (const char *content_type,
+ const char *encoding,
+ const char *filename,
+ message_t *newmsg);
+extern int message_save_attachment (message_t msg,
+ const char *filename, void **data);
+extern int message_encapsulate (message_t msg, message_t *newmsg, void **data);
+extern int message_unencapsulate (message_t msg, message_t *newmsg, void **data);
+
+extern int message_get_attachment_name (message_t, char *name, size_t bufsz, size_t* sz);
+extern int message_aget_attachment_name (message_t, char **name);
+
+extern int message_save_to_mailbox (message_t msg, ticket_t ticket,
+ mu_debug_t debug, const char *toname);
#ifdef __cplusplus
diff --git a/include/mailutils/mime.h b/include/mailutils/mime.h
index 9f9bb17..0ce9d41 100644
--- a/include/mailutils/mime.h
+++ b/include/mailutils/mime.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -31,22 +31,22 @@
extern "C" {
#endif
-int mime_create __P ((mime_t *pmime, message_t msg, int flags));
-void mime_destroy __P ((mime_t *pmime));
-int mime_is_multipart __P ((mime_t mime));
-int mime_get_num_parts __P ((mime_t mime, size_t *nparts));
+int mime_create (mime_t *pmime, message_t msg, int flags);
+void mime_destroy (mime_t *pmime);
+int mime_is_multipart (mime_t mime);
+int mime_get_num_parts (mime_t mime, size_t *nparts);
-int mime_get_part __P ((mime_t mime, size_t part, message_t *msg));
+int mime_get_part (mime_t mime, size_t part, message_t *msg);
-int mime_add_part __P ((mime_t mime, message_t msg));
+int mime_add_part (mime_t mime, message_t msg);
-int mime_get_message __P ((mime_t mime, message_t *msg));
+int mime_get_message (mime_t mime, message_t *msg);
-int rfc2047_decode __P((const char *tocode, const char *fromstr,
- char **ptostr));
+int rfc2047_decode (const char *tocode, const char *fromstr,
+ char **ptostr);
-int rfc2047_encode __P((const char *charset, const char *encoding,
- const char *text, char **result));
+int rfc2047_encode (const char *charset, const char *encoding,
+ const char *text, char **result);
#ifdef __cplusplus
}
diff --git a/include/mailutils/monitor.h b/include/mailutils/monitor.h
index d5d553a..2414478 100644
--- a/include/mailutils/monitor.h
+++ b/include/mailutils/monitor.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -38,15 +38,15 @@ typedef struct _monitor *monitor_t;
#define MU_MONITOR_INITIALIZER {0, 0, 0, 0}
-extern int monitor_create __P ((monitor_t *, int flags, void *owner));
-extern void monitor_destroy __P ((monitor_t *, void *owner));
-extern void *monitor_get_owner __P ((monitor_t));
+extern int monitor_create (monitor_t *, int flags, void *owner);
+extern void monitor_destroy (monitor_t *, void *owner);
+extern void *monitor_get_owner (monitor_t);
-extern int monitor_rdlock __P ((monitor_t));
-extern int monitor_wrlock __P ((monitor_t));
-extern int monitor_unlock __P ((monitor_t));
-extern int monitor_wait __P ((monitor_t));
-extern int monitor_notify __P ((monitor_t));
+extern int monitor_rdlock (monitor_t);
+extern int monitor_wrlock (monitor_t);
+extern int monitor_unlock (monitor_t);
+extern int monitor_wait (monitor_t);
+extern int monitor_notify (monitor_t);
#ifdef __cplusplus
}
diff --git a/include/mailutils/mu_auth.h b/include/mailutils/mu_auth.h
index b284576..cc5e6f3 100644
--- a/include/mailutils/mu_auth.h
+++ b/include/mailutils/mu_auth.h
@@ -35,10 +35,10 @@ struct mu_auth_data {
int change_uid;
};
-typedef int (*mu_auth_fp) __P((struct mu_auth_data **data,
- const void *key,
- void *func_data,
- void *call_data));
+typedef int (*mu_auth_fp) (struct mu_auth_data **data,
+ const void *key,
+ void *func_data,
+ void *call_data);
struct mu_auth_module {
char *name;
@@ -51,41 +51,41 @@ struct mu_auth_module {
void *auth_by_uid_data;
};
-extern int mu_auth_runlist __P((list_t flist,
- struct mu_auth_data **return_data,
- const void *key, void *data));
+extern int mu_auth_runlist (list_t flist,
+ struct mu_auth_data **return_data,
+ const void *key, void *data);
extern struct mu_auth_data *
-mu_get_auth_by_name __P ((const char *username));
+mu_get_auth_by_name (const char *username);
extern struct mu_auth_data *
-mu_get_auth_by_uid __P((uid_t uid));
+mu_get_auth_by_uid (uid_t uid);
extern int
-mu_authenticate __P((struct mu_auth_data *auth_data, char *pass));
-
-extern int mu_auth_nosupport __P((struct mu_auth_data **return_data,
- const void *key,
- void *func_data,
- void *call_data));
-
-
-extern void mu_auth_register_module __P((struct mu_auth_module *mod));
-
-extern void mu_authorization_add_module_list __P((const char *modlist));
-extern void mu_authentication_add_module_list __P((const char *modlist));
-
-extern void mu_auth_init __P((void));
-extern int mu_auth_data_alloc __P((struct mu_auth_data **ptr,
- const char *name,
- const char *passwd,
- uid_t uid,
- gid_t gid,
- const char *gecos,
- const char *dir,
- const char *shell,
- const char *mailbox,
- int change_uid));
-extern void mu_auth_data_free __P((struct mu_auth_data *ptr));
+mu_authenticate (struct mu_auth_data *auth_data, char *pass);
+
+extern int mu_auth_nosupport (struct mu_auth_data **return_data,
+ const void *key,
+ void *func_data,
+ void *call_data);
+
+
+extern void mu_auth_register_module (struct mu_auth_module *mod);
+
+extern void mu_authorization_add_module_list (const char *modlist);
+extern void mu_authentication_add_module_list (const char *modlist);
+
+extern void mu_auth_init (void);
+extern int mu_auth_data_alloc (struct mu_auth_data **ptr,
+ const char *name,
+ const char *passwd,
+ uid_t uid,
+ gid_t gid,
+ const char *gecos,
+ const char *dir,
+ const char *shell,
+ const char *mailbox,
+ int change_uid);
+extern void mu_auth_data_free (struct mu_auth_data *ptr);
extern struct mu_auth_module mu_auth_system_module;
diff --git a/include/mailutils/mutil.h b/include/mailutils/mutil.h
index 306b9cb..f9533b8 100644
--- a/include/mailutils/mutil.h
+++ b/include/mailutils/mutil.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -33,8 +33,8 @@
extern "C" {
#endif
-extern unsigned long mu_hex2ul __P ((char hex));
-extern size_t mu_hexstr2ul __P ((unsigned long* ul, const char* hex, size_t len));
+extern unsigned long mu_hex2ul (char hex);
+extern size_t mu_hexstr2ul (unsigned long* ul, const char* hex, size_t len);
struct mu_timezone
{
@@ -48,24 +48,24 @@ struct mu_timezone
typedef struct mu_timezone mu_timezone;
-int mu_parse_date __P ((const char *p, time_t *rettime, const time_t *now));
-extern int mu_parse_imap_date_time __P ((const char **p, struct tm * tm,
- mu_timezone * tz));
-extern int mu_parse_ctime_date_time __P ((const char **p, struct tm * tm,
- mu_timezone * tz));
+int mu_parse_date (const char *p, time_t *rettime, const time_t *now);
+extern int mu_parse_imap_date_time (const char **p, struct tm * tm,
+ mu_timezone * tz);
+extern int mu_parse_ctime_date_time (const char **p, struct tm * tm,
+ mu_timezone * tz);
-extern time_t mu_utc_offset __P ((void));
-extern time_t mu_tm2time __P ((struct tm * timeptr, mu_timezone * tz));
-extern char * mu_get_homedir __P ((void));
-extern char * mu_tilde_expansion __P ((const char *ref, const char *delim, const char *homedir));
+extern time_t mu_utc_offset (void);
+extern time_t mu_tm2time (struct tm * timeptr, mu_timezone * tz);
+extern char * mu_get_homedir (void);
+extern char * mu_tilde_expansion (const char *ref, const char *delim, const char *homedir);
-extern size_t mu_cpystr __P ((char *dst, const char *src, size_t size));
+extern size_t mu_cpystr (char *dst, const char *src, size_t size);
/* Get the host name, doing a gethostbyname() if possible.
*
* It is the caller's responsibility to free host.
*/
-extern int mu_get_host_name __P((char **host));
+extern int mu_get_host_name (char **host);
/* Set the default user email address.
*
@@ -74,7 +74,7 @@ extern int mu_get_host_name __P((char **host));
* rfc822 address, with one valid addr-spec, i.e, the address must be
* qualified.
*/
-extern int mu_set_user_email __P ((const char *email));
+extern int mu_set_user_email (const char *email);
/* Set the default user email address domain.
*
@@ -82,10 +82,10 @@ extern int mu_set_user_email __P ((const char *email));
* email addresses in this domain (name@domain). It should be fully
* qualified, but this isn't (and can't) be enforced.
*/
-extern int mu_set_user_email_domain __P ((const char *domain));
+extern int mu_set_user_email_domain (const char *domain);
/* Return the currently set user email domain, or NULL if not set. */
-extern int mu_get_user_email_domain __P ((const char** domain));
+extern int mu_get_user_email_domain (const char** domain);
/*
* Get the default email address for user name. A NULL name is taken
@@ -93,53 +93,52 @@ extern int mu_get_user_email_domain __P ((const char** domain));
*
* The result must be freed by the caller after use.
*/
-extern char *mu_get_user_email __P ((const char *name));
+extern char *mu_get_user_email (const char *name);
-extern char *mu_normalize_path __P ((char *path, const char *delim));
-extern int mu_normalize_mailbox_url __P ((char **out, const char *dir));
-extern int mu_tempfile __P ((const char *tmpdir, char **namep));
-extern char *mu_tempname __P ((const char *tmpdir));
+extern char *mu_normalize_path (char *path, const char *delim);
+extern int mu_normalize_mailbox_url (char **out, const char *dir);
+extern int mu_tempfile (const char *tmpdir, char **namep);
+extern char *mu_tempname (const char *tmpdir);
-extern char * mu_get_full_path __P((const char *file));
-extern char * mu_getcwd __P((void));
+extern char * mu_get_full_path (const char *file);
+extern char * mu_getcwd (void);
extern int mu_spawnvp(const char* prog, const char* const av[], int* stat);
-typedef void *(*mu_retrieve_fp) __PMT((void *));
-extern void mu_register_retriever __P((list_t *pflist, mu_retrieve_fp fun));
-extern void * mu_retrieve __P((list_t flist, void *data));
+typedef void *(*mu_retrieve_fp) (void *);
+extern void mu_register_retriever (list_t *pflist, mu_retrieve_fp fun);
+extern void * mu_retrieve (list_t flist, void *data);
-extern int mu_unroll_symlink __P((char *out, size_t outsz, const char *in));
+extern int mu_unroll_symlink (char *out, size_t outsz, const char *in);
-extern char * mu_expand_path_pattern __P((const char *pattern,
- const char *username));
+extern char * mu_expand_path_pattern (const char *pattern, const char *username);
-extern int mu_rfc2822_references __P((message_t msg, char **pstr));
-extern int mu_rfc2822_in_reply_to __P((message_t msg, char **pstr));
+extern int mu_rfc2822_references (message_t msg, char **pstr);
+extern int mu_rfc2822_in_reply_to (message_t msg, char **pstr);
/* Find NEEDLE in the HAYSTACK. Case insensitive comparison */
-extern char *mu_strcasestr __P((const char *haystack, const char *needle));
+extern char *mu_strcasestr (const char *haystack, const char *needle);
-extern int mu_string_unfold __P((char *text, size_t *plen));
+extern int mu_string_unfold (char *text, size_t *plen);
-extern int munre_set_regex __P((char *str, int caseflag, char **errp));
-extern int munre_subject __P((const char *subject, const char **new_subject));
+extern int munre_set_regex (char *str, int caseflag, char **errp);
+extern int munre_subject (const char *subject, const char **new_subject);
-extern char *mu_charset_lookup __P((char *lang, char *terr));
+extern char *mu_charset_lookup (char *lang, char *terr);
-extern int mu_true_answer_p __P((const char *p));
-extern int mu_scheme_autodetect_p __P((const char *scheme, const char **path));
+extern int mu_true_answer_p (const char *p);
+extern int mu_scheme_autodetect_p (const char *scheme, const char **path);
struct timeval;
-extern int mu_fd_wait __P((int fd, int *pflags, struct timeval *tvp));
+extern int mu_fd_wait (int fd, int *pflags, struct timeval *tvp);
-extern int mu_decode_filter __P((stream_t *pfilter, stream_t input,
- const char *filter_type,
- const char *fromcode, const char *tocode));
+extern int mu_decode_filter (stream_t *pfilter, stream_t input,
+ const char *filter_type,
+ const char *fromcode, const char *tocode);
extern enum mu_iconv_fallback_mode mu_default_fallback_mode;
-extern int mu_set_default_fallback __P((const char *str));
+extern int mu_set_default_fallback (const char *str);
#ifdef __cplusplus
}
diff --git a/include/mailutils/nls.h b/include/mailutils/nls.h
index 6aaed36..de958fe 100644
--- a/include/mailutils/nls.h
+++ b/include/mailutils/nls.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -50,7 +50,7 @@
extern "C" {
#endif
-extern void mu_init_nls __P((void));
+extern void mu_init_nls (void);
#ifdef __cplusplus
}
diff --git a/include/mailutils/observer.h b/include/mailutils/observer.h
index eb2c1d7..51cc024 100644
--- a/include/mailutils/observer.h
+++ b/include/mailutils/observer.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -37,22 +37,23 @@ extern "C" {
#define MU_OBSERVER_NO_CHECK 1
-extern int observer_create __P ((observer_t *, void *owner));
-extern void observer_destroy __P ((observer_t *, void *owner));
-extern void * observer_get_owner __P ((observer_t));
-extern int observer_action __P ((observer_t, size_t type));
-extern int observer_set_action __P ((observer_t,
- int (*_action) __PMT ((observer_t, size_t)), void *owner));
-extern int observer_set_destroy __P ((observer_t,
- int (*_destroy) __PMT((observer_t)), void *owner));
-extern int observer_set_flags __P ((observer_t, int flags));
-
-extern int observable_create __P ((observable_t *, void *owner));
-extern void observable_destroy __P ((observable_t *, void *owner));
-extern void * observable_get_owner __P ((observable_t));
-extern int observable_attach __P ((observable_t, size_t type, observer_t observer));
-extern int observable_detach __P ((observable_t, observer_t observer));
-extern int observable_notify __P ((observable_t, int type));
+extern int observer_create (observer_t *, void *owner);
+extern void observer_destroy (observer_t *, void *owner);
+extern void * observer_get_owner (observer_t);
+extern int observer_action (observer_t, size_t type);
+extern int observer_set_action (observer_t,
+ int (*_action) (observer_t, size_t),
+ void *owner);
+extern int observer_set_destroy (observer_t,
+ int (*_destroy) (observer_t), void *owner);
+extern int observer_set_flags (observer_t, int flags);
+
+extern int observable_create (observable_t *, void *owner);
+extern void observable_destroy (observable_t *, void *owner);
+extern void * observable_get_owner (observable_t);
+extern int observable_attach (observable_t, size_t type, observer_t observer);
+extern int observable_detach (observable_t, observer_t observer);
+extern int observable_notify (observable_t, int type);
#ifdef __cplusplus
}
diff --git a/include/mailutils/parse822.h b/include/mailutils/parse822.h
index 1799520..8ac26e9 100644
--- a/include/mailutils/parse822.h
+++ b/include/mailutils/parse822.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -37,49 +37,49 @@ extern "C" {
/* From RFC 822, 3.3 Lexical Tokens */
-extern int parse822_is_char __P ((char c));
-extern int parse822_is_digit __P ((char c));
-extern int parse822_is_ctl __P ((char c));
-extern int parse822_is_space __P ((char c));
-extern int parse822_is_htab __P ((char c));
-extern int parse822_is_lwsp_char __P ((char c));
-extern int parse822_is_special __P ((char c));
-extern int parse822_is_atom_char __P ((char c));
-extern int parse822_is_q_text __P ((char c));
-extern int parse822_is_d_text __P ((char c));
-extern int parse822_is_smtp_q __P ((char c));
-
-extern int parse822_skip_crlf __P ((const char** p, const char* e));
-extern int parse822_skip_lwsp_char __P ((const char** p, const char* e));
-extern int parse822_skip_lwsp __P ((const char** p, const char* e));
-extern int parse822_skip_comments __P ((const char** p, const char* e));
-extern int parse822_skip_nl __P ((const char** p, const char* e));
-
-extern int parse822_digits __P ((const char** p, const char* e, int min, int max, int* digits));
-extern int parse822_special __P ((const char** p, const char* e, char c));
-extern int parse822_comment __P ((const char** p, const char* e, char** comment));
-extern int parse822_atom __P ((const char** p, const char* e, char** atom));
-extern int parse822_quoted_pair __P ((const char** p, const char* e, char** qpair));
-extern int parse822_quoted_string __P ((const char** p, const char* e, char** qstr));
-extern int parse822_word __P ((const char** p, const char* e, char** word));
-extern int parse822_phrase __P ((const char** p, const char* e, char** phrase));
-extern int parse822_d_text __P ((const char** p, const char* e, char** dtext));
+extern int parse822_is_char (char c);
+extern int parse822_is_digit (char c);
+extern int parse822_is_ctl (char c);
+extern int parse822_is_space (char c);
+extern int parse822_is_htab (char c);
+extern int parse822_is_lwsp_char (char c);
+extern int parse822_is_special (char c);
+extern int parse822_is_atom_char (char c);
+extern int parse822_is_q_text (char c);
+extern int parse822_is_d_text (char c);
+extern int parse822_is_smtp_q (char c);
+
+extern int parse822_skip_crlf (const char** p, const char* e);
+extern int parse822_skip_lwsp_char (const char** p, const char* e);
+extern int parse822_skip_lwsp (const char** p, const char* e);
+extern int parse822_skip_comments (const char** p, const char* e);
+extern int parse822_skip_nl (const char** p, const char* e);
+
+extern int parse822_digits (const char** p, const char* e, int min, int max, int* digits);
+extern int parse822_special (const char** p, const char* e, char c);
+extern int parse822_comment (const char** p, const char* e, char** comment);
+extern int parse822_atom (const char** p, const char* e, char** atom);
+extern int parse822_quoted_pair (const char** p, const char* e, char** qpair);
+extern int parse822_quoted_string (const char** p, const char* e, char** qstr);
+extern int parse822_word (const char** p, const char* e, char** word);
+extern int parse822_phrase (const char** p, const char* e, char** phrase);
+extern int parse822_d_text (const char** p, const char* e, char** dtext);
/* From RFC 822, 6.1 Address Specification Syntax */
-extern int parse822_address_list __P ((address_t* a, const char* s));
-extern int parse822_mail_box __P ((const char** p, const char* e, address_t* a));
-extern int parse822_group __P ((const char** p, const char* e, address_t* a));
-extern int parse822_address __P ((const char** p, const char* e, address_t* a));
-extern int parse822_route_addr __P ((const char** p, const char* e, address_t* a));
-extern int parse822_route __P ((const char** p, const char* e, char** route));
-extern int parse822_addr_spec __P ((const char** p, const char* e, address_t* a));
-extern int parse822_unix_mbox __P ((const char** p, const char* e, address_t* a));
-extern int parse822_local_part __P ((const char** p, const char* e, char** local_part));
-extern int parse822_domain __P ((const char** p, const char* e, char** domain));
-extern int parse822_sub_domain __P ((const char** p, const char* e, char** sub_domain));
-extern int parse822_domain_ref __P ((const char** p, const char* e, char** domain_ref));
-extern int parse822_domain_literal __P ((const char** p, const char* e, char** domain_literal));
+extern int parse822_address_list (address_t* a, const char* s);
+extern int parse822_mail_box (const char** p, const char* e, address_t* a);
+extern int parse822_group (const char** p, const char* e, address_t* a);
+extern int parse822_address (const char** p, const char* e, address_t* a);
+extern int parse822_route_addr (const char** p, const char* e, address_t* a);
+extern int parse822_route (const char** p, const char* e, char** route);
+extern int parse822_addr_spec (const char** p, const char* e, address_t* a);
+extern int parse822_unix_mbox (const char** p, const char* e, address_t* a);
+extern int parse822_local_part (const char** p, const char* e, char** local_part);
+extern int parse822_domain (const char** p, const char* e, char** domain);
+extern int parse822_sub_domain (const char** p, const char* e, char** sub_domain);
+extern int parse822_domain_ref (const char** p, const char* e, char** domain_ref);
+extern int parse822_domain_literal (const char** p, const char* e, char** domain_literal);
/* RFC 822 Quoting Functions
* Various elements must be quoted if then contain non-safe characters. What
@@ -88,18 +88,18 @@ extern int parse822_domain_literal __P ((const char** p, const char* e, char** d
* quoted if no unsafe characters were in the raw string.
*/
-extern int parse822_quote_string __P ((char** quoted, const char* raw));
-extern int parse822_quote_local_part __P ((char** quoted, const char* raw));
+extern int parse822_quote_string (char** quoted, const char* raw);
+extern int parse822_quote_local_part (char** quoted, const char* raw);
-extern int parse822_field_body __P ((const char** p, const char *e, char** fieldbody));
-extern int parse822_field_name __P ((const char** p, const char *e, char** fieldname));
+extern int parse822_field_body (const char** p, const char *e, char** fieldbody);
+extern int parse822_field_name (const char** p, const char *e, char** fieldname);
/***** From RFC 822, 5.1 Date and Time Specification Syntax *****/
-extern int parse822_day __P ((const char** p, const char* e, int* day));
-extern int parse822_date __P ((const char** p, const char* e, int* day, int* mon, int* year));
-extern int parse822_time __P ((const char** p, const char* e, int* h, int* m, int* s, int* tz, const char** tz_name));
-extern int parse822_date_time __P ((const char** p, const char* e, struct tm* tm, mu_timezone* tz));
+extern int parse822_day (const char** p, const char* e, int* day);
+extern int parse822_date (const char** p, const char* e, int* day, int* mon, int* year);
+extern int parse822_time (const char** p, const char* e, int* h, int* m, int* s, int* tz, const char** tz_name);
+extern int parse822_date_time (const char** p, const char* e, struct tm* tm, mu_timezone* tz);
#ifdef __cplusplus
diff --git a/include/mailutils/property.h b/include/mailutils/property.h
index 32d6417..bc1e11f 100644
--- a/include/mailutils/property.h
+++ b/include/mailutils/property.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,19 +27,18 @@
extern "C" {
#endif
-extern int property_create __P ((property_t *, void *));
-extern void property_destroy __P ((property_t *, void *));
-extern void *property_get_owner __P ((property_t));
+extern int property_create (property_t *, void *);
+extern void property_destroy (property_t *, void *);
+extern void *property_get_owner (property_t);
-extern int property_set_value __P ((property_t, const char *,
- const char *, int));
-extern int property_get_value __P ((property_t, const char *, char *,
- size_t, size_t *));
+extern int property_set_value (property_t, const char *, const char *, int);
+extern int property_get_value (property_t, const char *, char *, size_t,
+ size_t *);
/* Helper functions. */
-extern int property_set __P ((property_t, const char *));
-extern int property_unset __P ((property_t, const char *));
-extern int property_is_set __P ((property_t, const char *));
+extern int property_set (property_t, const char *);
+extern int property_unset (property_t, const char *);
+extern int property_is_set (property_t, const char *);
#ifdef __cplusplus
}
diff --git a/include/mailutils/refcount.h b/include/mailutils/refcount.h
index a29da26..ebb282a 100644
--- a/include/mailutils/refcount.h
+++ b/include/mailutils/refcount.h
@@ -1,5 +1,5 @@
/* GNU mailutils - a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -32,10 +32,10 @@ struct _mu_refcount
monitor_t lock;
};
-extern int mu_refcount_create __P ((mu_refcount_t *));
-extern void mu_refcount_destroy __P ((mu_refcount_t *));
-extern int mu_refcount_inc __P ((mu_refcount_t));
-extern int mu_refcount_dec __P ((mu_refcount_t));
+extern int mu_refcount_create (mu_refcount_t *);
+extern void mu_refcount_destroy (mu_refcount_t *);
+extern int mu_refcount_inc (mu_refcount_t);
+extern int mu_refcount_dec (mu_refcount_t);
#ifdef __cplusplus
}
diff --git a/include/mailutils/registrar.h b/include/mailutils/registrar.h
index 29d2d0f..080e175 100644
--- a/include/mailutils/registrar.h
+++ b/include/mailutils/registrar.h
@@ -30,62 +30,55 @@ struct _record
{
int priority; /* Higher priority records are scanned first */
const char *scheme;
- int (*_url) __PMT ((url_t));
- int (*_mailbox) __PMT ((mailbox_t));
- int (*_mailer) __PMT ((mailer_t));
- int (*_folder) __PMT ((folder_t));
+ int (*_url) (url_t);
+ int (*_mailbox) (mailbox_t);
+ int (*_mailer) (mailer_t);
+ int (*_folder) (folder_t);
void *data; /* back pointer. */
/* Stub functions to override. The default is to return the fields. */
- int (*_is_scheme) __PMT ((record_t, const char *, int));
- int (*_get_url) __PMT ((record_t, int (*(*_url)) __PMT ((url_t))));
- int (*_get_mailbox) __PMT ((record_t, int (*(*_mailbox)) __PMT ((mailbox_t))));
- int (*_get_mailer) __PMT ((record_t, int (*(*_mailer)) __PMT ((mailer_t))));
- int (*_get_folder) __PMT ((record_t, int (*(*_folder)) __PMT ((folder_t))));
+ int (*_is_scheme) (record_t, const char *, int);
+ int (*_get_url) (record_t, int (*(*_url)) (url_t));
+ int (*_get_mailbox) (record_t, int (*(*_mailbox)) (mailbox_t));
+ int (*_get_mailer) (record_t, int (*(*_mailer)) (mailer_t));
+ int (*_get_folder) (record_t, int (*(*_folder)) (folder_t));
};
/* Registration. */
-extern int registrar_get_iterator __P ((iterator_t *));
-extern int registrar_get_list __P ((list_t *)) __attribute__ ((deprecated));
+extern int registrar_get_iterator (iterator_t *);
+extern int registrar_get_list (list_t *) __attribute__ ((deprecated));
-extern int registrar_lookup __P ((const char *name, record_t *precord,
- int flags));
-extern int registrar_record __P ((record_t));
-extern int unregistrar_record __P ((record_t));
+extern int registrar_lookup (const char *name, record_t *precord, int flags);
+extern int registrar_record (record_t);
+extern int unregistrar_record (record_t);
/* Scheme. */
-extern int record_is_scheme __P ((record_t, const char *, int flags));
-extern int record_set_scheme __P ((record_t, const char *));
-extern int record_set_is_scheme __P ((record_t, int (*_is_scheme)
- __PMT ((record_t, const char *, int))));
+extern int record_is_scheme (record_t, const char *, int flags);
+extern int record_set_scheme (record_t, const char *);
+extern int record_set_is_scheme (record_t,
+ int (*_is_scheme) (record_t, const char *, int));
/* Url. */
-extern int record_get_url __P ((record_t, int (*(*)) __PMT ((url_t))));
-extern int record_set_url __P ((record_t, int (*) __PMT ((url_t))));
-extern int record_set_get_url __P ((record_t, int (*_get_url)
- __PMT ((record_t,
- int (*(*)) __PMT ((url_t))))));
+extern int record_get_url (record_t, int (*(*)) (url_t));
+extern int record_set_url (record_t, int (*) (url_t));
+extern int record_set_get_url (record_t,
+ int (*_get_url) (record_t, int (*(*)) (url_t)));
/* Mailbox. */
-extern int record_get_mailbox __P ((record_t, int (*(*))
- __PMT ((mailbox_t))));
-extern int record_set_mailbox __P ((record_t, int (*) __PMT ((mailbox_t))));
-extern int record_set_get_mailbox __P ((record_t, int (*_get_mailbox)
- __PMT ((record_t,
- int (*(*)) __PMT((mailbox_t))))));
+extern int record_get_mailbox (record_t, int (*(*)) (mailbox_t));
+extern int record_set_mailbox (record_t, int (*) (mailbox_t));
+extern int record_set_get_mailbox (record_t,
+ int (*_get_mailbox) (record_t, int (*(*)) (mailbox_t)));
/* Mailer. */
-extern int record_get_mailer __P ((record_t,
- int (*(*)) __PMT ((mailer_t))));
-extern int record_set_mailer __P ((record_t, int (*) __PMT ((mailer_t))));
-extern int record_set_get_mailer __P ((record_t, int (*_get_mailer)
- __PMT ((record_t,
- int (*(*)) __PMT ((mailer_t))))));
+extern int record_get_mailer (record_t,
+ int (*(*)) (mailer_t));
+extern int record_set_mailer (record_t, int (*) (mailer_t));
+extern int record_set_get_mailer (record_t,
+ int (*_get_mailer) (record_t, int (*(*)) (mailer_t)));
/* Folder. */
-extern int record_get_folder __P ((record_t,
- int (*(*)) __PMT ((folder_t))));
-extern int record_set_folder __P ((record_t, int (*) __PMT ((folder_t))));
-extern int record_set_get_folder __P ((record_t, int (*_get_folder)
- __PMT ((record_t,
- int (*(*)) __PMT ((folder_t))))));
+extern int record_get_folder (record_t, int (*(*)) (folder_t));
+extern int record_set_folder (record_t, int (*) (folder_t));
+extern int record_set_get_folder (record_t,
+ int (*_get_folder) (record_t, int (*(*)) (folder_t)));
/* Records provided by the library. */
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index 7c2fba3..65007a6 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -42,125 +42,119 @@ extern "C" { /*}*/
/* Functions useful to users of the pre-defined stream types. */
-extern int file_stream_create __P ((stream_t *stream, const char* filename,
- int flags));
-extern int tcp_stream_create __P ((stream_t *stream, const char* host,
- int port, int flags));
-extern int mapfile_stream_create __P ((stream_t *stream, const char* filename,
- int flags));
-extern int memory_stream_create __P ((stream_t *stream, const char* filename,
- int flags));
-extern int encoder_stream_create __P ((stream_t *stream, stream_t iostream,
- const char *encoding));
-extern int decoder_stream_create __P ((stream_t *stream, stream_t iostream,
- const char *encoding));
-extern int stdio_stream_create __P ((stream_t *stream, FILE* stdio,
- int flags));
-extern int prog_stream_create __P ((stream_t *stream, const char *progname,
- int flags));
-int filter_prog_stream_create __P ((stream_t *stream, const char *progname,
- stream_t input));
+extern int file_stream_create (stream_t *stream, const char* filename,
+ int flags);
+extern int tcp_stream_create (stream_t *stream, const char* host,
+ int port, int flags);
+extern int mapfile_stream_create (stream_t *stream, const char* filename,
+ int flags);
+extern int memory_stream_create (stream_t *stream, const char* filename,
+ int flags);
+extern int encoder_stream_create (stream_t *stream, stream_t iostream,
+ const char *encoding);
+extern int decoder_stream_create (stream_t *stream, stream_t iostream,
+ const char *encoding);
+extern int stdio_stream_create (stream_t *stream, FILE* stdio,
+ int flags);
+extern int prog_stream_create (stream_t *stream, const char *progname,
+ int flags);
+int filter_prog_stream_create (stream_t *stream, const char *progname,
+ stream_t input);
-extern void stream_destroy __P ((stream_t *, void *owner));
-
-extern int stream_open __P ((stream_t));
-extern int stream_close __P ((stream_t));
-extern int stream_is_seekable __P ((stream_t));
-extern int stream_get_transport2 __P ((stream_t stream,
- mu_transport_t *pt,
- mu_transport_t *pt2));
-extern int stream_get_transport __P ((stream_t stream,
- mu_transport_t *pt));
-
-extern int stream_read __P ((stream_t, char *, size_t, off_t,
- size_t *));
-extern int stream_readline __P ((stream_t, char *, size_t, off_t,
- size_t *));
-extern int stream_size __P ((stream_t, off_t *));
-extern int stream_truncate __P ((stream_t, off_t));
-extern int stream_write __P ((stream_t, const char *, size_t, off_t,
- size_t *));
-extern int stream_setbufsiz __P ((stream_t stream, size_t size));
-extern int stream_flush __P ((stream_t));
+extern void stream_destroy (stream_t *, void *owner);
+
+extern int stream_open (stream_t);
+extern int stream_close (stream_t);
+extern int stream_is_seekable (stream_t);
+extern int stream_get_transport2 (stream_t stream, mu_transport_t *pt,
+ mu_transport_t *pt2);
+ extern int stream_get_transport (stream_t stream, mu_transport_t *pt);
+
+extern int stream_read (stream_t, char *, size_t, off_t, size_t *);
+extern int stream_readline (stream_t, char *, size_t, off_t, size_t *);
+extern int stream_size (stream_t, off_t *);
+extern int stream_truncate (stream_t, off_t);
+extern int stream_write (stream_t, const char *, size_t, off_t,
+ size_t *);
+extern int stream_setbufsiz (stream_t stream, size_t size);
+extern int stream_flush (stream_t);
#define MU_STREAM_READY_RD 0x1
#define MU_STREAM_READY_WR 0x2
struct timeval; /* Needed for the following declaration */
-extern int stream_wait __P((stream_t stream, int *pflags,
- struct timeval *));
+extern int stream_wait (stream_t stream, int *pflags, struct timeval *);
/* Functions useful to implementors of new stream types. */
-extern int stream_create __P ((stream_t *stream, int flags,
- void* owner));
+extern int stream_create (stream_t *stream, int flags, void *owner);
-extern void* stream_get_owner __P ((stream_t));
-extern void stream_set_owner __P ((stream_t, void* owner));
+extern void* stream_get_owner (stream_t);
+extern void stream_set_owner (stream_t, void* owner);
-extern int stream_get_flags __P ((stream_t, int *pflags));
-extern int stream_set_flags __P ((stream_t, int flags));
+extern int stream_get_flags (stream_t, int *pflags);
+extern int stream_set_flags (stream_t, int flags);
-extern int stream_get_property __P ((stream_t, property_t *));
-extern int stream_set_property __P ((stream_t, property_t, void *));
+extern int stream_get_property (stream_t, property_t *);
+extern int stream_set_property (stream_t, property_t, void *);
#define MU_STREAM_STATE_OPEN 1
#define MU_STREAM_STATE_READ 2
#define MU_STREAM_STATE_WRITE 4
#define MU_STREAM_STATE_CLOSE 8
-extern int stream_get_state __P ((stream_t, int *pstate));
+extern int stream_get_state (stream_t, int *pstate);
-extern int stream_set_destroy __P ((stream_t,
- void (*_destroy) __PMT ((stream_t)), void *owner));
+extern int stream_set_destroy (stream_t,
+ void (*_destroy) (stream_t), void *owner);
-extern int stream_set_open __P ((stream_t,
- int (*_open) __PMT ((stream_t)), void *owner));
+extern int stream_set_open (stream_t,
+ int (*_open) (stream_t), void *owner);
-extern int stream_set_close __P ((stream_t,
- int (*_close) __PMT ((stream_t)), void *owner));
+extern int stream_set_close (stream_t,
+ int (*_close) (stream_t), void *owner);
-extern int stream_set_get_transport2 __P ((stream_t,
- int (*_get_fd) __PMT ((stream_t, mu_transport_t *, mu_transport_t *)),
- void *owner));
+extern int stream_set_get_transport2 (stream_t,
+ int (*_get_fd) (stream_t, mu_transport_t *, mu_transport_t *),
+ void *owner);
-extern int stream_set_read __P ((stream_t,
- int (*_read) __PMT ((stream_t, char *, size_t, off_t, size_t *)),
- void *owner));
+extern int stream_set_read (stream_t,
+ int (*_read) (stream_t, char *, size_t, off_t, size_t *),
+ void *owner);
-extern int stream_set_readline __P ((stream_t,
- int (*_readline) __PMT ((stream_t, char *, size_t, off_t, size_t *)),
- void *owner));
+extern int stream_set_readline (stream_t,
+ int (*_readline) (stream_t, char *, size_t, off_t, size_t *),
+ void *owner);
-extern int stream_set_size __P ((stream_t,
- int (*_size) __PMT ((stream_t, off_t *)), void *owner));
+extern int stream_set_size (stream_t,
+ int (*_size) (stream_t, off_t *), void *owner);
-extern int stream_set_truncate __P ((stream_t,
- int (*_truncate) __PMT ((stream_t, off_t)), void *owner));
+extern int stream_set_truncate (stream_t,
+ int (*_truncate) (stream_t, off_t), void *owner);
-extern int stream_set_write __P ((stream_t,
- int (*_write) __PMT ((stream_t, const char *, size_t, off_t, size_t *)),
- void *owner));
+extern int stream_set_write (stream_t,
+ int (*_write) (stream_t, const char *, size_t, off_t, size_t *),
+ void *owner);
-extern int stream_set_flush __P ((stream_t,
- int (*_flush) __PMT ((stream_t)), void *owner));
+extern int stream_set_flush (stream_t,
+ int (*_flush) (stream_t), void *owner);
-extern int stream_set_strerror __P ((stream_t stream,
- int (*fp) (stream_t, const char **), void *owner));
+extern int stream_set_strerror (stream_t stream,
+ int (*fp) (stream_t, const char **), void *owner);
-extern int stream_set_wait __P ((stream_t stream,
- int (*wait) (stream_t, int *, struct timeval *), void *owner));
+extern int stream_set_wait (stream_t stream,
+ int (*wait) (stream_t, int *, struct timeval *), void *owner);
-extern int stream_sequential_read __P((stream_t stream,
- char *buf, size_t size, size_t *nbytes));
+extern int stream_sequential_read (stream_t stream,
+ char *buf, size_t size, size_t *nbytes);
-extern int stream_sequential_readline __P((stream_t stream,
- char *buf, size_t size, size_t *nbytes));
+extern int stream_sequential_readline (stream_t stream,
+ char *buf, size_t size, size_t *nbytes);
-extern int stream_sequential_write __P((stream_t stream,
- const char *buf, size_t size));
-extern int stream_seek __P((stream_t stream, off_t off, int whence));
+extern int stream_sequential_write (stream_t stream,
+ const char *buf, size_t size);
+extern int stream_seek (stream_t stream, off_t off, int whence);
-extern int stream_strerror __P((stream_t stream, const char **p));
+extern int stream_strerror (stream_t stream, const char **p);
#ifdef __cplusplus
}
diff --git a/include/mailutils/tls.h b/include/mailutils/tls.h
index 2e79d56..98750ca 100644
--- a/include/mailutils/tls.h
+++ b/include/mailutils/tls.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,20 +27,20 @@
extern "C" {
#endif
-extern int tls_stream_create __P((stream_t *stream,
- stream_t strin, stream_t strout, int flags));
-extern int tls_stream_create_client __P((stream_t *stream,
- stream_t strin, stream_t strout,
- int flags));
-extern int tls_stream_create_client_from_tcp __P((stream_t *stream,
- stream_t tcp_str,
- int flags));
-
-extern int mu_check_tls_environment __P((void));
-extern int mu_init_tls_libs __P((void));
-extern void mu_deinit_tls_libs __P((void));
-extern void mu_tls_init_argp __P((void));
-extern void mu_tls_init_client_argp __P((void));
+extern int tls_stream_create (stream_t *stream,
+ stream_t strin, stream_t strout, int flags);
+extern int tls_stream_create_client (stream_t *stream,
+ stream_t strin, stream_t strout,
+ int flags);
+extern int tls_stream_create_client_from_tcp (stream_t *stream,
+ stream_t tcp_str,
+ int flags);
+
+extern int mu_check_tls_environment (void);
+extern int mu_init_tls_libs (void);
+extern void mu_deinit_tls_libs (void);
+extern void mu_tls_init_argp (void);
+extern void mu_tls_init_client_argp (void);
extern int mu_tls_enable;
diff --git a/include/mailutils/types.h b/include/mailutils/types.h
index 46f2ac4..c049ba6 100644
--- a/include/mailutils/types.h
+++ b/include/mailutils/types.h
@@ -21,22 +21,6 @@
#include <sys/types.h>
-#ifndef __P
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define __P(Args) Args
-# else
-# define __P(Args) ()
-# endif
-#endif
-
-#ifndef __PMT
-# if defined PROTOTYPES || (defined __STDC__ && STDC__)
-# define __PMT(Args) Args
-# else
-# define __PMT(Args) ()
-# endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/mailutils/url.h b/include/mailutils/url.h
index 05f2e60..b6b0ddf 100644
--- a/include/mailutils/url.h
+++ b/include/mailutils/url.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,31 +25,31 @@
extern "C" {
#endif
-extern int url_create __P ((url_t *, const char *name));
-extern void url_destroy __P ((url_t *));
-extern int url_parse __P ((url_t));
+extern int url_create (url_t *, const char *name);
+extern void url_destroy (url_t *);
+extern int url_parse (url_t);
-extern int url_get_scheme __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_user __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_passwd __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_auth __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_host __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_port __P ((const url_t, long *));
-extern int url_get_path __P ((const url_t, char *, size_t, size_t *));
-extern int url_get_query __P ((const url_t, char *, size_t, size_t *));
-extern const char* url_to_string __P ((const url_t));
+extern int url_get_scheme (const url_t, char *, size_t, size_t *);
+extern int url_get_user (const url_t, char *, size_t, size_t *);
+extern int url_get_passwd (const url_t, char *, size_t, size_t *);
+extern int url_get_auth (const url_t, char *, size_t, size_t *);
+extern int url_get_host (const url_t, char *, size_t, size_t *);
+extern int url_get_port (const url_t, long *);
+extern int url_get_path (const url_t, char *, size_t, size_t *);
+extern int url_get_query (const url_t, char *, size_t, size_t *);
+extern const char* url_to_string (const url_t);
-extern int url_is_scheme __P ((url_t, const char* scheme));
+extern int url_is_scheme (url_t, const char* scheme);
-extern int url_is_same_scheme __P ((url_t, url_t));
-extern int url_is_same_user __P ((url_t, url_t));
-extern int url_is_same_path __P ((url_t, url_t));
-extern int url_is_same_host __P ((url_t, url_t));
-extern int url_is_same_port __P ((url_t, url_t));
+extern int url_is_same_scheme (url_t, url_t);
+extern int url_is_same_user (url_t, url_t);
+extern int url_is_same_path (url_t, url_t);
+extern int url_is_same_host (url_t, url_t);
+extern int url_is_same_port (url_t, url_t);
-extern char* url_decode __P ((const char *s));
+extern char* url_decode (const char *s);
-extern int url_is_ticket __P ((url_t ticket, url_t url));
+extern int url_is_ticket (url_t ticket, url_t url);
#ifdef __cplusplus
}
diff --git a/lib/md5.h b/lib/md5.h
index 9119dc2..0ae68d5 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,6 +1,6 @@
/* md5.h - Declaration of functions and data types used for MD5 sum
computing library functions.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2005 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -70,13 +70,6 @@ typedef unsigned long md5_uint32;
#endif
#endif
-#undef __P
-#if defined (__STDC__) && __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
-
/* Structure to save state of computation between the single steps. */
struct md5_ctx
{
@@ -97,21 +90,21 @@ struct md5_ctx
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
-extern void md5_init_ctx __P ((struct md5_ctx * ctx));
+extern void md5_init_ctx (struct md5_ctx * ctx);
/* Starting with the result of former calls of this function (or the
initialization function update the context for the next LEN bytes
starting at BUFFER.
It is necessary that LEN is a multiple of 64!!! */
-extern void md5_process_block __P ((const void *buffer, size_t len,
- struct md5_ctx * ctx));
+extern void md5_process_block (const void *buffer, size_t len,
+ struct md5_ctx * ctx);
/* Starting with the result of former calls of this function (or the
initialization function update the context for the next LEN bytes
starting at BUFFER.
It is NOT required that LEN is a multiple of 64. */
-extern void md5_process_bytes __P ((const void *buffer, size_t len,
- struct md5_ctx * ctx));
+extern void md5_process_bytes (const void *buffer, size_t len,
+ struct md5_ctx * ctx);
/* Process the remaining bytes in the buffer and put result from CTX
in first 16 bytes following RESBUF. The result is always in little
@@ -120,7 +113,7 @@ extern void md5_process_bytes __P ((const void *buffer, size_t len,
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
-extern void *md5_finish_ctx __P ((struct md5_ctx * ctx, void *resbuf));
+extern void *md5_finish_ctx (struct md5_ctx * ctx, void *resbuf);
/* Put result from CTX in first 16 bytes following RESBUF. The result is
@@ -129,18 +122,18 @@ extern void *md5_finish_ctx __P ((struct md5_ctx * ctx, void *resbuf));
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
-extern void *md5_read_ctx __P ((const struct md5_ctx * ctx, void *resbuf));
+extern void *md5_read_ctx (const struct md5_ctx * ctx, void *resbuf);
/* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
-extern int md5_stream __P ((FILE * stream, void *resblock));
+extern int md5_stream (FILE * stream, void *resblock);
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message
digest. */
-extern void *md5_buffer __P ((const char *buffer, size_t len, void *resblock));
+extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
#endif
diff --git a/lib/mu_asprintf.h b/lib/mu_asprintf.h
index 0d2f0ff..339b9ff 100644
--- a/lib/mu_asprintf.h
+++ b/lib/mu_asprintf.h
@@ -19,9 +19,9 @@
#ifndef __P
# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define __P(args) args
+# define args args
# else
-# define __P(args) ()
+# define args) (
# endif
#endif /*__P */
@@ -29,11 +29,11 @@
#include <stdio.h>
#if !HAVE_DECL_VASPRINTF
-extern int vasprintf __P((char **result, const char *format, va_list args));
+extern int vasprintf (char **result, const char *format, va_list args);
#endif
#if !HAVE_DECL_ASPRINTF
#if __STDC__
-extern int asprintf __P((char **result, const char *format, ...));
+extern int asprintf (char **result, const char *format, ...);
#else
extern int asprintf ();
#endif
diff --git a/lib/mu_dbm.h b/lib/mu_dbm.h
index 2be9819..3ac8db3 100644
--- a/lib/mu_dbm.h
+++ b/lib/mu_dbm.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -66,14 +66,14 @@ typedef datum DBM_DATUM;
#ifdef USE_DBM
struct stat;
int mu_dbm_stat (char *name, struct stat *sb);
-int mu_dbm_open __P((char *name, DBM_FILE *db, int flags, int mode));
-int mu_dbm_close __P((DBM_FILE db));
-int mu_dbm_fetch __P((DBM_FILE db, DBM_DATUM key, DBM_DATUM *ret));
-int mu_dbm_insert __P((DBM_FILE db, DBM_DATUM key, DBM_DATUM contents, int replace));
+int mu_dbm_open (char *name, DBM_FILE *db, int flags, int mode);
+int mu_dbm_close (DBM_FILE db);
+int mu_dbm_fetch (DBM_FILE db, DBM_DATUM key, DBM_DATUM *ret);
+int mu_dbm_insert (DBM_FILE db, DBM_DATUM key, DBM_DATUM contents, int replace);
int mu_dbm_delete (DBM_FILE db, DBM_DATUM key);
-DBM_DATUM mu_dbm_firstkey __P((DBM_FILE db));
-DBM_DATUM mu_dbm_nextkey __P((DBM_FILE db, DBM_DATUM key));
+DBM_DATUM mu_dbm_firstkey (DBM_FILE db);
+DBM_DATUM mu_dbm_nextkey (DBM_FILE db, DBM_DATUM key);
#endif
-int mu_fcheck_perm __P((int fd, int mode));
-int mu_check_perm __P((const char *name, int mode));
+int mu_fcheck_perm (int fd, int mode);
+int mu_check_perm (const char *name, int mode);
diff --git a/lib/strsignal.c b/lib/strsignal.c
index dcc6e9b..36f69c8 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#ifndef __P
# ifdef __STDC__
-# define __P(args) args
+# define args args
# else
-# define __P(args) ()
+# define args) (
# endif
#endif /*__P */
@@ -43,7 +43,7 @@
#endif
/* FIXME: Should probably go in a .h somewhere. */
-char *strsignal __P ((int));
+char *strsignal (int);
char *
strsignal (int signo)
diff --git a/libmu_scm/mu_address.c b/libmu_scm/mu_address.c
index 5b5222f..14eaaf4 100644
--- a/libmu_scm/mu_address.c
+++ b/libmu_scm/mu_address.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
#include "mu_scm.h"
-typedef int (*address_get_fp) __P((address_t, size_t, char *, size_t, size_t *));
+typedef int (*address_get_fp) (address_t, size_t, char *, size_t, size_t *);
static SCM
_get_address_part (const char *func_name, address_get_fp fun,
diff --git a/libsieve/argp.c b/libsieve/argp.c
index dbad173..686dad2 100644
--- a/libsieve/argp.c
+++ b/libsieve/argp.c
@@ -26,8 +26,7 @@
list_t sieve_include_path = NULL;
list_t sieve_library_path = NULL;
-static error_t sieve_argp_parser __P((int key, char *arg,
- struct argp_state *state));
+static error_t sieve_argp_parser (int key, char *arg, struct argp_state *state);
/* Options used by programs that use extended authentication mechanisms. */
static struct argp_option sieve_argp_option[] = {
diff --git a/libsieve/sieve.h b/libsieve/sieve.h
index 467d8fd..2de24c9 100644
--- a/libsieve/sieve.h
+++ b/libsieve/sieve.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
#define SIEVE_CODE_INCR 128
-typedef void (*sieve_instr_t) __P((sieve_machine_t mach));
+typedef void (*sieve_instr_t) (sieve_machine_t mach);
typedef union {
sieve_instr_t instr;
@@ -87,58 +87,54 @@ extern int sieve_error_count;
#define TAG_COMPFUN "__compfun__"
#define TAG_RELFUN "__relfun__"
-void sieve_compile_error __P((const char *filename, int linenum,
- const char *fmt, ...));
-void sieve_debug_internal __P((sieve_printf_t printer, void *data,
- const char *fmt, ...));
-void sieve_print_value __P((sieve_value_t *val, sieve_printf_t printer,
- void *data));
-void sieve_print_value_list __P((list_t list, sieve_printf_t printer,
- void *data));
-void sieve_print_tag_list __P((list_t list, sieve_printf_t printer,
- void *data));
-
-int _sieve_default_error_printer __P((void *data,
- const char *fmt, va_list ap));
-int _sieve_default_parse_error __P((void *unused,
- const char *filename, int lineno,
- const char *fmt, va_list ap));
-
-int sieve_lex_begin __P((const char *name));
-void sieve_lex_finish __P((void));
-
-void sieve_register_standard_actions __P((sieve_machine_t mach));
-void sieve_register_standard_tests __P((sieve_machine_t mach));
-void sieve_register_standard_comparators __P((sieve_machine_t mach));
-
-int sieve_code __P((sieve_op_t *op));
-int sieve_code_instr __P((sieve_instr_t instr));
-int sieve_code_handler __P((sieve_handler_t handler));
-int sieve_code_list __P((list_t list));
-int sieve_code_number __P((long num));
-int sieve_code_test __P((sieve_register_t *reg, list_t arglist));
-int sieve_code_action __P((sieve_register_t *reg, list_t arglist));
-void sieve_code_anyof __P((size_t start));
-void sieve_code_allof __P((size_t start));
-int sieve_code_source __P((const char *name));
-int sieve_code_line __P((size_t line));
-
-void instr_action __P((sieve_machine_t mach));
-void instr_test __P((sieve_machine_t mach));
-void instr_push __P((sieve_machine_t mach));
-void instr_pop __P((sieve_machine_t mach));
-void instr_not __P((sieve_machine_t mach));
-void instr_branch __P((sieve_machine_t mach));
-void instr_brz __P((sieve_machine_t mach));
-void instr_brnz __P((sieve_machine_t mach));
-void instr_nop __P((sieve_machine_t mach));
-void instr_source __P((sieve_machine_t mach));
-void instr_line __P((sieve_machine_t mach));
-
-int sieve_mark_deleted __P((message_t msg, int deleted));
-
-int sieve_match_part_checker __P((const char *name, list_t tags, list_t args));
-int sieve_relational_checker __P((const char *name, list_t tags, list_t args));
-
-int sieve_load_add_path __P((list_t path));
-int sieve_load_add_dir __P((sieve_machine_t mach, const char *name));
+void sieve_compile_error (const char *filename, int linenum,
+ const char *fmt, ...);
+void sieve_debug_internal (sieve_printf_t printer, void *data,
+ const char *fmt, ...);
+void sieve_print_value (sieve_value_t *val, sieve_printf_t printer,
+ void *data);
+void sieve_print_value_list (list_t list, sieve_printf_t printer, void *data);
+void sieve_print_tag_list (list_t list, sieve_printf_t printer, void *data);
+
+int _sieve_default_error_printer (void *data, const char *fmt, va_list ap);
+int _sieve_default_parse_error (void *unused, const char *filename, int lineno,
+ const char *fmt, va_list ap);
+
+int sieve_lex_begin (const char *name);
+void sieve_lex_finish (void);
+
+void sieve_register_standard_actions (sieve_machine_t mach);
+void sieve_register_standard_tests (sieve_machine_t mach);
+void sieve_register_standard_comparators (sieve_machine_t mach);
+
+int sieve_code (sieve_op_t *op);
+int sieve_code_instr (sieve_instr_t instr);
+int sieve_code_handler (sieve_handler_t handler);
+int sieve_code_list (list_t list);
+int sieve_code_number (long num);
+int sieve_code_test (sieve_register_t *reg, list_t arglist);
+int sieve_code_action (sieve_register_t *reg, list_t arglist);
+void sieve_code_anyof (size_t start);
+void sieve_code_allof (size_t start);
+int sieve_code_source (const char *name);
+int sieve_code_line (size_t line);
+
+void instr_action (sieve_machine_t mach);
+void instr_test (sieve_machine_t mach);
+void instr_push (sieve_machine_t mach);
+void instr_pop (sieve_machine_t mach);
+void instr_not (sieve_machine_t mach);
+void instr_branch (sieve_machine_t mach);
+void instr_brz (sieve_machine_t mach);
+void instr_brnz (sieve_machine_t mach);
+void instr_nop (sieve_machine_t mach);
+void instr_source (sieve_machine_t mach);
+void instr_line (sieve_machine_t mach);
+
+int sieve_mark_deleted (message_t msg, int deleted);
+
+int sieve_match_part_checker (const char *name, list_t tags, list_t args);
+int sieve_relational_checker (const char *name, list_t tags, list_t args);
+
+int sieve_load_add_path (list_t path);
+int sieve_load_add_dir (sieve_machine_t mach, const char *name);
diff --git a/libsieve/sieve.l b/libsieve/sieve.l
index 332a5b2..a7d2e7f 100644
--- a/libsieve/sieve.l
+++ b/libsieve/sieve.l
@@ -41,20 +41,20 @@ static list_t string_list;
static char *multiline_delimiter;
static int strip_tabs;
-static int number __P ((void));
-static int string __P ((void));
-static void line_begin __P ((void));
-static void line_add __P((char *text, size_t len));
-static void line_finish __P ((void));
-static void multiline_begin __P ((void));
-static void multiline_add __P ((char *));
-static void multiline_finish __P ((void));
-static char *multiline_strip_tabs __P((char *text));
-static void ident __P((const char *text));
-static void sieve_include __P((void));
-static void sieve_searchpath __P((void));
-static char *str_unescape __P((char *text, size_t len));
-static int isemptystr __P((char *text));
+static int number (void);
+static int string (void);
+static void line_begin (void);
+static void line_add (char *text, size_t len);
+static void line_finish (void);
+static void multiline_begin (void);
+static void multiline_add (char *);
+static void multiline_finish (void);
+static char *multiline_strip_tabs (char *text);
+static void ident (const char *text);
+static void sieve_include (void);
+static void sieve_searchpath (void);
+static char *str_unescape (char *text, size_t len);
+static int isemptystr (char *text);
#ifdef FLEX_SCANNER
#define xinput() (yyin ? getc(yyin) : EOF)
@@ -82,10 +82,10 @@ static int isemptystr __P((char *text));
#else
/* AT&T Lex */
-static void lex_set_buffer __P((FILE *fp));
-static void lex_delete_buffer __P((LEX_BUFFER_STATE buf));
-static int xinput __P((void));
-static int xunput __P((void));
+static void lex_set_buffer (FILE *fp);
+static void lex_delete_buffer (LEX_BUFFER_STATE buf);
+static int xinput (void);
+static int xunput (void);
#undef unput
#define unput(c) xunput(c)
@@ -206,9 +206,9 @@ struct buffer_ctx {
static struct buffer_ctx *context_stack;
-static struct buffer_ctx *ctx_lookup __P((ino_t ino));
-static int push_source __P((const char *name));
-static int pop_source __P((void));
+static struct buffer_ctx *ctx_lookup (ino_t ino);
+static int push_source (const char *name);
+static int pop_source (void);
struct buffer_ctx *
ctx_lookup (ino_t ino)
diff --git a/libsieve/sieve.y b/libsieve/sieve.y
index ea216e9..7658fe1 100644
--- a/libsieve/sieve.y
+++ b/libsieve/sieve.y
@@ -1,6 +1,6 @@
%{
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
sieve_machine_t sieve_machine;
int sieve_error_count;
-static void branch_fixup __P((size_t start, size_t end));
+static void branch_fixup (size_t start, size_t end);
int yyerror (char *s);
int yylex ();
%}
diff --git a/mail.local/mail.local.h b/mail.local/mail.local.h
index 2e49c16..829fa78 100644
--- a/mail.local/mail.local.h
+++ b/mail.local/mail.local.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -105,12 +105,12 @@ extern char *quotadbname;
extern char *quota_query;
extern int exit_code;
-extern void setgroupquota __P((char *str));
-extern int check_quota __P((char *name, size_t size, size_t *rest));
+extern void setgroupquota (char *str);
+extern int check_quota (char *name, size_t size, size_t *rest);
-int mda __P((mailbox_t mbx, char *username));
-int switch_user_id __P((struct mu_auth_data *auth, int user));
-void mailer_err __P((char *fmt, ...));
+int mda (mailbox_t mbx, char *username);
+int switch_user_id (struct mu_auth_data *auth, int user);
+void mailer_err (char *fmt, ...);
#ifdef WITH_GUILE
struct mda_data
diff --git a/mail.local/main.c b/mail.local/main.c
index 74aea8a..497efc3 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -41,12 +41,12 @@ mu_debug_t mudebug; /* Mailutils debugging object */
#define MAXFD 64
#define EX_QUOTA() (ex_quota_tempfail ? EX_TEMPFAIL : EX_UNAVAILABLE)
-void close_fds __P((void));
-int make_tmp __P((const char *from, mailbox_t *mbx));
-void deliver __P((mailbox_t msg, char *name));
-void guess_retval __P((int ec));
-void mailer_err __P((char *fmt, ...));
-void notify_biff __P((mailbox_t mbox, char *name, size_t size));
+void close_fds (void);
+int make_tmp (const char *from, mailbox_t *mbx);
+void deliver (mailbox_t msg, char *name);
+void guess_retval (int ec);
+void mailer_err (char *fmt, ...);
+void notify_biff (mailbox_t mbox, char *name, size_t size);
const char *program_version = "mail.local (" PACKAGE_STRING ")";
static char doc[] =
diff --git a/mail/alias.c b/mail/alias.c
index 4373c64..3522501 100644
--- a/mail/alias.c
+++ b/mail/alias.c
@@ -18,10 +18,10 @@
#include "mail.h"
-static void alias_print __P ((char *name));
-static void alias_print_group __P ((char *name, list_t list));
-static int alias_create __P ((char *name, list_t *plist));
-static int alias_lookup __P ((char *name, list_t *plist));
+static void alias_print (char *name);
+static void alias_print_group (char *name, list_t list);
+static int alias_create (char *name, list_t *plist);
+static int alias_lookup (char *name, list_t *plist);
/*
* a[lias] [alias [address...]]
@@ -71,10 +71,10 @@ static unsigned int max_rehash = sizeof (hash_size) / sizeof (hash_size[0]);
static alias_t *aliases; /* Table of aliases */
static unsigned int hash_num; /* Index to hash_size table */
-static unsigned int hash __P((char *name));
-static int alias_rehash __P((void));
-static alias_t *alias_lookup_or_install __P((char *name, int install));
-static void alias_print_group __P((char *name, list_t list));
+static unsigned int hash (char *name);
+static int alias_rehash (void);
+static alias_t *alias_lookup_or_install (char *name, int install);
+static void alias_print_group (char *name, list_t list);
unsigned
hash (char *name)
diff --git a/mail/decode.c b/mail/decode.c
index c4ac8a6..9ab54b1 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003,
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 ,
2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
@@ -30,11 +30,11 @@ struct decode_closure
int select_hdr;
};
-static int print_stream __P ((stream_t, FILE *));
-static int display_message __P ((message_t, msgset_t *msgset, void *closure));
-static int display_message0 __P ((message_t, const msgset_t *, int));
-static int get_content_encoding __P ((header_t hdr, char **value));
-static void run_metamail __P((const char *mailcap, message_t mesg));
+static int print_stream (stream_t, FILE *);
+static int display_message (message_t, msgset_t *msgset, void *closure);
+static int display_message0 (message_t, const msgset_t *, int);
+static int get_content_encoding (header_t hdr, char **value);
+static void run_metamail (const char *mailcap, message_t mesg);
int
mail_decode (int argc, char **argv)
diff --git a/mail/folders.c b/mail/folders.c
index 88a376d..2308f9c 100644
--- a/mail/folders.c
+++ b/mail/folders.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ mail_folders (int argc ARG_UNUSED, char **argv ARG_UNUSED)
path = util_fullpath (path);
util_do_command("! %s '%s'", getenv ("LISTER"), path);
- free(path);
+ free (path);
return 0;
}
diff --git a/mail/mail.c b/mail/mail.c
index 33e1b88..f1ce83f 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -495,7 +495,7 @@ main (int argc, char **argv)
void
-mail_mainloop (char *(*input) __P((void *, int)),
+mail_mainloop (char *(*input) (void *, int),
void *closure, int do_history)
{
char *command, *cmd;
diff --git a/mail/mail.h b/mail/mail.h
index bd0176f..1a74535 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -90,7 +90,7 @@ extern "C" {
/* Type definitions */
#ifndef function_t
-typedef int function_t __P ((int, char **));
+typedef int function_t (int, char **);
#endif
/* Values for mail_command_entry.flags */
@@ -123,8 +123,8 @@ struct mail_command_entry
{
MAIL_COMMAND_COMMON_MEMBERS;
int flags;
- int (*func) __PMT ((int, char **));
- char **(*command_completion) __PMT((int argc, char **argv, int ws));
+ int (*func) (int, char **);
+ char **(*command_completion) (int argc, char **argv, int ws);
};
struct mail_escape_entry
@@ -132,7 +132,7 @@ struct mail_escape_entry
const char *shortname;
const char *longname;
const char *synopsis;
- int (*escfunc) __PMT ((int, char **, compose_env_t *));
+ int (*escfunc) (int, char **, compose_env_t *);
};
typedef enum
@@ -169,7 +169,7 @@ struct message_set
message number */
};
-typedef int (*msg_handler_t) __P((msgset_t *mp, message_t mesg, void *data));
+typedef int (*msg_handler_t) (msgset_t *mp, message_t mesg, void *data);
/* Global variables and constants*/
extern mailbox_t mbox;
@@ -179,235 +179,234 @@ extern FILE *ofile;
extern int interactive;
/* Functions */
-extern int mail_alias __P ((int argc, char **argv));
-extern int mail_alt __P ((int argc, char **argv)); /* command alternates */
-extern int mail_cd __P ((int argc, char **argv));
-extern int mail_copy __P ((int argc, char **argv));
-extern int mail_decode __P ((int argc, char **argv));
-extern int mail_delete __P ((int argc, char **argv));
-extern int mail_discard __P ((int argc, char **argv));
-extern int mail_dp __P ((int argc, char **argv));
-extern int mail_echo __P ((int argc, char **argv));
-extern int mail_edit __P ((int argc, char **argv));
-extern int mail_else __P ((int argc, char **argv));
-extern int mail_endif __P ((int argc, char **argv));
-extern int mail_exit __P ((int argc, char **argv));
-extern int mail_file __P ((int argc, char **argv));
-extern int mail_folders __P ((int argc, char **argv));
-extern int mail_followup __P ((int argc, char **argv));
-extern int mail_from __P ((int argc, char **argv));
-extern int mail_from0 __P((msgset_t *mspec, message_t msg, void *data));
-extern int mail_headers __P ((int argc, char **argv));
-extern int mail_hold __P ((int argc, char **argv));
-extern int mail_help __P ((int argc, char **argv));
-extern int mail_if __P ((int argc, char **argv));
-extern int mail_inc __P ((int argc, char **argv));
-extern int mail_list __P ((int argc, char **argv));
-extern int mail_send __P ((int argc, char **argv)); /* command mail */
-extern int mail_mbox __P ((int argc, char **argv));
-extern int mail_next __P ((int argc, char **argv));
-extern int mail_nounfold __P((int argc, char **argv));
-extern int mail_pipe __P ((int argc, char **argv));
-extern int mail_previous __P ((int argc, char **argv));
-extern int mail_print __P ((int argc, char **argv));
-extern int mail_quit __P ((int argc, char **argv));
-extern int mail_reply __P ((int argc, char **argv));
-extern int mail_retain __P ((int argc, char **argv));
-extern int mail_save __P ((int argc, char **argv));
-extern int mail_sendheader __P((int argc, char **argv));
-extern int mail_set __P ((int argc, char **argv));
-extern int mail_shell __P ((int argc, char **argv));
-extern int mail_execute __P((int shell, int argc, char **argv));
-extern int mail_size __P ((int argc, char **argv));
-extern int mail_source __P ((int argc, char **argv));
-extern int mail_summary __P ((int argc, char **argv));
-extern int mail_tag __P ((int argc, char **argv));
-extern int mail_top __P ((int argc, char **argv));
-extern int mail_touch __P ((int argc, char **argv));
-extern int mail_unalias __P ((int argc, char **argv));
-extern int mail_undelete __P ((int argc, char **argv));
-extern int mail_unfold __P((int argc, char **argv));
-extern int mail_unset __P ((int argc, char **argv));
-extern int mail_version __P ((int argc, char **argv));
-extern int mail_visual __P ((int argc, char **argv));
-extern int mail_warranty __P ((int argc, char **argv));
-extern int mail_write __P ((int argc, char **argv));
-extern int mail_z __P ((int argc, char **argv));
-extern int mail_eq __P ((int argc, char **argv)); /* command = */
-extern int mail_setenv __P ((int argc, char **argv));
-
-extern int if_cond __P ((void));
-
-extern void mail_mainloop __P ((char *(*input) __P((void *, int)), void *closure, int do_history));
-extern int mail_copy0 __P ((int argc, char **argv, int mark));
-extern int mail_send0 __P ((compose_env_t *env, int save_to));
-extern void free_env_headers __P ((compose_env_t *env));
-
-/*extern void print_message __P((message_t mesg, char *prefix, int all_headers, FILE *file));*/
-
-extern int mail_mbox_commit __P ((void));
-extern int mail_is_my_name __P ((char *name));
-extern void mail_set_my_name __P ((char *name));
-extern char *mail_whoami __P ((void));
-extern int mail_header_is_visible __P ((char *str));
-extern int mail_header_is_unfoldable __P((char *str));
-extern int mail_mbox_close __P ((void));
-extern char *mail_expand_name __P((const char *name));
-
-extern void send_append_header __P((char *text));
-extern void send_append_header2 __P((char *name, char *value, int mode));
-
-extern int escape_shell __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_command __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_help __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_sign __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_bcc __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_cc __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_deadletter __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_editor __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_print __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_headers __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_insert __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_quote __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_type_input __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_read __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_subj __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_to __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_visual __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_write __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_exit __P ((int argc, char **argv, compose_env_t *env));
-extern int escape_pipe __P ((int argc, char **argv, compose_env_t *env));
+extern int mail_alias (int argc, char **argv);
+extern int mail_alt (int argc, char **argv); /* command alternates */
+extern int mail_cd (int argc, char **argv);
+extern int mail_copy (int argc, char **argv);
+extern int mail_decode (int argc, char **argv);
+extern int mail_delete (int argc, char **argv);
+extern int mail_discard (int argc, char **argv);
+extern int mail_dp (int argc, char **argv);
+extern int mail_echo (int argc, char **argv);
+extern int mail_edit (int argc, char **argv);
+extern int mail_else (int argc, char **argv);
+extern int mail_endif (int argc, char **argv);
+extern int mail_exit (int argc, char **argv);
+extern int mail_file (int argc, char **argv);
+extern int mail_folders (int argc, char **argv);
+extern int mail_followup (int argc, char **argv);
+extern int mail_from (int argc, char **argv);
+extern int mail_from0 (msgset_t *mspec, message_t msg, void *data);
+extern int mail_headers (int argc, char **argv);
+extern int mail_hold (int argc, char **argv);
+extern int mail_help (int argc, char **argv);
+extern int mail_if (int argc, char **argv);
+extern int mail_inc (int argc, char **argv);
+extern int mail_list (int argc, char **argv);
+extern int mail_send (int argc, char **argv); /* command mail */
+extern int mail_mbox (int argc, char **argv);
+extern int mail_next (int argc, char **argv);
+extern int mail_nounfold (int argc, char **argv);
+extern int mail_pipe (int argc, char **argv);
+extern int mail_previous (int argc, char **argv);
+extern int mail_print (int argc, char **argv);
+extern int mail_quit (int argc, char **argv);
+extern int mail_reply (int argc, char **argv);
+extern int mail_retain (int argc, char **argv);
+extern int mail_save (int argc, char **argv);
+extern int mail_sendheader (int argc, char **argv);
+extern int mail_set (int argc, char **argv);
+extern int mail_shell (int argc, char **argv);
+extern int mail_execute (int shell, int argc, char **argv);
+extern int mail_size (int argc, char **argv);
+extern int mail_source (int argc, char **argv);
+extern int mail_summary (int argc, char **argv);
+extern int mail_tag (int argc, char **argv);
+extern int mail_top (int argc, char **argv);
+extern int mail_touch (int argc, char **argv);
+extern int mail_unalias (int argc, char **argv);
+extern int mail_undelete (int argc, char **argv);
+extern int mail_unfold (int argc, char **argv);
+extern int mail_unset (int argc, char **argv);
+extern int mail_version (int argc, char **argv);
+extern int mail_visual (int argc, char **argv);
+extern int mail_warranty (int argc, char **argv);
+extern int mail_write (int argc, char **argv);
+extern int mail_z (int argc, char **argv);
+extern int mail_eq (int argc, char **argv); /* command = */
+extern int mail_setenv (int argc, char **argv);
+
+extern int if_cond (void);
+
+extern void mail_mainloop (char *(*input) (void *, int), void *closure, int do_history);
+extern int mail_copy0 (int argc, char **argv, int mark);
+extern int mail_send0 (compose_env_t *env, int save_to);
+extern void free_env_headers (compose_env_t *env);
+
+/*extern void print_message (message_t mesg, char *prefix, int all_headers, FILE *file);*/
+
+extern int mail_mbox_commit (void);
+extern int mail_is_my_name (char *name);
+extern void mail_set_my_name (char *name);
+extern char *mail_whoami (void);
+extern int mail_header_is_visible (char *str);
+extern int mail_header_is_unfoldable (char *str);
+extern int mail_mbox_close (void);
+extern char *mail_expand_name (const char *name);
+
+extern void send_append_header (char *text);
+extern void send_append_header2 (char *name, char *value, int mode);
+
+extern int escape_shell (int argc, char **argv, compose_env_t *env);
+extern int escape_command (int argc, char **argv, compose_env_t *env);
+extern int escape_help (int argc, char **argv, compose_env_t *env);
+extern int escape_sign (int argc, char **argv, compose_env_t *env);
+extern int escape_bcc (int argc, char **argv, compose_env_t *env);
+extern int escape_cc (int argc, char **argv, compose_env_t *env);
+extern int escape_deadletter (int argc, char **argv, compose_env_t *env);
+extern int escape_editor (int argc, char **argv, compose_env_t *env);
+extern int escape_print (int argc, char **argv, compose_env_t *env);
+extern int escape_headers (int argc, char **argv, compose_env_t *env);
+extern int escape_insert (int argc, char **argv, compose_env_t *env);
+extern int escape_quote (int argc, char **argv, compose_env_t *env);
+extern int escape_type_input (int argc, char **argv, compose_env_t *env);
+extern int escape_read (int argc, char **argv, compose_env_t *env);
+extern int escape_subj (int argc, char **argv, compose_env_t *env);
+extern int escape_to (int argc, char **argv, compose_env_t *env);
+extern int escape_visual (int argc, char **argv, compose_env_t *env);
+extern int escape_write (int argc, char **argv, compose_env_t *env);
+extern int escape_exit (int argc, char **argv, compose_env_t *env);
+extern int escape_pipe (int argc, char **argv, compose_env_t *env);
/* Cursor */
-extern void set_cursor __P ((unsigned value));
-extern size_t get_cursor __P ((void));
-extern void page_invalidate __P ((int hard));
+extern void set_cursor (unsigned value);
+extern size_t get_cursor (void);
+extern void page_invalidate (int hard);
extern void cond_page_invalidate (size_t value);
-extern void page_do __P ((msg_handler_t func, void *data));
-extern size_t page_move __P ((off_t offset));
-extern int is_current_message __P ((size_t n));
+extern void page_do (msg_handler_t func, void *data);
+extern size_t page_move (off_t offset);
+extern int is_current_message (size_t n);
/* msgsets */
-extern void msgset_free __P ((msgset_t *msg_set));
-extern msgset_t *msgset_make_1 __P ((size_t number));
-extern msgset_t *msgset_append __P ((msgset_t *one, msgset_t *two));
-extern msgset_t *msgset_range __P ((int low, int high));
-extern msgset_t *msgset_expand __P ((msgset_t *set, msgset_t *expand_by));
-extern msgset_t *msgset_dup __P ((const msgset_t *set));
-extern int msgset_parse __P ((const int argc, char **argv,
- int flags, msgset_t **mset));
-extern int msgset_member __P ((msgset_t *set, size_t n));
-extern msgset_t *msgset_negate __P((msgset_t *set));
-extern size_t msgset_count __P((msgset_t *set));
-
-extern int util_do_command __P ((const char *cmd, ...));
-
-extern int util_foreach_msg __P((int argc, char **argv, int flags,
- msg_handler_t func, void *data));
-extern size_t util_range_msg __P((size_t low, size_t high, int flags,
- msg_handler_t func, void *data));
-
-extern function_t* util_command_get __P ((const char *cmd));
-extern char *util_stripwhite __P ((char *string));
-
-extern void *util_find_entry __P((void *table, size_t nmemb, size_t size,
- const char *cmd));
-extern int util_help __P((void *table, size_t nmemb, size_t size, const char *word));
-extern int util_command_list __P((void *table, size_t nmemb, size_t size));
-
-extern const struct mail_command_entry *mail_find_command __P((const char *cmd));
-extern const struct mail_escape_entry *mail_find_escape __P((const char *cmd));
-extern int mail_command_help __P((const char *command));
-extern int mail_escape_help __P((const char *command));
-extern void mail_command_list __P((void));
-extern const struct mail_command *mail_command_name __P((int i));
-
-extern int util_getcols __P ((void));
-extern int util_getlines __P ((void));
-extern int util_screen_lines __P ((void));
-extern int util_screen_columns __P ((void));
-extern int util_get_crt __P((void));
-extern struct mail_env_entry *util_find_env __P ((const char *var,
- int create));
-extern int util_getenv __P ((void *ptr, const char *variable,
- mail_env_data_t type, int warn));
-
-extern int util_printenv __P ((int set));
-extern int util_setenv __P ((const char *name, void *value,
- mail_env_data_t type, int overwrite));
-extern int util_isdeleted __P ((size_t msgno));
-extern char *util_get_homedir __P ((void));
-extern char *util_fullpath __P ((const char *inpath));
-extern char *util_folder_path __P((const char *name));
-extern char *util_get_sender __P ((int msgno, int strip));
-
-extern void util_slist_print __P ((list_t list, int nl));
-extern int util_slist_lookup __P ((list_t list, char *str));
-extern void util_slist_add __P ((list_t *list, char *value));
-extern void util_slist_remove __P((list_t *list, char *value));
-extern void util_slist_destroy __P ((list_t *list));
-extern char *util_slist_to_string __P ((list_t list, const char *delim));
-extern void util_strcat __P ((char **dest, const char *str));
-extern void util_strupper __P ((char *str));
-extern void util_escape_percent __P ((char **str));
-extern char *util_outfolder_name __P ((char *str));
-extern void util_save_outgoing __P ((message_t msg, char *savefile));
-extern void util_error __P ((const char *format, ...));
-extern int util_error_range __P ((size_t msgno));
-extern void util_noapp __P ((void));
-extern int util_tempfile __P ((char **namep));
-extern void util_msgset_iterate __P ((msgset_t *msgset, int (*fun) __P ((message_t, msgset_t *, void *)), void *closure));
-extern int util_get_content_type __P ((header_t hdr, char **value));
-extern int util_get_hdr_value __P ((header_t hdr, const char *name, char **value));
-extern int util_merge_addresses __P((char **addr_str, const char *value));
-extern int util_header_expand __P((header_t *hdr));
-extern int util_get_message __P((mailbox_t mbox, size_t msgno,
- message_t *msg));
-void util_cache_command __P((list_t *list, const char *fmt, ...));
-void util_run_cached_commands __P((list_t *list));
-const char *util_reply_prefix __P((void));
-void util_rfc2047_decode __P((char **value));
-
-void util_mark_read __P((message_t msg));
-
-extern int ml_got_interrupt __P ((void));
-extern void ml_clear_interrupt __P ((void));
-extern void ml_readline_init __P ((void));
-extern int ml_reread __P ((const char *prompt, char **text));
-extern char *ml_readline __P((char *prompt));
-extern char *ml_readline_with_intr __P((char *prompt));
-
-extern char *alias_expand __P ((char *name));
-extern void alias_destroy __P ((char *name));
+extern void msgset_free (msgset_t *msg_set);
+extern msgset_t *msgset_make_1 (size_t number);
+extern msgset_t *msgset_append (msgset_t *one, msgset_t *two);
+extern msgset_t *msgset_range (int low, int high);
+extern msgset_t *msgset_expand (msgset_t *set, msgset_t *expand_by);
+extern msgset_t *msgset_dup (const msgset_t *set);
+extern int msgset_parse (const int argc, char **argv,
+ int flags, msgset_t **mset);
+extern int msgset_member (msgset_t *set, size_t n);
+extern msgset_t *msgset_negate (msgset_t *set);
+extern size_t msgset_count (msgset_t *set);
+
+extern int util_do_command (const char *cmd, ...);
+
+extern int util_foreach_msg (int argc, char **argv, int flags,
+ msg_handler_t func, void *data);
+extern size_t util_range_msg (size_t low, size_t high, int flags,
+ msg_handler_t func, void *data);
+
+extern function_t* util_command_get (const char *cmd);
+extern char *util_stripwhite (char *string);
+
+extern void *util_find_entry (void *table, size_t nmemb, size_t size,
+ const char *cmd);
+extern int util_help (void *table, size_t nmemb, size_t size, const char *word);
+extern int util_command_list (void *table, size_t nmemb, size_t size);
+
+extern const struct mail_command_entry *mail_find_command (const char *cmd);
+extern const struct mail_escape_entry *mail_find_escape (const char *cmd);
+extern int mail_command_help (const char *command);
+extern int mail_escape_help (const char *command);
+extern void mail_command_list (void);
+extern const struct mail_command *mail_command_name (int i);
+
+extern int util_getcols (void);
+extern int util_getlines (void);
+extern int util_screen_lines (void);
+extern int util_screen_columns (void);
+extern int util_get_crt (void);
+extern struct mail_env_entry *util_find_env (const char *var, int create);
+extern int util_getenv (void *ptr, const char *variable,
+ mail_env_data_t type, int warn);
+
+extern int util_printenv (int set);
+extern int util_setenv (const char *name, void *value,
+ mail_env_data_t type, int overwrite);
+extern int util_isdeleted (size_t msgno);
+extern char *util_get_homedir (void);
+extern char *util_fullpath (const char *inpath);
+extern char *util_folder_path (const char *name);
+extern char *util_get_sender (int msgno, int strip);
+
+extern void util_slist_print (list_t list, int nl);
+extern int util_slist_lookup (list_t list, char *str);
+extern void util_slist_add (list_t *list, char *value);
+extern void util_slist_remove (list_t *list, char *value);
+extern void util_slist_destroy (list_t *list);
+extern char *util_slist_to_string (list_t list, const char *delim);
+extern void util_strcat (char **dest, const char *str);
+extern void util_strupper (char *str);
+extern void util_escape_percent (char **str);
+extern char *util_outfolder_name (char *str);
+extern void util_save_outgoing (message_t msg, char *savefile);
+extern void util_error (const char *format, ...);
+extern int util_error_range (size_t msgno);
+extern void util_noapp (void);
+extern int util_tempfile (char **namep);
+extern void util_msgset_iterate (msgset_t *msgset,
+ int (*fun) (message_t, msgset_t *, void *),
+ void *closure);
+extern int util_get_content_type (header_t hdr, char **value);
+extern int util_get_hdr_value (header_t hdr, const char *name, char **value);
+extern int util_merge_addresses (char **addr_str, const char *value);
+extern int util_header_expand (header_t *hdr);
+extern int util_get_message (mailbox_t mbox, size_t msgno, message_t *msg);
+void util_cache_command (list_t *list, const char *fmt, ...);
+void util_run_cached_commands (list_t *list);
+const char *util_reply_prefix (void);
+void util_rfc2047_decode (char **value);
+
+void util_mark_read (message_t msg);
+
+extern int ml_got_interrupt (void);
+extern void ml_clear_interrupt (void);
+extern void ml_readline_init (void);
+extern int ml_reread (const char *prompt, char **text);
+extern char *ml_readline (char *prompt);
+extern char *ml_readline_with_intr (char *prompt);
+
+extern char *alias_expand (char *name);
+extern void alias_destroy (char *name);
typedef struct alias_iterator *alias_iterator_t;
-extern char *alias_find_first __P ((const char *prefix, alias_iterator_t *itr));
-extern const char *alias_iterate_next __P ((alias_iterator_t itr));
-extern const char *alias_iterate_first __P ((const char *p, alias_iterator_t *itr));
-extern void alias_iterate_end __P ((alias_iterator_t *itr));
+extern char *alias_find_first (const char *prefix, alias_iterator_t *itr);
+extern const char *alias_iterate_next (alias_iterator_t itr);
+extern const char *alias_iterate_first (const char *p, alias_iterator_t *itr);
+extern void alias_iterate_end (alias_iterator_t *itr);
-extern int mail_sender __P ((int argc, char **argv));
-extern int mail_nosender __P ((int argc, char **argv));
-extern address_t get_sender_address __P((message_t msg));
+extern int mail_sender (int argc, char **argv);
+extern int mail_nosender (int argc, char **argv);
+extern address_t get_sender_address (message_t msg);
typedef struct var_iterator *var_iterator_t;
-extern const char *var_iterate_next __P ((var_iterator_t itr));
-extern const char *var_iterate_first __P ((const char *prefix, var_iterator_t *pitr));
-extern void var_iterate_end __P ((var_iterator_t *itr));
+extern const char *var_iterate_next (var_iterator_t itr);
+extern const char *var_iterate_first (const char *prefix, var_iterator_t *pitr);
+extern void var_iterate_end (var_iterator_t *itr);
#define COMPOSE_APPEND 0
#define COMPOSE_REPLACE 1
#define COMPOSE_SINGLE_LINE 2
-void compose_init __P((compose_env_t *env));
-int compose_header_set __P((compose_env_t *env, char *name,
- char *value, int replace));
-char *compose_header_get __P((compose_env_t *env, char *name,
- char *defval));
-void compose_destroy __P((compose_env_t *env));
+void compose_init (compose_env_t *env);
+int compose_header_set (compose_env_t *env, char *name,
+ char *value, int replace);
+char *compose_header_get (compose_env_t *env, char *name, char *defval);
+void compose_destroy (compose_env_t *env);
#ifndef HAVE_READLINE_READLINE_H
-extern char *readline __P ((char *prompt));
+extern char *readline (char *prompt);
#endif
#ifndef _PATH_SENDMAIL
diff --git a/mail/mailline.c b/mail/mailline.c
index 8cb6aa6..664f1ad 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -20,8 +20,8 @@
#include <mailutils/folder.h>
#ifdef WITH_READLINE
-static char **ml_command_completion __P((char *cmd, int start, int end));
-static char *ml_command_generator __P((const char *text, int state));
+static char **ml_command_completion (char *cmd, int start, int end);
+static char *ml_command_generator (const char *text, int state);
#endif
static volatile int _interrupted;
diff --git a/mail/msgset.y b/mail/msgset.y
index 080ade3..a8011cf 100644
--- a/mail/msgset.y
+++ b/mail/msgset.y
@@ -40,18 +40,18 @@ struct header_data
char *expr;
};
-static msgset_t *msgset_select __P ((int (*sel) __P ((message_t, void *)),
+static msgset_t *msgset_select (int (*sel) (message_t, void *),
void *closure, int rev,
- unsigned int max_matches));
-static int select_header __P ((message_t msg, void *closure));
-static int select_body __P ((message_t msg, void *closure));
-static int select_type __P ((message_t msg, void *closure));
-static int select_sender __P ((message_t msg, void *closure));
-static int select_deleted __P ((message_t msg, void *closure));
-static int check_set __P ((msgset_t **pset));
+ unsigned int max_matches);
+static int select_header (message_t msg, void *closure);
+static int select_body (message_t msg, void *closure);
+static int select_type (message_t msg, void *closure);
+static int select_sender (message_t msg, void *closure);
+static int select_deleted (message_t msg, void *closure);
+static int check_set (msgset_t **pset);
-int yyerror __P ((const char *));
-int yylex __P ((void));
+int yyerror (const char *);
+int yylex (void);
static int msgset_flags = MSG_NODELETED;
static msgset_t *result;
@@ -514,7 +514,7 @@ msgset_expand (msgset_t *set, msgset_t *expand_by)
}
msgset_t *
-msgset_select (int (*sel) __P ((message_t, void *)), void *closure, int rev,
+msgset_select (int (*sel) (message_t, void *), void *closure, int rev,
unsigned int max_matches)
{
size_t i, match_count = 0;
diff --git a/mail/send.c b/mail/send.c
index b73738f..6e54643 100644
--- a/mail/send.c
+++ b/mail/send.c
@@ -23,8 +23,8 @@
#include "mail.h"
-static int isfilename __P ((const char *));
-static void msg_to_pipe __P ((const char *cmd, message_t msg));
+static int isfilename (const char *);
+static void msg_to_pipe (const char *cmd, message_t msg);
/* Additional message headers */
diff --git a/mail/util.c b/mail/util.c
index f2f4241..8ab67b2 100644
--- a/mail/util.c
+++ b/mail/util.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003,
+ Copyright (C) 1999, 2000, 2001, 2002, 2003,
2004, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
@@ -1146,7 +1146,7 @@ util_descend_subparts (message_t mesg, msgset_t *msgset, message_t *part)
void
util_msgset_iterate (msgset_t *msgset,
- int (*fun) __P ((message_t, msgset_t *, void *)),
+ int (*fun) (message_t, msgset_t *, void *),
void *closure)
{
for (; msgset; msgset = msgset->next)
diff --git a/mailbox/amd.c b/mailbox/amd.c
index 6696144..f44b7ef 100644
--- a/mailbox/amd.c
+++ b/mailbox/amd.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003,
+ Copyright (C) 1999, 2000, 2001, 2002, 2003,
2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
@@ -70,49 +70,49 @@
#include <url0.h>
#include <amd.h>
-static void amd_destroy __P((mailbox_t mailbox));
-static int amd_open __P ((mailbox_t, int));
-static int amd_close __P ((mailbox_t));
-static int amd_get_message __P ((mailbox_t, size_t, message_t *));
-static int amd_append_message __P ((mailbox_t, message_t));
-static int amd_messages_count __P ((mailbox_t, size_t *));
-static int amd_messages_recent __P ((mailbox_t, size_t *));
-static int amd_message_unseen __P ((mailbox_t, size_t *));
-static int amd_expunge __P ((mailbox_t));
-static int amd_save_attributes __P ((mailbox_t));
-static int amd_uidnext __P((mailbox_t mailbox, size_t *puidnext));
-static int amd_uidvalidity __P ((mailbox_t, unsigned long *));
-static int amd_scan __P ((mailbox_t, size_t, size_t *));
-static int amd_is_updated __P ((mailbox_t));
-static int amd_get_size __P ((mailbox_t, off_t *));
-
-static int amd_body_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int amd_body_readline __P ((stream_t, char *, size_t, off_t, size_t *));
-static int amd_stream_size __P ((stream_t stream, off_t *psize));
-
-static int amd_body_size __P ((body_t body, size_t *psize));
-static int amd_body_lines __P ((body_t body, size_t *plines));
-
-static int amd_header_fill __P((header_t header, char *buffer, size_t len,
- off_t off, size_t *pnread));
-static int amd_header_size __P((header_t header, size_t *psize));
-static int amd_header_lines __P((header_t header, size_t *plines));
-
-static int amd_get_attr_flags __P((attribute_t attr, int *pflags));
-static int amd_set_attr_flags __P((attribute_t attr, int flags));
-static int amd_unset_attr_flags __P((attribute_t attr, int flags));
-
-static void _amd_message_delete __P((struct _amd_data *amd,
- struct _amd_message *msg));
-static int amd_pool_open __P((struct _amd_message *mhm));
-static int amd_pool_open_count __P((struct _amd_data *amd));
+static void amd_destroy (mailbox_t mailbox);
+static int amd_open (mailbox_t, int);
+static int amd_close (mailbox_t);
+static int amd_get_message (mailbox_t, size_t, message_t *);
+static int amd_append_message (mailbox_t, message_t);
+static int amd_messages_count (mailbox_t, size_t *);
+static int amd_messages_recent (mailbox_t, size_t *);
+static int amd_message_unseen (mailbox_t, size_t *);
+static int amd_expunge (mailbox_t);
+static int amd_save_attributes (mailbox_t);
+static int amd_uidnext (mailbox_t mailbox, size_t *puidnext);
+static int amd_uidvalidity (mailbox_t, unsigned long *);
+static int amd_scan (mailbox_t, size_t, size_t *);
+static int amd_is_updated (mailbox_t);
+static int amd_get_size (mailbox_t, off_t *);
+
+static int amd_body_read (stream_t, char *, size_t, off_t, size_t *);
+static int amd_body_readline (stream_t, char *, size_t, off_t, size_t *);
+static int amd_stream_size (stream_t stream, off_t *psize);
+
+static int amd_body_size (body_t body, size_t *psize);
+static int amd_body_lines (body_t body, size_t *plines);
+
+static int amd_header_fill (header_t header, char *buffer, size_t len,
+ off_t off, size_t *pnread);
+static int amd_header_size (header_t header, size_t *psize);
+static int amd_header_lines (header_t header, size_t *plines);
+
+static int amd_get_attr_flags (attribute_t attr, int *pflags);
+static int amd_set_attr_flags (attribute_t attr, int flags);
+static int amd_unset_attr_flags (attribute_t attr, int flags);
+
+static void _amd_message_delete (struct _amd_data *amd,
+ struct _amd_message *msg);
+static int amd_pool_open (struct _amd_message *mhm);
+static int amd_pool_open_count (struct _amd_data *amd);
static void amd_pool_flush (struct _amd_data *amd);
-static struct _amd_message **amd_pool_lookup __P((struct _amd_message *mhm));
+static struct _amd_message **amd_pool_lookup (struct _amd_message *mhm);
-static int amd_envelope_date __P((envelope_t envelope, char *buf, size_t len,
- size_t *psize));
-static int amd_envelope_sender __P((envelope_t envelope, char *buf, size_t len,
- size_t *psize));
+static int amd_envelope_date (envelope_t envelope, char *buf, size_t len,
+ size_t *psize);
+static int amd_envelope_sender (envelope_t envelope, char *buf, size_t len,
+ size_t *psize);
/* Operations on message array */
diff --git a/mailbox/attribute.c b/mailbox/attribute.c
index 6af9c9c..048e6b4 100644
--- a/mailbox/attribute.c
+++ b/mailbox/attribute.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
#include <mailutils/errno.h>
#include <attribute0.h>
-static int flags_to_string __P ((int, char *, size_t, size_t *));
+static int flags_to_string (int, char *, size_t, size_t *);
int
attribute_create (attribute_t *pattr, void *owner)
diff --git a/mailbox/auth.c b/mailbox/auth.c
index 3491067..79d0139 100644
--- a/mailbox/auth.c
+++ b/mailbox/auth.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -117,7 +117,7 @@ struct auth_cb
static int
try_auth (void *item, void *data)
{
- int (*authenticate) __P ((authority_t)) = item;
+ int (*authenticate) (authority_t) = item;
struct auth_cb *cb = data;
if (authenticate (cb->authority) == 0)
{
@@ -143,7 +143,7 @@ authority_authenticate (authority_t authority)
int
authority_set_authenticate (authority_t authority,
- int (*_authenticate) __P ((authority_t)),
+ int (*_authenticate) (authority_t),
void *owner)
{
if (authority == NULL)
diff --git a/mailbox/body.c b/mailbox/body.c
index 17a660e..4d6b0e7 100644
--- a/mailbox/body.c
+++ b/mailbox/body.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -36,19 +36,19 @@
#define BODY_MODIFIED 0x10000
-static int _body_flush __P ((stream_t));
-static int _body_get_transport2 __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int _body_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int _body_readline __P ((stream_t, char *, size_t, off_t, size_t *));
-static int _body_truncate __P ((stream_t, off_t));
-static int _body_size __P ((stream_t, off_t *));
-static int _body_write __P ((stream_t, const char *, size_t, off_t, size_t *));
+static int _body_flush (stream_t);
+static int _body_get_transport2 (stream_t, mu_transport_t *, mu_transport_t *);
+static int _body_read (stream_t, char *, size_t, off_t, size_t *);
+static int _body_readline (stream_t, char *, size_t, off_t, size_t *);
+static int _body_truncate (stream_t, off_t);
+static int _body_size (stream_t, off_t *);
+static int _body_write (stream_t, const char *, size_t, off_t, size_t *);
/* Our own defaults for the body. */
-static int _body_get_size __P ((body_t, size_t *));
-static int _body_get_lines __P ((body_t, size_t *));
-static int _body_get_size0 __P ((stream_t, size_t *));
-static int _body_get_lines0 __P ((stream_t, size_t *));
+static int _body_get_size (body_t, size_t *);
+static int _body_get_lines (body_t, size_t *);
+static int _body_get_size0 (stream_t, size_t *);
+static int _body_get_lines0 (stream_t, size_t *);
int
body_create (body_t *pbody, void *owner)
@@ -193,7 +193,7 @@ body_set_stream (body_t body, stream_t stream, void *owner)
}
int
-body_set_lines (body_t body, int (*_lines)__P ((body_t, size_t *)), void *owner)
+body_set_lines (body_t body, int (*_lines) (body_t, size_t *), void *owner)
{
if (body == NULL)
return EINVAL;
diff --git a/mailbox/debug.c b/mailbox/debug.c
index 81fbb54..3325fc4 100644
--- a/mailbox/debug.c
+++ b/mailbox/debug.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -83,7 +83,7 @@ mu_debug_get_level (mu_debug_t debug, size_t *plevel)
int
mu_debug_set_print (mu_debug_t debug,
- int (*_print) __P ((mu_debug_t, size_t, const char *, va_list)),
+ int (*_print) (mu_debug_t, size_t, const char *, va_list),
void *owner)
{
if (debug == NULL)
diff --git a/mailbox/envelope.c b/mailbox/envelope.c
index 8c859fd..d289bef 100644
--- a/mailbox/envelope.c
+++ b/mailbox/envelope.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -62,7 +62,7 @@ envelope_get_owner (envelope_t envelope)
int
envelope_set_sender (envelope_t envelope,
- int (*_sender) __P ((envelope_t, char *, size_t, size_t*)),
+ int (*_sender) (envelope_t, char *, size_t, size_t*),
void *owner)
{
if (envelope == NULL)
@@ -89,7 +89,7 @@ envelope_sender (envelope_t envelope, char *buf, size_t len, size_t *pnwrite)
int
envelope_set_date (envelope_t envelope,
- int (*_date) __P ((envelope_t, char *, size_t , size_t *)),
+ int (*_date) (envelope_t, char *, size_t , size_t *),
void *owner)
{
if (envelope == NULL)
diff --git a/mailbox/filter.c b/mailbox/filter.c
index 7614893..95bafb8 100644
--- a/mailbox/filter.c
+++ b/mailbox/filter.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -163,7 +163,7 @@ filter_create (stream_t *pstream, stream_t stream, const char *name,
{
iterator_t iterator = NULL;
filter_record_t filter_record = NULL;
- int (*f_init) __P ((filter_t)) = NULL;
+ int (*f_init) (filter_t) = NULL;
int found = 0;
int status;
list_t list = NULL;
diff --git a/mailbox/filter_rfc822.c b/mailbox/filter_rfc822.c
index 7f34709..88ddbc7 100644
--- a/mailbox/filter_rfc822.c
+++ b/mailbox/filter_rfc822.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -30,11 +30,11 @@
#include <filter0.h>
-static int rfc822_init __P ((filter_t));
-static void rfc822_destroy __P ((filter_t));
-static int rfc822_read __P ((filter_t, char *, size_t, off_t, size_t *));
-static int rfc822_readline __P ((filter_t, char *, size_t, off_t, size_t *));
-static int rfc822_read0 __P ((filter_t, char *, size_t, off_t, size_t *, int));
+static int rfc822_init (filter_t);
+static void rfc822_destroy (filter_t);
+static int rfc822_read (filter_t, char *, size_t, off_t, size_t *);
+static int rfc822_readline (filter_t, char *, size_t, off_t, size_t *);
+static int rfc822_read0 (filter_t, char *, size_t, off_t, size_t *, int);
struct rfc822
{
diff --git a/mailbox/filter_trans.c b/mailbox/filter_trans.c
index 0a98cef..66aeac7 100644
--- a/mailbox/filter_trans.c
+++ b/mailbox/filter_trans.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -56,8 +56,8 @@ struct _trans_stream
int w_whd; /* Working buffer write ahead */
char w_buf[MU_TRANS_BSIZE]; /* working source/dest buffer */
- int (*transcoder) __P ((const char *iptr, size_t isize, char *optr,
- size_t osize, size_t *nbytes, int *line_len));
+ int (*transcoder) (const char *iptr, size_t isize, char *optr,
+ size_t osize, size_t *nbytes, int *line_len);
};
static void
diff --git a/mailbox/folder.c b/mailbox/folder.c
index 2c2491b..1150c6e 100644
--- a/mailbox/folder.c
+++ b/mailbox/folder.c
@@ -39,7 +39,7 @@
/* Internal folder list. */
static list_t known_folder_list;
-static int is_known_folder __P ((url_t, folder_t *));
+static int is_known_folder (url_t, folder_t *);
/* Static folder lock. */
static struct _monitor folder_lock = MU_MONITOR_INITIALIZER;
@@ -63,8 +63,8 @@ folder_create (folder_t *pfolder, const char *name)
implementation that could match the URL. */
if (registrar_lookup (name, &record, MU_FOLDER_ATTRIBUTE_DIRECTORY))
{
- int (*f_init) __P ((folder_t)) = NULL;
- int (*u_init) __P ((url_t)) = NULL;
+ int (*f_init) (folder_t) = NULL;
+ int (*u_init) (url_t) = NULL;
record_get_folder (record, &f_init);
record_get_url (record, &u_init);
diff --git a/mailbox/header.c b/mailbox/header.c
index d0c93e8..222f29e 100644
--- a/mailbox/header.c
+++ b/mailbox/header.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -38,13 +38,12 @@
#define HEADER_MODIFIED 1
-static int header_parse __P ((header_t, const char *, int));
-static int header_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int header_readline __P ((stream_t, char *, size_t, off_t, size_t *));
-static int header_write __P ((stream_t, const char *, size_t, off_t,
- size_t *));
-static int fill_blurb __P ((header_t));
-static void header_free_cache __P ((header_t));
+static int header_parse (header_t, const char *, int);
+static int header_read (stream_t, char *, size_t, off_t, size_t *);
+static int header_readline (stream_t, char *, size_t, off_t, size_t *);
+static int header_write (stream_t, const char *, size_t, off_t, size_t *);
+static int fill_blurb (header_t);
+static void header_free_cache (header_t);
int
header_create (header_t *ph, const char *blurb, size_t len, void *owner)
@@ -894,9 +893,9 @@ header_size (header_t header, size_t *psize)
}
int
-header_set_get_fvalue (header_t header, int (*_get_fvalue)
- __P ((header_t, const char *, char *, size_t,
- size_t *)), void *owner)
+header_set_get_fvalue (header_t header,
+ int (*_get_fvalue) (header_t, const char *, char *, size_t, size_t *),
+ void *owner)
{
if (header == NULL)
return EINVAL;
@@ -908,7 +907,7 @@ header_set_get_fvalue (header_t header, int (*_get_fvalue)
int
header_set_get_value (header_t header, int (*_get_value)
- __P ((header_t, const char *, char *, size_t, size_t *)),
+ (header_t, const char *, char *, size_t, size_t *),
void *owner)
{
if (header == NULL)
@@ -945,7 +944,7 @@ header_set_stream (header_t header, stream_t stream, void *owner)
int
header_set_fill (header_t header, int
- (*_fill) __P ((header_t, char *, size_t, off_t, size_t *)),
+ (*_fill) (header_t, char *, size_t, off_t, size_t *),
void *owner)
{
if (header == NULL)
diff --git a/mailbox/imap/folder.c b/mailbox/imap/folder.c
index cd688a7..b210fd6 100644
--- a/mailbox/imap/folder.c
+++ b/mailbox/imap/folder.c
@@ -83,59 +83,59 @@ static struct _record _imap_record =
record_t imap_record = &_imap_record;
#ifndef HAVE_STRTOK_R
-char *strtok_r __P ((char *, const char *, char **));
+char *strtok_r (char *, const char *, char **);
#endif
/* Concrete folder_t IMAP implementation. */
-static int folder_imap_open __P ((folder_t, int));
-static int folder_imap_close __P ((folder_t));
-static void folder_imap_destroy __P ((folder_t));
-static int folder_imap_delete __P ((folder_t, const char *));
-static int folder_imap_list __P ((folder_t, const char *, const char *,
- struct folder_list *));
-static int folder_imap_lsub __P ((folder_t, const char *, const char *,
- struct folder_list *));
-static int folder_imap_rename __P ((folder_t, const char *,
- const char *));
-static int folder_imap_subscribe __P ((folder_t, const char *));
-static int folder_imap_unsubscribe __P ((folder_t, const char *));
-static int folder_imap_get_authority __P ((folder_t, authority_t *));
+static int folder_imap_open (folder_t, int);
+static int folder_imap_close (folder_t);
+static void folder_imap_destroy (folder_t);
+static int folder_imap_delete (folder_t, const char *);
+static int folder_imap_list (folder_t, const char *, const char *,
+ struct folder_list *);
+static int folder_imap_lsub (folder_t, const char *, const char *,
+ struct folder_list *);
+static int folder_imap_rename (folder_t, const char *,
+ const char *);
+static int folder_imap_subscribe (folder_t, const char *);
+static int folder_imap_unsubscribe (folder_t, const char *);
+static int folder_imap_get_authority (folder_t, authority_t *);
/* FETCH */
-static int imap_fetch __P ((f_imap_t));
-static int imap_rfc822 __P ((f_imap_t, char **));
-static int imap_rfc822_size __P ((f_imap_t, char **));
-static int imap_rfc822_header __P ((f_imap_t, char **));
-static int imap_rfc822_text __P ((f_imap_t, char **));
-static int imap_fetch_flags __P ((f_imap_t, char **));
-static int imap_permanentflags __P ((f_imap_t, char **));
-static int imap_flags __P ((char **, int *));
-static int imap_bodystructure __P ((f_imap_t, char **));
-static int imap_body __P ((f_imap_t, char **));
-static int imap_internaldate __P ((f_imap_t, char **));
-
-static int imap_uid __P ((f_imap_t, char **));
-static int imap_status __P ((f_imap_t));
-static int imap_expunge __P ((f_imap_t, unsigned int));
-static int imap_search __P ((f_imap_t));
+static int imap_fetch (f_imap_t);
+static int imap_rfc822 (f_imap_t, char **);
+static int imap_rfc822_size (f_imap_t, char **);
+static int imap_rfc822_header (f_imap_t, char **);
+static int imap_rfc822_text (f_imap_t, char **);
+static int imap_fetch_flags (f_imap_t, char **);
+static int imap_permanentflags (f_imap_t, char **);
+static int imap_flags (char **, int *);
+static int imap_bodystructure (f_imap_t, char **);
+static int imap_body (f_imap_t, char **);
+static int imap_internaldate (f_imap_t, char **);
+
+static int imap_uid (f_imap_t, char **);
+static int imap_status (f_imap_t);
+static int imap_expunge (f_imap_t, unsigned int);
+static int imap_search (f_imap_t);
/* String. */
-static int imap_literal_string __P ((f_imap_t, char **));
-static int imap_string __P ((f_imap_t, char **));
-static int imap_quoted_string __P ((f_imap_t, char **));
-static int imap_mailbox_name_match __P ((const char* pattern, const char* mailbox));
+static int imap_literal_string (f_imap_t, char **);
+static int imap_string (f_imap_t, char **);
+static int imap_quoted_string (f_imap_t, char **);
+static int imap_mailbox_name_match (const char* pattern, const char* mailbox);
-static int imap_token __P ((char *, size_t, char **));
+static int imap_token (char *, size_t, char **);
/* Capability */
-static int parse_capa __P ((f_imap_t f_imap, char *str));
-static int read_capa __P ((f_imap_t f_imap, int force));
-static int check_capa __P ((f_imap_t f_imap, char *capa));
+static int parse_capa (f_imap_t f_imap, char *str);
+static int read_capa (f_imap_t f_imap, int force);
+static int check_capa (f_imap_t f_imap, char *capa);
/* Authentication methods */
-typedef int (*auth_method_t) __P((authority_t));
+typedef int (*auth_method_t) (authority_t);
/* Simple User/pass authentication for imap. */
static int
diff --git a/mailbox/imap/mbox.c b/mailbox/imap/mbox.c
index d23d46f..33ff117 100644
--- a/mailbox/imap/mbox.c
+++ b/mailbox/imap/mbox.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -56,68 +56,67 @@
#define MU_IMAP_CACHE_HEADERS "Bcc Cc Content-Language Content-Transfer-Encoding Content-Type Date From In-Reply-To Message-ID Reference Reply-To Sender Subject To X-UIDL"
/* mailbox_t API. */
-static void mailbox_imap_destroy __P ((mailbox_t));
-static int mailbox_imap_open __P ((mailbox_t, int));
-static int mailbox_imap_close __P ((mailbox_t));
-static int imap_uidvalidity __P ((mailbox_t, unsigned long *));
-static int imap_uidnext __P ((mailbox_t, size_t *));
-static int imap_expunge __P ((mailbox_t));
-static int imap_get_message __P ((mailbox_t, size_t, message_t *));
-static int imap_messages_count __P ((mailbox_t, size_t *));
-static int imap_messages_recent __P ((mailbox_t, size_t *));
-static int imap_message_unseen __P ((mailbox_t, size_t *));
-static int imap_scan __P ((mailbox_t, size_t, size_t *));
-static int imap_scan0 __P ((mailbox_t, size_t, size_t *, int));
-static int imap_is_updated __P ((mailbox_t));
-static int imap_append_message __P ((mailbox_t, message_t));
-static int imap_append_message0 __P ((mailbox_t, message_t));
-static int imap_copy_message __P ((mailbox_t, message_t));
+static void mailbox_imap_destroy (mailbox_t);
+static int mailbox_imap_open (mailbox_t, int);
+static int mailbox_imap_close (mailbox_t);
+static int imap_uidvalidity (mailbox_t, unsigned long *);
+static int imap_uidnext (mailbox_t, size_t *);
+static int imap_expunge (mailbox_t);
+static int imap_get_message (mailbox_t, size_t, message_t *);
+static int imap_messages_count (mailbox_t, size_t *);
+static int imap_messages_recent (mailbox_t, size_t *);
+static int imap_message_unseen (mailbox_t, size_t *);
+static int imap_scan (mailbox_t, size_t, size_t *);
+static int imap_scan0 (mailbox_t, size_t, size_t *, int);
+static int imap_is_updated (mailbox_t);
+static int imap_append_message (mailbox_t, message_t);
+static int imap_append_message0 (mailbox_t, message_t);
+static int imap_copy_message (mailbox_t, message_t);
/* message_t API. */
-static int imap_submessage_size __P ((msg_imap_t, size_t *));
-static int imap_message_size __P ((message_t, size_t *));
-static int imap_message_lines __P ((message_t, size_t *));
-static int imap_message_get_transport2 __P ((stream_t, mu_transport_t *pin,
- mu_transport_t *pout));
-static int imap_message_read __P ((stream_t , char *, size_t, off_t, size_t *));
-static int imap_message_uid __P ((message_t, size_t *));
+static int imap_submessage_size (msg_imap_t, size_t *);
+static int imap_message_size (message_t, size_t *);
+static int imap_message_lines (message_t, size_t *);
+static int imap_message_get_transport2 (stream_t, mu_transport_t *pin,
+ mu_transport_t *pout);
+static int imap_message_read (stream_t , char *, size_t, off_t, size_t *);
+static int imap_message_uid (message_t, size_t *);
/* mime_t API. */
-static int imap_is_multipart __P ((message_t, int *));
-static int imap_get_num_parts __P ((message_t, size_t *));
-static int imap_get_part __P ((message_t, size_t, message_t *));
+static int imap_is_multipart (message_t, int *);
+static int imap_get_num_parts (message_t, size_t *);
+static int imap_get_part (message_t, size_t, message_t *);
/* envelope_t API */
-static int imap_envelope_sender __P ((envelope_t, char *, size_t, size_t *));
-static int imap_envelope_date __P ((envelope_t, char *, size_t, size_t *));
+static int imap_envelope_sender (envelope_t, char *, size_t, size_t *);
+static int imap_envelope_date (envelope_t, char *, size_t, size_t *);
/* attribute_t API */
-static int imap_attr_get_flags __P ((attribute_t, int *));
-static int imap_attr_set_flags __P ((attribute_t, int));
-static int imap_attr_unset_flags __P ((attribute_t, int));
+static int imap_attr_get_flags (attribute_t, int *);
+static int imap_attr_set_flags (attribute_t, int);
+static int imap_attr_unset_flags (attribute_t, int);
/* header_t API. */
-static int imap_header_read __P ((header_t, char*, size_t, off_t, size_t *));
-static int imap_header_get_value __P ((header_t, const char*, char *, size_t, size_t *));
-static int imap_header_get_fvalue __P ((header_t, const char*, char *, size_t, size_t *));
+static int imap_header_read (header_t, char*, size_t, off_t, size_t *);
+static int imap_header_get_value (header_t, const char*, char *, size_t, size_t *);
+static int imap_header_get_fvalue (header_t, const char*, char *, size_t, size_t *);
/* body_t API. */
-static int imap_body_read __P ((stream_t, char *, size_t, off_t,
- size_t *));
-static int imap_body_size __P ((body_t, size_t *));
-static int imap_body_lines __P ((body_t, size_t *));
-static int imap_body_get_transport2 __P ((stream_t, mu_transport_t *pin, mu_transport_t *pout));
+static int imap_body_read (stream_t, char *, size_t, off_t, size_t *);
+static int imap_body_size (body_t, size_t *);
+static int imap_body_lines (body_t, size_t *);
+static int imap_body_get_transport2 (stream_t, mu_transport_t *pin, mu_transport_t *pout);
/* Helpers. */
-static int imap_get_transport2 __P ((msg_imap_t msg_imap,
- mu_transport_t *pin,
- mu_transport_t *pout));
-static int imap_get_message0 __P ((msg_imap_t, message_t *));
-static int fetch_operation __P ((f_imap_t, msg_imap_t, char *, size_t, size_t *));
-static void free_subparts __P ((msg_imap_t));
-static int flags_to_string __P ((char **, int));
-static int delete_to_string __P ((m_imap_t, char **));
-static int is_same_folder __P ((mailbox_t, message_t));
+static int imap_get_transport2 (msg_imap_t msg_imap,
+ mu_transport_t *pin,
+ mu_transport_t *pout);
+static int imap_get_message0 (msg_imap_t, message_t *);
+static int fetch_operation (f_imap_t, msg_imap_t, char *, size_t, size_t *);
+static void free_subparts (msg_imap_t);
+static int flags_to_string (char **, int);
+static int delete_to_string (m_imap_t, char **);
+static int is_same_folder (mailbox_t, message_t);
#define MBX_WRITABLE(mbx) ((mbx)->flags & (MU_STREAM_WRITE|MU_STREAM_RDWR|MU_STREAM_CREAT))
diff --git a/mailbox/include/amd.h b/mailbox/include/amd.h
index 7ee83b0..a232374 100644
--- a/mailbox/include/amd.h
+++ b/mailbox/include/amd.h
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -88,15 +88,13 @@ struct _amd_data
};
-int amd_init_mailbox __P((mailbox_t mailbox, size_t mhd_size,
- struct _amd_data **pmhd));
-int _amd_message_insert __P((struct _amd_data *mhd,
- struct _amd_message *msg));
-int amd_message_stream_open __P((struct _amd_message *mhm));
-void amd_message_stream_close __P((struct _amd_message *mhm));
+int amd_init_mailbox (mailbox_t mailbox, size_t mhd_size,
+ struct _amd_data **pmhd);
+int _amd_message_insert (struct _amd_data *mhd, struct _amd_message *msg);
+int amd_message_stream_open (struct _amd_message *mhm);
+void amd_message_stream_close (struct _amd_message *mhm);
void amd_cleanup (void *arg);
int amd_url_init (url_t url, const char *scheme);
-struct _amd_message *_amd_get_message __P((struct _amd_data *amd,
- size_t msgno));
-int amd_msg_lookup __P((struct _amd_data *amd, struct _amd_message *msg,
- size_t *pret));
+struct _amd_message *_amd_get_message (struct _amd_data *amd, size_t msgno);
+int amd_msg_lookup (struct _amd_data *amd, struct _amd_message *msg,
+ size_t *pret);
diff --git a/mailbox/include/attribute0.h b/mailbox/include/attribute0.h
index 265c218..20260e0 100644
--- a/mailbox/include/attribute0.h
+++ b/mailbox/include/attribute0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ struct _attribute
int flags;
int user_flags;
- int (*_get_flags) __P ((attribute_t, int *));
- int (*_set_flags) __P ((attribute_t, int));
- int (*_unset_flags) __P ((attribute_t, int));
+ int (*_get_flags) (attribute_t, int *);
+ int (*_set_flags) (attribute_t, int);
+ int (*_unset_flags) (attribute_t, int);
};
#ifdef __cplusplus
diff --git a/mailbox/include/auth0.h b/mailbox/include/auth0.h
index 34ec754..d0a612e 100644
--- a/mailbox/include/auth0.h
+++ b/mailbox/include/auth0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -36,21 +36,21 @@ struct _ticket
void *owner;
char *challenge;
void *data;
- int (*_pop) __P ((ticket_t, url_t, const char *challenge, char **));
- void (*_destroy) __P ((ticket_t));
+ int (*_pop) (ticket_t, url_t, const char *challenge, char **);
+ void (*_destroy) (ticket_t);
};
struct _authority
{
void *owner;
ticket_t ticket;
- list_t auth_methods; /* list of int (*_authenticate) __P ((authority_t))s; */
+ list_t auth_methods; /* list of int (*_authenticate) (authority_t)s; */
};
struct _wicket
{
char *filename;
- int (*_get_ticket) __P ((wicket_t, const char *, const char *, ticket_t *));
+ int (*_get_ticket) (wicket_t, const char *, const char *, ticket_t *);
};
diff --git a/mailbox/include/debug0.h b/mailbox/include/debug0.h
index 4b045a8..241036d 100644
--- a/mailbox/include/debug0.h
+++ b/mailbox/include/debug0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ struct _debug
char *buffer;
size_t buflen;
void *owner;
- int (*_print) __P ((mu_debug_t, size_t level, const char *, va_list));
+ int (*_print) (mu_debug_t, size_t level, const char *, va_list);
};
#ifdef __cplusplus
diff --git a/mailbox/include/envelope0.h b/mailbox/include/envelope0.h
index e1f0b2b..b13ab83 100644
--- a/mailbox/include/envelope0.h
+++ b/mailbox/include/envelope0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -32,9 +32,9 @@ extern "C" {
struct _envelope
{
void *owner;
- int (*_destroy) __P ((envelope_t));
- int (*_sender) __P ((envelope_t, char *, size_t, size_t*));
- int (*_date) __P ((envelope_t, char *, size_t , size_t *));
+ int (*_destroy) (envelope_t);
+ int (*_sender) (envelope_t, char *, size_t, size_t*);
+ int (*_date) (envelope_t, char *, size_t , size_t *);
};
#endif /* _ENVELOPE0_H */
diff --git a/mailbox/include/filter0.h b/mailbox/include/filter0.h
index af6541d..2e77871 100644
--- a/mailbox/include/filter0.h
+++ b/mailbox/include/filter0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -40,10 +40,10 @@ struct _filter
int direction;
int type;
void *data;
- int (*_read) __P ((filter_t, char *, size_t, off_t, size_t *));
- int (*_readline) __P ((filter_t, char *, size_t, off_t, size_t *));
- int (*_write) __P ((filter_t, const char *, size_t, off_t, size_t *));
- void (*_destroy) __P ((filter_t));
+ int (*_read) (filter_t, char *, size_t, off_t, size_t *);
+ int (*_readline) (filter_t, char *, size_t, off_t, size_t *);
+ int (*_write) (filter_t, const char *, size_t, off_t, size_t *);
+ void (*_destroy) (filter_t);
};
#ifdef __cplusplus
diff --git a/mailbox/include/folder0.h b/mailbox/include/folder0.h
index 2d93164..b9ae7f5 100644
--- a/mailbox/include/folder0.h
+++ b/mailbox/include/folder0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -51,18 +51,18 @@ struct _folder
/* Public methods */
- void (*_destroy) __P ((folder_t));
-
- int (*_open) __P ((folder_t, int flag));
- int (*_close) __P ((folder_t));
- int (*_list) __P ((folder_t, const char *, const char *,
- struct folder_list *));
- int (*_lsub) __P ((folder_t, const char *, const char *,
- struct folder_list *));
- int (*_delete) __P ((folder_t, const char *));
- int (*_rename) __P ((folder_t, const char *, const char *));
- int (*_subscribe) __P ((folder_t, const char *));
- int (*_unsubscribe) __P ((folder_t, const char *));
+ void (*_destroy) (folder_t);
+
+ int (*_open) (folder_t, int flag);
+ int (*_close) (folder_t);
+ int (*_list) (folder_t, const char *, const char *,
+ struct folder_list *);
+ int (*_lsub) (folder_t, const char *, const char *,
+ struct folder_list *);
+ int (*_delete) (folder_t, const char *);
+ int (*_rename) (folder_t, const char *, const char *);
+ int (*_subscribe) (folder_t, const char *);
+ int (*_unsubscribe) (folder_t, const char *);
};
/* Moro(?)ic kluge. */
diff --git a/mailbox/include/header0.h b/mailbox/include/header0.h
index 3126699..e935d62 100644
--- a/mailbox/include/header0.h
+++ b/mailbox/include/header0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -60,12 +60,12 @@ struct _header
/* Stream. */
stream_t stream;
- int (*_get_value) __P ((header_t, const char *, char *, size_t , size_t *));
- int (*_get_fvalue) __P ((header_t, const char *, char *, size_t , size_t *));
- int (*_set_value) __P ((header_t, const char *, const char *, int));
- int (*_lines) __P ((header_t, size_t *));
- int (*_size) __P ((header_t, size_t *));
- int (*_fill) __P ((header_t, char *, size_t, off_t, size_t *));
+ int (*_get_value) (header_t, const char *, char *, size_t , size_t *);
+ int (*_get_fvalue) (header_t, const char *, char *, size_t , size_t *);
+ int (*_set_value) (header_t, const char *, const char *, int);
+ int (*_lines) (header_t, size_t *);
+ int (*_size) (header_t, size_t *);
+ int (*_fill) (header_t, char *, size_t, off_t, size_t *);
};
#ifdef __cplusplus
diff --git a/mailbox/include/imap0.h b/mailbox/include/imap0.h
index 767326b..a249829 100644
--- a/mailbox/include/imap0.h
+++ b/mailbox/include/imap0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -223,12 +223,12 @@ struct _msg_imap
size_t header_lines;
};
-int imap_writeline __P ((f_imap_t, const char *format, ...));
-int imap_write __P ((f_imap_t));
-int imap_send __P ((f_imap_t));
-int imap_parse __P ((f_imap_t));
-int imap_readline __P ((f_imap_t));
-char *section_name __P ((msg_imap_t));
+int imap_writeline (f_imap_t, const char *format, ...);
+int imap_write (f_imap_t);
+int imap_send (f_imap_t);
+int imap_parse (f_imap_t);
+int imap_readline (f_imap_t);
+char *section_name (msg_imap_t);
#ifdef __cplusplus
}
diff --git a/mailbox/include/list0.h b/mailbox/include/list0.h
index 6bfa63e..14dcc56 100644
--- a/mailbox/include/list0.h
+++ b/mailbox/include/list0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -46,7 +46,7 @@ struct _list
size_t count;
monitor_t monitor;
list_comparator_t comp;
- void (*destroy_item) __P((void *item));
+ void (*destroy_item) (void *item);
struct _iterator *itr;
};
diff --git a/mailbox/include/mailbox0.h b/mailbox/include/mailbox0.h
index 4cd872e..6a0f237 100644
--- a/mailbox/include/mailbox0.h
+++ b/mailbox/include/mailbox0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -51,27 +51,27 @@ struct _mailbox
/* Public methods */
- void (*_destroy) __P ((mailbox_t));
+ void (*_destroy) (mailbox_t);
- int (*_open) __P ((mailbox_t, int));
- int (*_close) __P ((mailbox_t));
+ int (*_open) (mailbox_t, int);
+ int (*_close) (mailbox_t);
/* messages */
- int (*_get_message) __P ((mailbox_t, size_t, message_t *));
- int (*_append_message) __P ((mailbox_t, message_t));
- int (*_messages_count) __P ((mailbox_t, size_t *));
- int (*_messages_recent) __P ((mailbox_t, size_t *));
- int (*_message_unseen) __P ((mailbox_t, size_t *));
- int (*_expunge) __P ((mailbox_t));
- int (*_save_attributes) __P ((mailbox_t));
- int (*_uidvalidity) __P ((mailbox_t, unsigned long *));
- int (*_uidnext) __P ((mailbox_t, size_t *));
- int (*_get_property) __P ((mailbox_t, property_t *));
-
- int (*_scan) __P ((mailbox_t, size_t, size_t *));
- int (*_is_updated) __P ((mailbox_t));
-
- int (*_get_size) __P ((mailbox_t, off_t *));
+ int (*_get_message) (mailbox_t, size_t, message_t *);
+ int (*_append_message) (mailbox_t, message_t);
+ int (*_messages_count) (mailbox_t, size_t *);
+ int (*_messages_recent) (mailbox_t, size_t *);
+ int (*_message_unseen) (mailbox_t, size_t *);
+ int (*_expunge) (mailbox_t);
+ int (*_save_attributes) (mailbox_t);
+ int (*_uidvalidity) (mailbox_t, unsigned long *);
+ int (*_uidnext) (mailbox_t, size_t *);
+ int (*_get_property) (mailbox_t, property_t *);
+
+ int (*_scan) (mailbox_t, size_t, size_t *);
+ int (*_is_updated) (mailbox_t);
+
+ int (*_get_size) (mailbox_t, off_t *);
};
diff --git a/mailbox/include/mailer0.h b/mailbox/include/mailer0.h
index 013e84c..663622a 100644
--- a/mailbox/include/mailer0.h
+++ b/mailbox/include/mailer0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -51,10 +51,10 @@ struct _mailer
void *data;
/* Public methods. */
- void (*_destroy) __P ((mailer_t));
- int (*_open) __P ((mailer_t, int flags));
- int (*_close) __P ((mailer_t));
- int (*_send_message) __P ((mailer_t, message_t, address_t, address_t));
+ void (*_destroy) (mailer_t);
+ int (*_open) (mailer_t, int flags);
+ int (*_close) (mailer_t);
+ int (*_send_message) (mailer_t, message_t, address_t, address_t);
};
#define MAILER_NOTIFY(mailer, type) \
diff --git a/mailbox/include/message0.h b/mailbox/include/message0.h
index e95a5ba..fe65536 100644
--- a/mailbox/include/message0.h
+++ b/mailbox/include/message0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -58,13 +58,13 @@ struct _message
size_t hdr_buflen;
int hdr_done;
- int (*_get_uidl) __P ((message_t, char *, size_t, size_t *));
- int (*_get_uid) __P ((message_t, size_t *));
- int (*_get_num_parts) __P ((message_t, size_t *));
- int (*_get_part) __P ((message_t, size_t, message_t *));
- int (*_is_multipart) __P ((message_t, int *));
- int (*_lines) __P ((message_t, size_t *));
- int (*_size) __P ((message_t, size_t *));
+ int (*_get_uidl) (message_t, char *, size_t, size_t *);
+ int (*_get_uid) (message_t, size_t *);
+ int (*_get_num_parts) (message_t, size_t *);
+ int (*_get_part) (message_t, size_t, message_t *);
+ int (*_is_multipart) (message_t, int *);
+ int (*_lines) (message_t, size_t *);
+ int (*_size) (message_t, size_t *);
};
#ifdef __cplusplus
diff --git a/mailbox/include/observer0.h b/mailbox/include/observer0.h
index 192301e..60c08c8 100644
--- a/mailbox/include/observer0.h
+++ b/mailbox/include/observer0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -33,8 +33,8 @@ struct _observer
{
int flags;
void *owner;
- int (*_action) __P ((observer_t, size_t));
- int (*_destroy) __P ((observer_t));
+ int (*_action) (observer_t, size_t);
+ int (*_destroy) (observer_t);
};
struct _observable
diff --git a/mailbox/include/registrar0.h b/mailbox/include/registrar0.h
index cddb657..f50fc8f 100644
--- a/mailbox/include/registrar0.h
+++ b/mailbox/include/registrar0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -38,50 +38,50 @@ extern "C" {
#define MU_POP_PORT 110
#define MU_POP_SCHEME "pop://"
#define MU_POP_SCHEME_LEN (sizeof (MU_POP_SCHEME) - 1)
-extern int _url_pop_init __P ((url_t));
-extern int _mailbox_pop_init __P ((mailbox_t));
-extern int _folder_pop_init __P ((folder_t));
+extern int _url_pop_init (url_t);
+extern int _mailbox_pop_init (mailbox_t);
+extern int _folder_pop_init (folder_t);
#define MU_IMAP_PORT 143
#define MU_IMAP_SCHEME "imap://"
#define MU_IMAP_SCHEME_LEN (sizeof (MU_IMAP_SCHEME) - 1)
-extern int _url_imap_init __P ((url_t));
-extern int _mailbox_imap_init __P ((mailbox_t));
-extern int _folder_imap_init __P ((folder_t));
+extern int _url_imap_init (url_t);
+extern int _mailbox_imap_init (mailbox_t);
+extern int _folder_imap_init (folder_t);
#define MU_MBOX_SCHEME "mbox:"
#define MU_MBOX_SCHEME_LEN (sizeof (MU_MBOX_SCHEME) - 1)
-extern int _url_mbox_init __P ((url_t));
-extern int _mailbox_mbox_init __P ((mailbox_t));
-extern int _folder_mbox_init __P ((folder_t));
+extern int _url_mbox_init (url_t);
+extern int _mailbox_mbox_init (mailbox_t);
+extern int _folder_mbox_init (folder_t);
#define MU_FILE_SCHEME "file:"
#define MU_FILE_SCHEME_LEN (sizeof (MU_FILE_SCHEME) - 1)
#define MU_PATH_SCHEME "/"
#define MU_PATH_SCHEME_LEN (sizeof (MU_PATH_SCHEME) - 1)
-extern int _url_path_init __P ((url_t));
-extern int _mailbox_path_init __P ((mailbox_t));
-extern int _folder_path_init __P ((folder_t));
+extern int _url_path_init (url_t);
+extern int _mailbox_path_init (mailbox_t);
+extern int _folder_path_init (folder_t);
#define MU_SMTP_SCHEME "smtp://"
#define MU_SMTP_SCHEME_LEN (sizeof (MU_SMTP_SCHEME) - 1)
#define MU_SMTP_PORT 25
-extern int _url_smtp_init __P ((url_t));
-extern int _mailer_smtp_init __P ((mailer_t));
+extern int _url_smtp_init (url_t);
+extern int _mailer_smtp_init (mailer_t);
#define MU_SENDMAIL_SCHEME "sendmail:"
#define MU_SENDMAIL_SCHEME_LEN (sizeof (MU_SENDMAIL_SCHEME) - 1)
-extern int _url_sendmail_init __P ((url_t));
-extern int _mailer_sendmail_init __P ((mailer_t));
+extern int _url_sendmail_init (url_t);
+extern int _mailer_sendmail_init (mailer_t);
#define MU_MH_SCHEME "mh:"
#define MU_MH_SCHEME_LEN (sizeof (MU_MH_SCHEME) - 1)
-extern int _mailbox_mh_init __P((mailbox_t mailbox));
+extern int _mailbox_mh_init (mailbox_t mailbox);
#define MU_MAILDIR_SCHEME "maildir:"
#define MU_MAILDIR_SCHEME_LEN (sizeof (MU_MAILDIR_SCHEME) - 1)
-extern int _mailbox_maildir_init __P((mailbox_t mailbox));
+extern int _mailbox_maildir_init (mailbox_t mailbox);
#ifdef __cplusplus
}
diff --git a/mailbox/include/stream0.h b/mailbox/include/stream0.h
index 853cc2a..c6fdc13 100644
--- a/mailbox/include/stream0.h
+++ b/mailbox/include/stream0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -52,19 +52,19 @@ struct _stream
/* Stream pointer for sequential offset. */
off_t offset;
- void (*_destroy) __P ((stream_t));
- int (*_open) __P ((stream_t));
- int (*_close) __P ((stream_t));
- int (*_get_transport2) __P ((stream_t, mu_transport_t *, mu_transport_t *));
- int (*_read) __P ((stream_t, char *, size_t, off_t, size_t *));
- int (*_readline) __P ((stream_t, char *, size_t, off_t, size_t *));
- int (*_write) __P ((stream_t, const char *, size_t, off_t, size_t *));
- int (*_truncate) __P ((stream_t, off_t));
- int (*_size) __P ((stream_t, off_t *));
- int (*_flush) __P ((stream_t));
- int (*_setbufsiz)__P ((stream_t, size_t));
- int (*_strerror) __P ((stream_t, const char **));
- int (*_wait) __P((stream_t, int *pflags, struct timeval *tvp));
+ void (*_destroy) (stream_t);
+ int (*_open) (stream_t);
+ int (*_close) (stream_t);
+ int (*_get_transport2) (stream_t, mu_transport_t *, mu_transport_t *);
+ int (*_read) (stream_t, char *, size_t, off_t, size_t *);
+ int (*_readline) (stream_t, char *, size_t, off_t, size_t *);
+ int (*_write) (stream_t, const char *, size_t, off_t, size_t *);
+ int (*_truncate) (stream_t, off_t);
+ int (*_size) (stream_t, off_t *);
+ int (*_flush) (stream_t);
+ int (*_setbufsiz)(stream_t, size_t);
+ int (*_strerror) (stream_t, const char **);
+ int (*_wait) (stream_t, int *pflags, struct timeval *tvp);
};
#ifdef __cplusplus
diff --git a/mailbox/include/url0.h b/mailbox/include/url0.h
index e2f301c..415de78 100644
--- a/mailbox/include/url0.h
+++ b/mailbox/include/url0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -45,17 +45,17 @@ struct _url
void *data;
- void (*_destroy) __P ((url_t url));
+ void (*_destroy) (url_t url);
/* Methods */
- int (*_get_scheme) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_user) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_passwd) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_auth) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_host) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_port) __P ((const url_t, long *));
- int (*_get_path) __P ((const url_t, char *, size_t, size_t *));
- int (*_get_query) __P ((const url_t, char *, size_t, size_t *));
+ int (*_get_scheme) (const url_t, char *, size_t, size_t *);
+ int (*_get_user) (const url_t, char *, size_t, size_t *);
+ int (*_get_passwd) (const url_t, char *, size_t, size_t *);
+ int (*_get_auth) (const url_t, char *, size_t, size_t *);
+ int (*_get_host) (const url_t, char *, size_t, size_t *);
+ int (*_get_port) (const url_t, long *);
+ int (*_get_path) (const url_t, char *, size_t, size_t *);
+ int (*_get_query) (const url_t, char *, size_t, size_t *);
};
diff --git a/mailbox/locker.c b/mailbox/locker.c
index e80f987..c4de6b9 100644
--- a/mailbox/locker.c
+++ b/mailbox/locker.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -79,14 +79,14 @@ struct _locker
*/
#define INVARIANT(l) assert((l)->refcnt >= 0);
-static void expire_stale_lock __P((locker_t lock));
-static int stat_check __P((const char *file, int fd, int links));
-static int check_file_permissions __P((const char *file));
-static int lock_external __P((locker_t l, int lock));
-static int _locker_lock_dotlock __P((locker_t lock));
-static int _locker_unlock_dotlock __P((locker_t lock));
-static int _locker_lock_kernel __P((locker_t lock));
-static int _locker_unlock_kernel __P((locker_t lock));
+static void expire_stale_lock (locker_t lock);
+static int stat_check (const char *file, int fd, int links);
+static int check_file_permissions (const char *file);
+static int lock_external (locker_t l, int lock);
+static int _locker_lock_dotlock (locker_t lock);
+static int _locker_unlock_dotlock (locker_t lock);
+static int _locker_lock_kernel (locker_t lock);
+static int _locker_unlock_kernel (locker_t lock);
static int mu_locker_default_flags = MU_LOCKER_DEFAULT;
static time_t mu_locker_retry_timeout = MU_LOCKER_RETRY_SLEEP;
diff --git a/mailbox/mailbox.c b/mailbox/mailbox.c
index dce032f..0d822c0 100644
--- a/mailbox/mailbox.c
+++ b/mailbox/mailbox.c
@@ -71,8 +71,8 @@ mailbox_create (mailbox_t *pmbox, const char *name)
if (registrar_lookup (name, &record, MU_FOLDER_ATTRIBUTE_FILE))
{
- int (*m_init) __P ((mailbox_t)) = NULL;
- int (*u_init) __P ((url_t)) = NULL;
+ int (*m_init) (mailbox_t) = NULL;
+ int (*u_init) (url_t) = NULL;
record_get_mailbox (record, &m_init);
record_get_url (record, &u_init);
diff --git a/mailbox/maildir/maildir.h b/mailbox/maildir/maildir.h
index 8870462..2e1cdc1 100644
--- a/mailbox/maildir/maildir.h
+++ b/mailbox/maildir/maildir.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,5 +21,5 @@
#define CURSUF "cur"
#define NEWSUF "new"
-extern char *maildir_mkfilename __P((const char *dir, const char *suffix,
- const char *name));
+extern char *maildir_mkfilename (const char *dir, const char *suffix,
+ const char *name);
diff --git a/mailbox/mailer.c b/mailbox/mailer.c
index 4f5c3a8..f2dd9c0 100644
--- a/mailbox/mailer.c
+++ b/mailbox/mailer.c
@@ -92,8 +92,8 @@ mailer_create (mailer_t * pmailer, const char *name)
if (registrar_lookup (name, &record, MU_FOLDER_ATTRIBUTE_FILE))
{
- int (*m_init) __P ((mailer_t)) = NULL;
- int (*u_init) __P ((url_t)) = NULL;
+ int (*m_init) (mailer_t) = NULL;
+ int (*u_init) (url_t) = NULL;
record_get_mailer (record, &m_init);
record_get_url (record, &u_init);
diff --git a/mailbox/mbox/folder.c b/mailbox/mbox/folder.c
index af13519..d64ca7d 100644
--- a/mailbox/mbox/folder.c
+++ b/mailbox/mbox/folder.c
@@ -106,24 +106,22 @@ static struct _record _path_record =
record_t path_record = &_path_record;
/* lsub/subscribe/unsubscribe are not needed. */
-static void folder_mbox_destroy __P ((folder_t));
-static int folder_mbox_open __P ((folder_t, int));
-static int folder_mbox_close __P ((folder_t));
-static int folder_mbox_delete __P ((folder_t, const char *));
-static int folder_mbox_rename __P ((folder_t , const char *,
- const char *));
-static int folder_mbox_list __P ((folder_t, const char *, const char *,
- struct folder_list *));
-static int folder_mbox_subscribe __P ((folder_t, const char *));
-static int folder_mbox_unsubscribe __P ((folder_t, const char *));
-static int folder_mbox_lsub __P ((folder_t, const char *, const char *,
- struct folder_list *));
-
-
-static char *get_pathname __P ((const char *, const char *));
-
-static int folder_mbox_get_authority __P ((folder_t folder,
- authority_t * pauth));
+static void folder_mbox_destroy (folder_t);
+static int folder_mbox_open (folder_t, int);
+static int folder_mbox_close (folder_t);
+static int folder_mbox_delete (folder_t, const char *);
+static int folder_mbox_rename (folder_t , const char *, const char *);
+static int folder_mbox_list (folder_t, const char *, const char *,
+ struct folder_list *);
+static int folder_mbox_subscribe (folder_t, const char *);
+static int folder_mbox_unsubscribe (folder_t, const char *);
+static int folder_mbox_lsub (folder_t, const char *, const char *,
+ struct folder_list *);
+
+
+static char *get_pathname (const char *, const char *);
+
+static int folder_mbox_get_authority (folder_t folder, authority_t * pauth);
struct _fmbox
{
diff --git a/mailbox/mbox/mbox.c b/mailbox/mbox/mbox.c
index b390489..8c0d029 100644
--- a/mailbox/mbox/mbox.c
+++ b/mailbox/mbox/mbox.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2003,
+ Copyright (C) 1999, 2000, 2001, 2003,
2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
@@ -56,52 +56,45 @@ const char *fhdr_table[HDRSIZE] =
};
/* Mailbox concrete implementation. */
-static int mbox_open __P ((mailbox_t, int));
-static int mbox_close __P ((mailbox_t));
-static int mbox_get_message __P ((mailbox_t, size_t, message_t *));
-/* static int mbox_get_message_by_uid __P ((mailbox_t, size_t, message_t *)); */
-static int mbox_append_message __P ((mailbox_t, message_t));
-static int mbox_messages_count __P ((mailbox_t, size_t *));
-static int mbox_messages_recent __P ((mailbox_t, size_t *));
-static int mbox_message_unseen __P ((mailbox_t, size_t *));
-static int mbox_expunge0 __P ((mailbox_t, int));
-static int mbox_expunge __P ((mailbox_t));
-static int mbox_save_attributes __P ((mailbox_t));
-static int mbox_uidvalidity __P ((mailbox_t, unsigned long *));
-static int mbox_uidnext __P ((mailbox_t, size_t *));
-static int mbox_scan __P ((mailbox_t, size_t, size_t *));
-static int mbox_is_updated __P ((mailbox_t));
-static int mbox_get_size __P ((mailbox_t, off_t *));
+static int mbox_open (mailbox_t, int);
+static int mbox_close (mailbox_t);
+static int mbox_get_message (mailbox_t, size_t, message_t *);
+/* static int mbox_get_message_by_uid (mailbox_t, size_t, message_t *); */
+static int mbox_append_message (mailbox_t, message_t);
+static int mbox_messages_count (mailbox_t, size_t *);
+static int mbox_messages_recent (mailbox_t, size_t *);
+static int mbox_message_unseen (mailbox_t, size_t *);
+static int mbox_expunge0 (mailbox_t, int);
+static int mbox_expunge (mailbox_t);
+static int mbox_save_attributes (mailbox_t);
+static int mbox_uidvalidity (mailbox_t, unsigned long *);
+static int mbox_uidnext (mailbox_t, size_t *);
+static int mbox_scan (mailbox_t, size_t, size_t *);
+static int mbox_is_updated (mailbox_t);
+static int mbox_get_size (mailbox_t, off_t *);
/* private stuff */
-static int mbox_append_message0 __P ((mailbox_t, message_t, off_t *,
- int, int));
-static int mbox_message_uid __P ((message_t, size_t *));
-static int mbox_header_fill __P ((header_t, char *, size_t, off_t,
- size_t *));
-static int mbox_get_body_transport __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int mbox_get_transport2 __P ((mbox_message_t, mu_transport_t *, mu_transport_t *));
-static int mbox_get_attr_flags __P ((attribute_t, int *));
-static int mbox_set_attr_flags __P ((attribute_t, int));
-static int mbox_unset_attr_flags __P ((attribute_t, int));
-static int mbox_body_read __P ((stream_t, char *, size_t, off_t,
- size_t *));
-static int mbox_body_readline __P ((stream_t, char *, size_t, off_t,
- size_t *));
-static int mbox_readstream __P ((mbox_message_t, char *, size_t,
- off_t, size_t *, int, off_t,
- off_t));
-static int mbox_stream_size __P((stream_t stream, off_t *psize));
-
-static int mbox_header_size __P ((header_t, size_t *));
-static int mbox_header_lines __P ((header_t, size_t *));
-static int mbox_body_size __P ((body_t, size_t *));
-static int mbox_body_lines __P ((body_t, size_t *));
-static int mbox_envelope_sender __P ((envelope_t, char *, size_t,
- size_t *));
-static int mbox_envelope_date __P ((envelope_t, char *, size_t,
- size_t *));
-static int mbox_tmpfile __P ((mailbox_t, char **pbox));
+static int mbox_append_message0 (mailbox_t, message_t, off_t *, int, int);
+static int mbox_message_uid (message_t, size_t *);
+static int mbox_header_fill (header_t, char *, size_t, off_t, size_t *);
+static int mbox_get_body_transport (stream_t, mu_transport_t *, mu_transport_t *);
+static int mbox_get_transport2 (mbox_message_t, mu_transport_t *, mu_transport_t *);
+static int mbox_get_attr_flags (attribute_t, int *);
+static int mbox_set_attr_flags (attribute_t, int);
+static int mbox_unset_attr_flags (attribute_t, int);
+static int mbox_body_read (stream_t, char *, size_t, off_t, size_t *);
+static int mbox_body_readline (stream_t, char *, size_t, off_t, size_t *);
+static int mbox_readstream (mbox_message_t, char *, size_t,
+ off_t, size_t *, int, off_t, off_t);
+static int mbox_stream_size (stream_t stream, off_t *psize);
+
+static int mbox_header_size (header_t, size_t *);
+static int mbox_header_lines (header_t, size_t *);
+static int mbox_body_size (body_t, size_t *);
+static int mbox_body_lines (body_t, size_t *);
+static int mbox_envelope_sender (envelope_t, char *, size_t, size_t *);
+static int mbox_envelope_date (envelope_t, char *, size_t, size_t *);
+static int mbox_tmpfile (mailbox_t, char **pbox);
/* Allocate the mbox_data_t struct(concrete mailbox), but don't do any
parsing on the name or even test for existence. However we do strip any
diff --git a/mailbox/mbox/mbox0.h b/mailbox/mbox/mbox0.h
index 1902a82..6c41f79 100644
--- a/mailbox/mbox/mbox0.h
+++ b/mailbox/mbox/mbox0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -142,8 +142,7 @@ struct _mbox_data
mailbox_t mailbox; /* Back pointer. */
};
-int mbox_scan0 __P((mailbox_t mailbox, size_t msgno, size_t *pcount,
- int do_notif));
+int mbox_scan0 (mailbox_t mailbox, size_t msgno, size_t *pcount, int do_notif);
#ifdef WITH_PTHREAD
-void mbox_cleanup __P((void *arg));
+void mbox_cleanup (void *arg);
#endif
diff --git a/mailbox/message.c b/mailbox/message.c
index 60fd3da..31cacd2 100644
--- a/mailbox/message.c
+++ b/mailbox/message.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -53,22 +53,22 @@
#define MESSAGE_MODIFIED 0x10000;
-static int message_read __P ((stream_t is, char *buf, size_t buflen,
- off_t off, size_t *pnread ));
-static int message_write __P ((stream_t os, const char *buf, size_t buflen,
- off_t off, size_t *pnwrite));
-static int message_get_transport2 __P ((stream_t stream, mu_transport_t *pin,
- mu_transport_t *pout));
-static int message_sender __P ((envelope_t envelope, char *buf, size_t len,
- size_t *pnwrite));
-static int message_date __P ((envelope_t envelope, char *buf, size_t len,
- size_t *pnwrite));
-static int message_stream_size __P((stream_t stream, off_t *psize));
-static int message_header_fill __P ((header_t header, char *buffer,
- size_t buflen, off_t off,
- size_t * pnread));
-static int message_body_read __P ((stream_t stream, char *buffer,
- size_t n, off_t off, size_t *pn));
+static int message_read (stream_t is, char *buf, size_t buflen,
+ off_t off, size_t *pnread );
+static int message_write (stream_t os, const char *buf, size_t buflen,
+ off_t off, size_t *pnwrite);
+static int message_get_transport2 (stream_t stream, mu_transport_t *pin,
+ mu_transport_t *pout);
+static int message_sender (envelope_t envelope, char *buf, size_t len,
+ size_t *pnwrite);
+static int message_date (envelope_t envelope, char *buf, size_t len,
+ size_t *pnwrite);
+static int message_stream_size (stream_t stream, off_t *psize);
+static int message_header_fill (header_t header, char *buffer,
+ size_t buflen, off_t off,
+ size_t * pnread);
+static int message_body_read (stream_t stream, char *buffer,
+ size_t n, off_t off, size_t *pn);
/* Allocate ressources for the message_t. */
int
@@ -646,7 +646,7 @@ message_get_uidl (message_t msg, char *buffer, size_t buflen, size_t *pwriten)
}
int
-message_set_uid (message_t msg, int (*_get_uid) __P ((message_t, size_t *)),
+message_set_uid (message_t msg, int (*_get_uid) (message_t, size_t *),
void *owner)
{
if (msg == NULL)
@@ -658,8 +658,9 @@ message_set_uid (message_t msg, int (*_get_uid) __P ((message_t, size_t *)),
}
int
-message_set_uidl (message_t msg, int (* _get_uidl)
- __P ((message_t, char *, size_t, size_t *)), void *owner)
+message_set_uidl (message_t msg,
+ int (* _get_uidl) (message_t, char *, size_t, size_t *),
+ void *owner)
{
if (msg == NULL)
return EINVAL;
@@ -670,8 +671,9 @@ message_set_uidl (message_t msg, int (* _get_uidl)
}
int
-message_set_is_multipart (message_t msg, int (*_is_multipart)
- __P ((message_t, int *)), void *owner)
+message_set_is_multipart (message_t msg,
+ int (*_is_multipart) (message_t, int *),
+ void *owner)
{
if (msg == NULL)
return EINVAL;
@@ -718,8 +720,9 @@ message_get_num_parts (message_t msg, size_t *pparts)
}
int
-message_set_get_num_parts (message_t msg, int (*_get_num_parts)
- __P ((message_t, size_t *)), void *owner)
+message_set_get_num_parts (message_t msg,
+ int (*_get_num_parts) (message_t, size_t *),
+ void *owner)
{
if (msg == NULL)
return EINVAL;
@@ -750,7 +753,7 @@ message_get_part (message_t msg, size_t part, message_t *pmsg)
int
message_set_get_part (message_t msg, int (*_get_part)
- __P ((message_t, size_t, message_t *)),
+ (message_t, size_t, message_t *),
void *owner)
{
if (msg == NULL)
diff --git a/mailbox/mu_argp.c b/mailbox/mu_argp.c
index 25fc671..870fb2a 100644
--- a/mailbox/mu_argp.c
+++ b/mailbox/mu_argp.c
@@ -127,10 +127,10 @@ static struct argp_option mu_daemon_argp_option[] = {
{ NULL, 0, NULL, 0, NULL, 0 }
};
-static error_t mu_common_argp_parser __P((int key, char *arg,
- struct argp_state *state));
-static error_t mu_daemon_argp_parser __P((int key, char *arg,
- struct argp_state *state));
+static error_t mu_common_argp_parser (int key, char *arg,
+ struct argp_state *state);
+static error_t mu_daemon_argp_parser (int key, char *arg,
+ struct argp_state *state);
struct argp mu_common_argp = {
mu_common_argp_options,
diff --git a/mailbox/mu_auth.c b/mailbox/mu_auth.c
index a98d3a6..c5696f4 100644
--- a/mailbox/mu_auth.c
+++ b/mailbox/mu_auth.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -53,8 +53,8 @@
/*#define DEBUG(c) do { printf c; printf("\n"); } while (0)*/
#define DEBUG(c)
-static void mu_auth_begin_setup __P((void));
-static void mu_auth_finish_setup __P((void));
+static void mu_auth_begin_setup (void);
+static void mu_auth_finish_setup (void);
/* memory allocation */
int
@@ -206,8 +206,8 @@ mu_authenticate (struct mu_auth_data *auth_data, char *pass)
#define ARG_AUTHORIZATION 1
#define ARG_AUTHENTICATION 2
-static error_t mu_auth_argp_parser __P((int key, char *arg,
- struct argp_state *state));
+static error_t mu_auth_argp_parser (int key, char *arg,
+ struct argp_state *state);
/* Options used by programs that use extended authentication mechanisms. */
static struct argp_option mu_auth_argp_option[] = {
diff --git a/mailbox/nntp/folder.c b/mailbox/nntp/folder.c
index 998d9be..9206a1e 100644
--- a/mailbox/nntp/folder.c
+++ b/mailbox/nntp/folder.c
@@ -59,10 +59,10 @@ static struct _record _nntp_record =
};
record_t nntp_record = &_nntp_record;
-static int nntp_folder_open __P ((folder_t, int));
-static int nntp_folder_close __P ((folder_t));
-static void nntp_folder_destroy __P ((folder_t folder));
-static int nntp_folder_list __P ((folder_t folder, const char *ref, const char *name, struct folder_list *pflist));
+static int nntp_folder_open (folder_t, int);
+static int nntp_folder_close (folder_t);
+static void nntp_folder_destroy (folder_t folder);
+static int nntp_folder_list (folder_t folder, const char *ref, const char *name, struct folder_list *pflist);
int
_nntp_folder_init (folder_t folder)
diff --git a/mailbox/nntp/mbox.c b/mailbox/nntp/mbox.c
index abd74a3..d41f7ed 100644
--- a/mailbox/nntp/mbox.c
+++ b/mailbox/nntp/mbox.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -58,34 +58,34 @@
/* Functions/Methods that implements the mailbox_t API. */
-static void nntp_mailbox_destroy __P ((mailbox_t));
-static int nntp_mailbox_open __P ((mailbox_t, int));
-static int nntp_mailbox_close __P ((mailbox_t));
-static int nntp_mailbox_get_message __P ((mailbox_t, size_t, message_t *));
-static int nntp_mailbox_messages_count __P ((mailbox_t, size_t *));
-static int nntp_mailbox_scan __P ((mailbox_t, size_t, size_t *));
+static void nntp_mailbox_destroy (mailbox_t);
+static int nntp_mailbox_open (mailbox_t, int);
+static int nntp_mailbox_close (mailbox_t);
+static int nntp_mailbox_get_message (mailbox_t, size_t, message_t *);
+static int nntp_mailbox_messages_count (mailbox_t, size_t *);
+static int nntp_mailbox_scan (mailbox_t, size_t, size_t *);
/* FIXME
- static int nntp_mailbox_get_size __P ((mailbox_t, off_t *)); */
+ static int nntp_mailbox_get_size (mailbox_t, off_t *); */
-static int nntp_message_get_transport2 __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int nntp_message_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int nntp_message_size __P ((message_t, size_t *));
+static int nntp_message_get_transport2 (stream_t, mu_transport_t *, mu_transport_t *);
+static int nntp_message_read (stream_t, char *, size_t, off_t, size_t *);
+static int nntp_message_size (message_t, size_t *);
/* FIXME
- static int nntp_message_line __P ((message_t, size_t *)); */
-static int nntp_message_uidl __P ((message_t, char *, size_t, size_t *));
-static int nntp_message_uid __P ((message_t, size_t *));
+ static int nntp_message_line (message_t, size_t *); */
+static int nntp_message_uidl (message_t, char *, size_t, size_t *);
+static int nntp_message_uid (message_t, size_t *);
/* FIXME
- static int nntp_header_get_transport2 __P ((header_t, char *,
- size_t, off_t, size_t *)); */
-static int nntp_header_fill __P ((header_t, char *, size_t, off_t, size_t *));
+ static int nntp_header_get_transport2 (header_t, char *,
+ size_t, off_t, size_t *); */
+static int nntp_header_fill (header_t, char *, size_t, off_t, size_t *);
-static int nntp_body_get_transport2 __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int nntp_body_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int nntp_body_size __P ((body_t, size_t *));
-static int nntp_body_lines __P ((body_t, size_t *));
+static int nntp_body_get_transport2 (stream_t, mu_transport_t *, mu_transport_t *);
+static int nntp_body_read (stream_t, char *, size_t, off_t, size_t *);
+static int nntp_body_size (body_t, size_t *);
+static int nntp_body_lines (body_t, size_t *);
-static int nntp_get_transport2 __P ((msg_nntp_t, mu_transport_t *, mu_transport_t *));
+static int nntp_get_transport2 (msg_nntp_t, mu_transport_t *, mu_transport_t *);
int
_nntp_mailbox_init (mailbox_t mbox)
diff --git a/mailbox/nntp/nntp0.h b/mailbox/nntp/nntp0.h
index d4ce274..b4f4b2e 100644
--- a/mailbox/nntp/nntp0.h
+++ b/mailbox/nntp/nntp0.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@ typedef struct _nntp_folder *f_nntp_t;
typedef struct _nntp_mailbox *m_nntp_t;
typedef struct _nntp_message *msg_nntp_t;
-extern int _nntp_url_init __P ((url_t));
-extern int _nntp_mailbox_init __P ((mailbox_t));
-extern int _nntp_folder_init __P ((folder_t));
+extern int _nntp_url_init (url_t);
+extern int _nntp_mailbox_init (mailbox_t);
+extern int _nntp_folder_init (folder_t);
struct _nntp_folder
{
diff --git a/mailbox/observer.c b/mailbox/observer.c
index 76d097a..54e99b5 100644
--- a/mailbox/observer.c
+++ b/mailbox/observer.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -73,8 +73,8 @@ observer_action (observer_t observer, size_t type)
}
int
-observer_set_action (observer_t observer, int (*_action)
- __P ((observer_t, size_t)), void *owner)
+observer_set_action (observer_t observer,
+ int (*_action) (observer_t, size_t), void *owner)
{
if (observer == NULL)
return EINVAL;
@@ -85,7 +85,7 @@ observer_set_action (observer_t observer, int (*_action)
}
int
-observer_set_destroy (observer_t observer, int (*_destroy) __P((observer_t)),
+observer_set_destroy (observer_t observer, int (*_destroy) (observer_t),
void *owner)
{
if (observer == NULL)
diff --git a/mailbox/pop/folder.c b/mailbox/pop/folder.c
index adf3f05..673fac8 100644
--- a/mailbox/pop/folder.c
+++ b/mailbox/pop/folder.c
@@ -58,11 +58,11 @@ static struct _record _pop_record =
};
record_t pop_record = &_pop_record;
-static int folder_pop_open __P ((folder_t, int));
-static int folder_pop_close __P ((folder_t));
-static int folder_pop_get_authority __P ((folder_t, authority_t *));
-extern int _pop_user __P ((authority_t));
-extern int _pop_apop __P ((authority_t));
+static int folder_pop_open (folder_t, int);
+static int folder_pop_close (folder_t);
+static int folder_pop_get_authority (folder_t, authority_t *);
+extern int _pop_user (authority_t);
+extern int _pop_apop (authority_t);
/* XXX: The way, the POP folder is handled is not clean at all.
the I/O functions should have been here on folder, not in mbx_pop.c */
diff --git a/mailbox/pop/mbox.c b/mailbox/pop/mbox.c
index 8926714..4de08de 100644
--- a/mailbox/pop/mbox.c
+++ b/mailbox/pop/mbox.c
@@ -110,52 +110,52 @@ enum pop_state
#define CAPA_STLS 0x00000100
#define CAPA_IMPLEMENTATION 0x00000200
-static void pop_destroy __P ((mailbox_t));
-static int pop_capa __P ((mailbox_t));
-static int pop_stls __P ((mailbox_t));
+static void pop_destroy (mailbox_t);
+static int pop_capa (mailbox_t);
+static int pop_stls (mailbox_t);
/* Functions/Methods that implements the mailbox_t API. */
-static int pop_open __P ((mailbox_t, int));
-static int pop_close __P ((mailbox_t));
-static int pop_get_message __P ((mailbox_t, size_t, message_t *));
-static int pop_messages_count __P ((mailbox_t, size_t *));
-static int pop_messages_recent __P ((mailbox_t, size_t *));
-static int pop_message_unseen __P ((mailbox_t, size_t *));
-static int pop_expunge __P ((mailbox_t));
-static int pop_scan __P ((mailbox_t, size_t, size_t *));
-static int pop_is_updated __P ((mailbox_t));
+static int pop_open (mailbox_t, int);
+static int pop_close (mailbox_t);
+static int pop_get_message (mailbox_t, size_t, message_t *);
+static int pop_messages_count (mailbox_t, size_t *);
+static int pop_messages_recent (mailbox_t, size_t *);
+static int pop_message_unseen (mailbox_t, size_t *);
+static int pop_expunge (mailbox_t);
+static int pop_scan (mailbox_t, size_t, size_t *);
+static int pop_is_updated (mailbox_t);
/* The implementation of message_t */
-int _pop_user __P ((authority_t));
-int _pop_apop __P ((authority_t));
-static int pop_get_size __P ((mailbox_t, off_t *));
+int _pop_user (authority_t);
+int _pop_apop (authority_t);
+static int pop_get_size (mailbox_t, off_t *);
/* We use pop_top for retreiving headers. */
/* static int pop_header_read (header_t, char *, size_t, off_t, size_t *); */
-static int pop_body_transport __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int pop_body_size __P ((body_t, size_t *));
-static int pop_body_lines __P ((body_t, size_t *));
-static int pop_body_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int pop_message_read __P ((stream_t, char *, size_t, off_t, size_t *));
-static int pop_message_size __P ((message_t, size_t *));
-static int pop_message_transport __P ((stream_t, mu_transport_t *, mu_transport_t *));
-static int pop_top __P ((header_t, char *, size_t, off_t, size_t *));
-static int pop_retr __P ((pop_message_t, char *, size_t, off_t, size_t *));
-static int pop_get_transport2 __P ((pop_message_t, mu_transport_t *, mu_transport_t *));
-static int pop_get_attribute __P ((attribute_t, int *));
-static int pop_set_attribute __P ((attribute_t, int));
-static int pop_unset_attribute __P ((attribute_t, int));
-static int pop_uidl __P ((message_t, char *, size_t, size_t *));
-static int pop_uid __P ((message_t, size_t *));
-static int fill_buffer __P ((pop_data_t, char *, size_t));
-static int pop_sleep __P ((int));
-static int pop_readline __P ((pop_data_t));
-static int pop_read_ack __P ((pop_data_t));
-static int pop_writeline __P ((pop_data_t, const char *, ...));
-static int pop_write __P ((pop_data_t));
-static int pop_get_user __P ((authority_t));
-static int pop_get_passwd __P ((authority_t));
-static char *pop_get_timestamp __P ((pop_data_t));
-static int pop_get_md5 __P ((pop_data_t));
+static int pop_body_transport (stream_t, mu_transport_t *, mu_transport_t *);
+static int pop_body_size (body_t, size_t *);
+static int pop_body_lines (body_t, size_t *);
+static int pop_body_read (stream_t, char *, size_t, off_t, size_t *);
+static int pop_message_read (stream_t, char *, size_t, off_t, size_t *);
+static int pop_message_size (message_t, size_t *);
+static int pop_message_transport (stream_t, mu_transport_t *, mu_transport_t *);
+static int pop_top (header_t, char *, size_t, off_t, size_t *);
+static int pop_retr (pop_message_t, char *, size_t, off_t, size_t *);
+static int pop_get_transport2 (pop_message_t, mu_transport_t *, mu_transport_t *);
+static int pop_get_attribute (attribute_t, int *);
+static int pop_set_attribute (attribute_t, int);
+static int pop_unset_attribute (attribute_t, int);
+static int pop_uidl (message_t, char *, size_t, size_t *);
+static int pop_uid (message_t, size_t *);
+static int fill_buffer (pop_data_t, char *, size_t);
+static int pop_sleep (int);
+static int pop_readline (pop_data_t);
+static int pop_read_ack (pop_data_t);
+static int pop_writeline (pop_data_t, const char *, ...);
+static int pop_write (pop_data_t);
+static int pop_get_user (authority_t);
+static int pop_get_passwd (authority_t);
+static char *pop_get_timestamp (pop_data_t);
+static int pop_get_md5 (pop_data_t);
/* This structure holds the info for a message. The pop_message_t
type, will serve as the owner of the message_t and contains the command to
diff --git a/mailbox/property.c b/mailbox/property.c
index 9154e34..7e72e82 100644
--- a/mailbox/property.c
+++ b/mailbox/property.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,8 +29,7 @@
#undef min
#define min(a,b) ((a) < (b) ? (a) : (b))
-static int property_find __P ((property_t, const char *,
- struct property_item **));
+static int property_find (property_t, const char *, struct property_item **);
int
property_create (property_t *pp, void *owner)
diff --git a/mailbox/registrar.c b/mailbox/registrar.c
index edb0d8b..405f2c2 100644
--- a/mailbox/registrar.c
+++ b/mailbox/registrar.c
@@ -174,7 +174,7 @@ record_set_scheme (record_t record, const char *scheme)
int
record_set_is_scheme (record_t record, int (*_is_scheme)
- __P ((record_t, const char *, int)))
+ (record_t, const char *, int))
{
if (record == NULL)
return EINVAL;
@@ -183,7 +183,7 @@ record_set_is_scheme (record_t record, int (*_is_scheme)
}
int
-record_get_url (record_t record, int (*(*_purl)) __P ((url_t)))
+record_get_url (record_t record, int (*(*_purl)) (url_t))
{
if (record == NULL)
return EINVAL;
@@ -197,7 +197,7 @@ record_get_url (record_t record, int (*(*_purl)) __P ((url_t)))
}
int
-record_set_url (record_t record, int (*_url) __P ((url_t)))
+record_set_url (record_t record, int (*_url) (url_t))
{
if (record == NULL)
return EINVAL;
@@ -207,7 +207,7 @@ record_set_url (record_t record, int (*_url) __P ((url_t)))
int
record_set_get_url (record_t record, int (*_get_url)
- __P ((record_t, int (*(*)) __P ((url_t)))))
+ (record_t, int (*(*)) (url_t)))
{
if (record == NULL)
return EINVAL;
@@ -216,7 +216,7 @@ record_set_get_url (record_t record, int (*_get_url)
}
int
-record_get_mailbox (record_t record, int (*(*_pmailbox)) __P ((mailbox_t)))
+record_get_mailbox (record_t record, int (*(*_pmailbox)) (mailbox_t))
{
if (record == NULL)
return EINVAL;
@@ -230,7 +230,7 @@ record_get_mailbox (record_t record, int (*(*_pmailbox)) __P ((mailbox_t)))
}
int
-record_set_mailbox (record_t record, int (*_mailbox) __P ((mailbox_t)))
+record_set_mailbox (record_t record, int (*_mailbox) (mailbox_t))
{
if (record)
return EINVAL;
@@ -239,8 +239,8 @@ record_set_mailbox (record_t record, int (*_mailbox) __P ((mailbox_t)))
}
int
-record_set_get_mailbox (record_t record, int (*_get_mailbox)
- __P ((record_t, int (*(*)) __P((mailbox_t)))))
+record_set_get_mailbox (record_t record,
+ int (*_get_mailbox) (record_t, int (*(*)) (mailbox_t)))
{
if (record)
return EINVAL;
@@ -249,7 +249,7 @@ record_set_get_mailbox (record_t record, int (*_get_mailbox)
}
int
-record_get_mailer (record_t record, int (*(*_pmailer)) __P ((mailer_t)))
+record_get_mailer (record_t record, int (*(*_pmailer)) (mailer_t))
{
if (record == NULL)
return EINVAL;
@@ -263,7 +263,7 @@ record_get_mailer (record_t record, int (*(*_pmailer)) __P ((mailer_t)))
}
int
-record_set_mailer (record_t record, int (*_mailer) __P ((mailer_t)))
+record_set_mailer (record_t record, int (*_mailer) (mailer_t))
{
if (record)
return EINVAL;
@@ -272,8 +272,8 @@ record_set_mailer (record_t record, int (*_mailer) __P ((mailer_t)))
}
int
-record_set_get_mailer (record_t record, int (*_get_mailer)
- __P ((record_t, int (*(*)) __P ((mailer_t)))))
+record_set_get_mailer (record_t record,
+ int (*_get_mailer) (record_t, int (*(*)) (mailer_t)))
{
if (record == NULL)
return EINVAL;
@@ -282,7 +282,7 @@ record_set_get_mailer (record_t record, int (*_get_mailer)
}
int
-record_get_folder (record_t record, int (*(*_pfolder)) __P ((folder_t)))
+record_get_folder (record_t record, int (*(*_pfolder)) (folder_t))
{
if (record == NULL)
return EINVAL;
@@ -296,7 +296,7 @@ record_get_folder (record_t record, int (*(*_pfolder)) __P ((folder_t)))
}
int
-record_set_folder (record_t record, int (*_folder) __P ((folder_t)))
+record_set_folder (record_t record, int (*_folder) (folder_t))
{
if (record == NULL)
return EINVAL;
@@ -305,8 +305,8 @@ record_set_folder (record_t record, int (*_folder) __P ((folder_t)))
}
int
-record_set_get_folder (record_t record, int (*_get_folder)
- __P ((record_t, int (*(*)) __P ((folder_t)))))
+record_set_get_folder (record_t record,
+ int (*_get_folder) (record_t, int (*(*)) (folder_t)))
{
if (record == NULL)
return EINVAL;
diff --git a/mailbox/stream.c b/mailbox/stream.c
index 5e2e667..aaefb28 100644
--- a/mailbox/stream.c
+++ b/mailbox/stream.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -605,7 +605,7 @@ stream_set_readline (stream_t stream, int (*_readline)
int
stream_set_write (stream_t stream, int (*_write)
- __P ((stream_t, const char *, size_t, off_t, size_t *)),
+ (stream_t, const char *, size_t, off_t, size_t *),
void *owner)
{
if (stream == NULL)
diff --git a/mailbox/ticket.c b/mailbox/ticket.c
index 3c88012..fa765d3 100644
--- a/mailbox/ticket.c
+++ b/mailbox/ticket.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -81,7 +81,7 @@ ticket_destroy (ticket_t *pticket, void *owner)
}
int
-ticket_set_destroy (ticket_t ticket, void (*_destroy) __P ((ticket_t)),
+ticket_set_destroy (ticket_t ticket, void (*_destroy) (ticket_t),
void *owner)
{
if (ticket == NULL)
@@ -100,7 +100,7 @@ ticket_get_owner (ticket_t ticket)
int
ticket_set_pop (ticket_t ticket,
- int (*_pop) __P ((ticket_t, url_t, const char *, char **)),
+ int (*_pop) (ticket_t, url_t, const char *, char **),
void *owner)
{
if (ticket == NULL)
diff --git a/mailbox/wicket.c b/mailbox/wicket.c
index dcbe1b2..117bd24 100644
--- a/mailbox/wicket.c
+++ b/mailbox/wicket.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -44,11 +44,11 @@ struct myticket_data
char *filename;
};
-static int myticket_create __P ((ticket_t *, const char *, const char *, const char *));
-static void myticket_destroy __P ((ticket_t));
-static int myticket_pop __P ((ticket_t, url_t, const char *, char **));
-static int get_pass __P ((url_t, const char *, const char *, char**));
-static int get_user __P ((url_t, const char *, char **));
+static int myticket_create (ticket_t *, const char *, const char *, const char *);
+static void myticket_destroy (ticket_t);
+static int myticket_pop (ticket_t, url_t, const char *, char **);
+static int get_pass (url_t, const char *, const char *, char**);
+static int get_user (url_t, const char *, char **);
int
wicket_create (wicket_t *pwicket, const char *filename)
@@ -116,7 +116,7 @@ wicket_set_filename (wicket_t wicket, const char *filename)
int
wicket_set_ticket (wicket_t wicket, int get_ticket
- __P ((wicket_t, const char *, const char *, ticket_t *)))
+ (wicket_t, const char *, const char *, ticket_t *))
{
if (wicket == NULL)
return EINVAL;
diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index 96e332a..c2d5c79 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ struct mh_option mh_option[] = {
char *format_str;
static mh_format_t format;
-typedef int (*action_fp) __P((void));
+typedef int (*action_fp) (void);
static int
action_dump ()
diff --git a/mh/mh.h b/mh/mh.h
index cfd99a4..86fdc57 100644
--- a/mh/mh.h
+++ b/mh/mh.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@
#include <getline.h>
#if !HAVE_DECL_STRCHRNUL
-extern char *strchrnul __P((const char *s, int c_in));
+extern char *strchrnul (const char *s, int c_in);
#endif
#define MH_FMT_RALIGN 0x1000
@@ -140,7 +140,7 @@ enum mh_type
typedef enum mh_opcode mh_opcode_t;
struct mh_machine;
-typedef void (*mh_builtin_fp) __P((struct mh_machine *));
+typedef void (*mh_builtin_fp) (struct mh_machine *);
typedef union {
mh_opcode_t opcode;
@@ -191,8 +191,8 @@ typedef struct
size_t *list;
} mh_msgset_t;
-typedef void (*mh_iterator_fp) __P((mailbox_t mbox, message_t msg,
- size_t num, void *data));
+typedef void (*mh_iterator_fp) (mailbox_t mbox, message_t msg,
+ size_t num, void *data);
/* Recipient masks */
#define RCPT_NONE 0
@@ -217,8 +217,7 @@ struct mh_whatnow_env { /* An environment for whatnow shell */
#define DISP_USE 1
#define DISP_REPLACE 2
-typedef int (*mh_context_iterator) __PMT((char *field,
- char *value, char *data));
+typedef int (*mh_context_iterator) (char *field, char *value, char *data);
#define SEQ_PRIVATE 1
#define SEQ_ZERO 2
@@ -228,128 +227,126 @@ extern size_t current_message;
extern char mh_list_format[];
extern int rcpt_mask;
-void mh_init __P((void));
-void mh_init2 __P((void));
-void mh_read_profile __P((void));
-int mh_read_formfile __P((char *name, char **pformat));
+void mh_init (void);
+void mh_init2 (void);
+void mh_read_profile (void);
+int mh_read_formfile (char *name, char **pformat);
message_t mh_file_to_message (char *folder, char *file_name);
message_t mh_stream_to_message (stream_t stream);
-void mh_install __P((char *name, int automode));
-
-char *mh_global_profile_get __P((char *name, const char *defval));
-int mh_global_profile_set __P((const char *name, const char *value));
-char *mh_global_context_get __P((const char *name, const char *defval));
-int mh_global_context_set __P((const char *name, const char *value));
-char *mh_current_folder __P((void));
-char *mh_global_sequences_get __P((const char *name, const char *defval));
-int mh_global_sequences_set __P((const char *name, const char *value));
-void mh_global_save_state __P((void));
-int mh_global_profile_iterate __P((mh_context_iterator fp, void *data));
-int mh_global_context_iterate __P((mh_context_iterator fp, void *data));
-int mh_global_sequences_iterate __P((mh_context_iterator fp, void *data));
-void mh_global_sequences_drop __P((void));
-
-int mh_interactive_mode_p __P((void));
-int mh_getyn __P((const char *fmt, ...));
-int mh_getyn_interactive __P((const char *fmt, ...));
-int mh_check_folder __P((char *pathname, int confirm));
-
-int mh_format __P((mh_format_t *fmt, message_t msg, size_t msgno,
- size_t width, char **pret));
-int mh_format_str __P((mh_format_t *fmt, char *str, size_t width, char **pret));
-void mh_format_dump __P((mh_format_t *fmt));
-int mh_format_parse __P((char *format_str, mh_format_t *fmt));
-void mh_format_debug __P((int val));
-void mh_format_free __P((mh_format_t *fmt));
-mh_builtin_t *mh_lookup_builtin __P((char *name, int *rest));
-
-void mh_error __P((const char *fmt, ...));
-void mh_err_memory __P((int fatal));
-
-FILE *mh_audit_open __P((char *name, mailbox_t mbox));
-void mh_audit_close __P((FILE *fp));
-
-mh_context_t *mh_context_create __P((char *name, int copy));
-int mh_context_read __P((mh_context_t *ctx));
-int mh_context_write __P((mh_context_t *ctx));
-char *mh_context_get_value __P((mh_context_t *ctx, const char *name,
- const char *defval));
-int mh_context_set_value __P((mh_context_t *ctx, const char *name,
- const char *value));
-int mh_context_iterate __P((mh_context_t *ctx,
- mh_context_iterator fp, void *data));
-
-int mh_message_number __P((message_t msg, size_t *pnum));
-
-mailbox_t mh_open_folder __P((const char *folder, int create));
-
-int mh_msgset_parse __P((mailbox_t mbox, mh_msgset_t *msgset,
- int argc, char **argv, char *def));
-int mh_msgset_member __P((mh_msgset_t *msgset, size_t num));
-void mh_msgset_reverse __P((mh_msgset_t *msgset));
-void mh_msgset_negate __P((mailbox_t mbox, mh_msgset_t *msgset));
-int mh_msgset_current __P((mailbox_t mbox, mh_msgset_t *msgset, int index));
-void mh_msgset_free __P((mh_msgset_t *msgset));
-void mh_msgset_uids __P((mailbox_t mbox, mh_msgset_t *msgset));
-
-char *mh_get_dir __P((void));
-char *mh_expand_name __P((const char *base, const char *name, int is_folder));
-
-int mh_is_my_name __P((char *name));
-char * mh_my_email __P((void));
-
-int mh_iterate __P((mailbox_t mbox, mh_msgset_t *msgset,
- mh_iterator_fp itr, void *data));
-
-size_t mh_get_message __P((mailbox_t mbox, size_t seqno, message_t *mesg));
-
-int mh_decode_rcpt_flag __P((const char *arg));
-
-void *xmalloc __P((size_t));
-void *xrealloc __P((void *, size_t));
+void mh_install (char *name, int automode);
+
+char *mh_global_profile_get (char *name, const char *defval);
+int mh_global_profile_set (const char *name, const char *value);
+char *mh_global_context_get (const char *name, const char *defval);
+int mh_global_context_set (const char *name, const char *value);
+char *mh_current_folder (void);
+char *mh_global_sequences_get (const char *name, const char *defval);
+int mh_global_sequences_set (const char *name, const char *value);
+void mh_global_save_state (void);
+int mh_global_profile_iterate (mh_context_iterator fp, void *data);
+int mh_global_context_iterate (mh_context_iterator fp, void *data);
+int mh_global_sequences_iterate (mh_context_iterator fp, void *data);
+void mh_global_sequences_drop (void);
+
+int mh_interactive_mode_p (void);
+int mh_getyn (const char *fmt, ...);
+int mh_getyn_interactive (const char *fmt, ...);
+int mh_check_folder (char *pathname, int confirm);
+
+int mh_format (mh_format_t *fmt, message_t msg, size_t msgno,
+ size_t width, char **pret);
+int mh_format_str (mh_format_t *fmt, char *str, size_t width, char **pret);
+void mh_format_dump (mh_format_t *fmt);
+int mh_format_parse (char *format_str, mh_format_t *fmt);
+void mh_format_debug (int val);
+void mh_format_free (mh_format_t *fmt);
+mh_builtin_t *mh_lookup_builtin (char *name, int *rest);
+
+void mh_error (const char *fmt, ...);
+void mh_err_memory (int fatal);
+
+FILE *mh_audit_open (char *name, mailbox_t mbox);
+void mh_audit_close (FILE *fp);
+
+mh_context_t *mh_context_create (char *name, int copy);
+int mh_context_read (mh_context_t *ctx);
+int mh_context_write (mh_context_t *ctx);
+char *mh_context_get_value (mh_context_t *ctx, const char *name,
+ const char *defval);
+int mh_context_set_value (mh_context_t *ctx, const char *name,
+ const char *value);
+int mh_context_iterate (mh_context_t *ctx, mh_context_iterator fp, void *data);
+
+int mh_message_number (message_t msg, size_t *pnum);
+
+mailbox_t mh_open_folder (const char *folder, int create);
+
+int mh_msgset_parse (mailbox_t mbox, mh_msgset_t *msgset,
+ int argc, char **argv, char *def);
+int mh_msgset_member (mh_msgset_t *msgset, size_t num);
+void mh_msgset_reverse (mh_msgset_t *msgset);
+void mh_msgset_negate (mailbox_t mbox, mh_msgset_t *msgset);
+int mh_msgset_current (mailbox_t mbox, mh_msgset_t *msgset, int index);
+void mh_msgset_free (mh_msgset_t *msgset);
+void mh_msgset_uids (mailbox_t mbox, mh_msgset_t *msgset);
+
+char *mh_get_dir (void);
+char *mh_expand_name (const char *base, const char *name, int is_folder);
+
+int mh_is_my_name (char *name);
+char * mh_my_email (void);
+
+int mh_iterate (mailbox_t mbox, mh_msgset_t *msgset,
+ mh_iterator_fp itr, void *data);
+
+size_t mh_get_message (mailbox_t mbox, size_t seqno, message_t *mesg);
+
+int mh_decode_rcpt_flag (const char *arg);
+
+void *xmalloc (size_t);
+void *xrealloc (void *, size_t);
-int mh_spawnp __P((const char *prog, const char *file));
-int mh_whatnow __P((struct mh_whatnow_env *wh, int initial_edit));
-int mh_disposition __P((const char *filename));
-int mh_usedraft __P((const char *filename));
-int mh_file_copy __P((const char *from, const char *to));
-char *mh_draft_name __P((void));
-char *mh_create_message_id __P((int));
-int mh_whom __P((char *filename, int check));
-void mh_set_reply_regex __P((const char *str));
-int mh_decode_2047 __P((char *text, char **decoded_text));
-
-int mh_alias_read __P((char *name, int fail));
-int mh_alias_get __P((char *name, list_t *return_list));
-int mh_alias_get_address __P((char *name, address_t *addr, int *incl));
-int mh_alias_get_alias __P((char *uname, list_t *return_list));
-int mh_read_aliases __P((void));
-int mh_alias_expand __P((char *str, address_t *paddr, int *incl));
-
-typedef int (*mh_alias_enumerator_t) __PMT((char *alias, list_t names,
- void *data));
-void mh_alias_enumerate __P((mh_alias_enumerator_t fun, void *data));
-
-
-void mh_annotate __P((message_t msg, char *field, char *text, int date));
+int mh_spawnp (const char *prog, const char *file);
+int mh_whatnow (struct mh_whatnow_env *wh, int initial_edit);
+int mh_disposition (const char *filename);
+int mh_usedraft (const char *filename);
+int mh_file_copy (const char *from, const char *to);
+char *mh_draft_name (void);
+char *mh_create_message_id (int);
+int mh_whom (char *filename, int check);
+void mh_set_reply_regex (const char *str);
+int mh_decode_2047 (char *text, char **decoded_text);
+
+int mh_alias_read (char *name, int fail);
+int mh_alias_get (char *name, list_t *return_list);
+int mh_alias_get_address (char *name, address_t *addr, int *incl);
+int mh_alias_get_alias (char *uname, list_t *return_list);
+int mh_read_aliases (void);
+int mh_alias_expand (char *str, address_t *paddr, int *incl);
+
+typedef int (*mh_alias_enumerator_t) (char *alias, list_t names, void *data);
+void mh_alias_enumerate (mh_alias_enumerator_t fun, void *data);
+
+
+void mh_annotate (message_t msg, char *field, char *text, int date);
#define MHL_DECODE 1
#define MHL_CLEARSCREEN 2
#define MHL_BELL 4
#define MHL_DISABLE_BODY 8
-list_t mhl_format_compile __P((char *name));
-int mhl_format_run __P((list_t fmt, int width, int length, int flags,
- message_t msg, stream_t output));
+list_t mhl_format_compile (char *name);
+int mhl_format_run (list_t fmt, int width, int length, int flags,
+ message_t msg, stream_t output);
void mhl_format_destroy (list_t *fmt);
-void mh_seq_add __P((char *name, mh_msgset_t *mset, int flags));
-int mh_seq_delete __P((char *name, mh_msgset_t *mset, int flags));
-char *mh_seq_read __P((char *name, int flags));
+void mh_seq_add (char *name, mh_msgset_t *mset, int flags);
+int mh_seq_delete (char *name, mh_msgset_t *mset, int flags);
+char *mh_seq_read (char *name, int flags);
-void mh_comp_draft __P((char *formfile, char *defformfile, char *draftfile));
-int check_draft_disposition __P((struct mh_whatnow_env *wh, int use_draft));
+void mh_comp_draft (char *formfile, char *defformfile, char *draftfile);
+int check_draft_disposition (struct mh_whatnow_env *wh, int use_draft);
-void ali_parse_error __P((char *fmt, ...));
-void ali_verbatim __P((int enable));
+void ali_parse_error (char *fmt, ...);
+void ali_verbatim (int enable);
diff --git a/mh/mh_alias.l b/mh/mh_alias.l
index cb1152d..48f9d32 100644
--- a/mh/mh_alias.l
+++ b/mh/mh_alias.l
@@ -1,6 +1,6 @@
%{
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -96,10 +96,10 @@ yyerror (char *s)
#else
/* AT&T Lex */
-static void lex_set_buffer __P((FILE *fp));
-static void lex_delete_buffer __P((LEX_BUFFER_STATE buf));
-static int xinput __P((void));
-static int xunput __P((void));
+static void lex_set_buffer (FILE *fp);
+static void lex_delete_buffer (LEX_BUFFER_STATE buf);
+static int xinput (void);
+static int xunput (void);
#undef unput
#define unput(c) xunput(c)
@@ -335,7 +335,7 @@ pop_source ()
return 0;
}
-extern int yyparse __P((void));
+extern int yyparse (void);
%}
WS [ \t]+
diff --git a/mh/mh_alias.y b/mh/mh_alias.y
index 66056fb..0a68d95 100644
--- a/mh/mh_alias.y
+++ b/mh/mh_alias.y
@@ -87,12 +87,12 @@ ali_list_to_string (list_t *plist)
return string;
}
-static list_t unix_group_to_list __P((char *name));
-static list_t unix_gid_to_list __P((char *name));
-static list_t unix_passwd_to_list __P((void));
+static list_t unix_group_to_list (char *name);
+static list_t unix_gid_to_list (char *name);
+static list_t unix_passwd_to_list (void);
-int yyerror __P((char *s));
-int yylex __P((void));
+int yyerror (char *s);
+int yylex (void);
%}
@@ -281,8 +281,8 @@ _insert_list (list_t list, void *prev, list_t new_list)
return 0;
}
-static int mh_alias_get_internal __P((char *name, iterator_t start,
- list_t *return_list, int *inclusive));
+static int mh_alias_get_internal (char *name, iterator_t start,
+ list_t *return_list, int *inclusive);
int
alias_expand_list (list_t name_list, iterator_t orig_itr, int *inclusive)
diff --git a/mh/mh_format.c b/mh/mh_format.c
index fb42690..e8277f0 100644
--- a/mh/mh_format.c
+++ b/mh/mh_format.c
@@ -59,7 +59,7 @@ struct mh_machine
size_t msgno; /* Its number */
};
-static char *_get_builtin_name __P((mh_builtin_fp ptr));
+static char *_get_builtin_name (mh_builtin_fp ptr);
/* Functions for handling string objects. */
diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h
index 6a909df..5100ff2 100644
--- a/mh/mh_getopt.h
+++ b/mh/mh_getopt.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -176,14 +176,13 @@ struct mh_argp_data
#define ARG_WIDTH 391
#define ARG_ZERO 392
-void mh_argv_preproc __P((int argc, char **argv, struct mh_argp_data *data));
-int mh_getopt __P((int argc, char **argv, struct mh_option *mh_opt,
- const char *doc));
-int mh_argp_parse __P((int *argc, char **argv[],
- int flags,
- struct argp_option *option,
- struct mh_option *mh_option,
- char *argp_doc, char *doc,
- int (*handler)(), void *closure, int *index));
-void mh_help __P((struct mh_option *mh_option, const char *doc));
-void mh_license __P((const char *name));
+void mh_argv_preproc (int argc, char **argv, struct mh_argp_data *data);
+int mh_getopt (int argc, char **argv, struct mh_option *mh_opt, const char *doc);
+int mh_argp_parse (int *argc, char **argv[],
+ int flags,
+ struct argp_option *option,
+ struct mh_option *mh_option,
+ char *argp_doc, char *doc,
+ int (*handler)(), void *closure, int *index);
+void mh_help (struct mh_option *mh_option, const char *doc);
+void mh_license (const char *name);
diff --git a/mh/mh_list.c b/mh/mh_list.c
index 09c8aae..c559bdd 100644
--- a/mh/mh_list.c
+++ b/mh/mh_list.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -85,7 +85,7 @@ struct mhl_stmt
} v;
};
-static mhl_variable_t *variable_lookup __P((char *name));
+static mhl_variable_t *variable_lookup (char *name);
static mhl_stmt_t *
stmt_alloc (enum mhl_type type)
diff --git a/mh/mh_msgset.c b/mh/mh_msgset.c
index ee455cd..0a5c380 100644
--- a/mh/mh_msgset.c
+++ b/mh/mh_msgset.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -129,7 +129,7 @@ msgset_next (mailbox_t mbox, size_t *pnum)
static struct msgset_keyword {
char *name;
- int (*handler) __P((mailbox_t mbox, size_t *pnum));
+ int (*handler) (mailbox_t mbox, size_t *pnum);
} keywords[] = {
{ "first", msgset_first },
{ "last", msgset_last },
@@ -229,8 +229,8 @@ comp_mesg (const void *a, const void *b)
return 0;
}
-static int _mh_msgset_parse __P((mailbox_t mbox, mh_msgset_t *msgset,
- int argc, char **argv));
+static int _mh_msgset_parse (mailbox_t mbox, mh_msgset_t *msgset,
+ int argc, char **argv);
/* Treat arg as a name of user-defined sequence and attempt to
expand it. Return 0 if succeeded, non-zero otherwise. */
diff --git a/mh/mhn.c b/mh/mhn.c
index 853611c..62a0142 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -111,16 +111,16 @@ struct mh_option mh_option[] = {
typedef struct _msg_part *msg_part_t;
-static msg_part_t msg_part_create __P((size_t num));
-static void msg_part_destroy __P((msg_part_t p));
-static int msg_part_eq __P((msg_part_t a, msg_part_t b));
-static void msg_part_incr __P((msg_part_t p));
-static void msg_part_decr __P((msg_part_t p));
-static void msg_part_set_subpart __P((msg_part_t p, size_t subpart));
-static void msg_part_print __P((msg_part_t p, int width));
-static msg_part_t msg_part_parse __P((char *str));
-static int msg_part_level __P((msg_part_t p));
-static size_t msg_part_subpart __P((msg_part_t p, int level));
+static msg_part_t msg_part_create (size_t num);
+static void msg_part_destroy (msg_part_t p);
+static int msg_part_eq (msg_part_t a, msg_part_t b);
+static void msg_part_incr (msg_part_t p);
+static void msg_part_decr (msg_part_t p);
+static void msg_part_set_subpart (msg_part_t p, size_t subpart);
+static void msg_part_print (msg_part_t p, int width);
+static msg_part_t msg_part_parse (char *str);
+static int msg_part_level (msg_part_t p);
+static size_t msg_part_subpart (msg_part_t p, int level);
enum mhn_mode {
mode_compose,
diff --git a/mh/pick.h b/mh/pick.h
index fb4fffc..605058d 100644
--- a/mh/pick.h
+++ b/mh/pick.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,6 +57,6 @@ struct node
} v;
};
-void pick_add_token __P((list_t *list, int tok, char *val));
-int pick_parse __P((list_t toklist));
-int pick_eval __P((message_t msg));
+void pick_add_token (list_t *list, int tok, char *val);
+int pick_parse (list_t toklist);
+int pick_eval (message_t msg);
diff --git a/mh/refile.c b/mh/refile.c
index c5a9256..bf51fea 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
+ Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -118,7 +118,7 @@ open_folders ()
}
void
-enumerate_folders (void (*f) __P((void *, mailbox_t)), void *data)
+enumerate_folders (void (*f) (void *, mailbox_t), void *data)
{
iterator_t itr;
diff --git a/mh/scan.c b/mh/scan.c
index 5224f0e..2bb2af9 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -84,9 +84,9 @@ static mh_format_t format;
static mh_msgset_t msgset;
-void list_message __P((mailbox_t mbox, message_t msg, size_t num, void *data));
-void print_header __P((mailbox_t mbox));
-void clear_screen __P((void));
+void list_message (mailbox_t mbox, message_t msg, size_t num, void *data);
+void print_header (mailbox_t mbox);
+void clear_screen (void);
static int
opt_handler (int key, char *arg, void *unused, struct argp_state *state)
diff --git a/mh/sortm.c b/mh/sortm.c
index 35a68ba..e9d1f41 100644
--- a/mh/sortm.c
+++ b/mh/sortm.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -109,11 +109,11 @@ static char *format_str = mh_list_format;
static mh_format_t format;
typedef int (*compfun) __PMT((void *, void *));
-static void addop __P((char *field, compfun comp));
-static void remop __P((compfun comp));
-static int comp_text __P((void *a, void *b));
-static int comp_date __P((void *a, void *b));
-static int comp_number __P((void *a, void *b));
+static void addop (char *field, compfun comp);
+static void remop (compfun comp);
+static int comp_text (void *a, void *b);
+static int comp_date (void *a, void *b);
+static int comp_number (void *a, void *b);
static int
opt_handler (int key, char *arg, void *unused, struct argp_state *state)
diff --git a/po/ca.po b/po/ca.po
index c9e9057..71a701d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mailutils 0.6.90\n"
"Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-05-17 15:23+0300\n"
+"POT-Creation-Date: 2005-08-16 13:23+0300\n"
"PO-Revision-Date: 2005-05-21 04:10+0200\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -17,8 +17,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n!=1;\n"
#: config/mailutils-config.c:28
-msgid "GNU mailutils-config -- Display compiler and loader options needed for building a program with mailutils"
-msgstr "GNU mailutils-config -- Mostra les opcions del compilador i carregador necessitades per a construir un programa amb mailutils"
+msgid ""
+"GNU mailutils-config -- Display compiler and loader options needed for "
+"building a program with mailutils"
+msgstr ""
+"GNU mailutils-config -- Mostra les opcions del compilador i carregador "
+"necessitades per a construir un programa amb mailutils"
#: config/mailutils-config.c:29
msgid "[arg...]"
@@ -29,21 +33,35 @@ msgid "Print C compiler flags to compile with"
msgstr "Mostra les senyals del compilador de C en les quals compilar"
#: config/mailutils-config.c:35
-msgid "Print libraries to link with. Possible arguments are: auth, guile, all, mbox, mh, maildir, imap, pop"
-msgstr "Mostra les biblioteques amb les quals lincar. Els arguments possibles són: auth, guile, all, mbox, mh, maildir, imap, pop"
+msgid ""
+"Print libraries to link with. Possible arguments are: auth, guile, all, "
+"mbox, mh, maildir, imap, pop"
+msgstr ""
+"Mostra les biblioteques amb les quals lincar. Els arguments possibles són: "
+"auth, guile, all, mbox, mh, maildir, imap, pop"
#: config/mailutils-config.c:38
-msgid "Print a list of configuration options used to build mailutils. If arguments are given, they are interpreted as a list of configuration options to check for. In this case the program prints those options from this list that have been defined. It exits with zero status if all of the specified options are defined. Otherwise, the exit status is 1."
-msgstr "Mostra una llista de opcions de compilació usades per construir mailutils. Si es donen arguments, s'interpreten com una llista d'opcions de compilació a ser comprovades. En aquest cas, el programa mostra les opcions d'aquesta llista que estan definides. Ix amb estat zero si totes les opcions especificades estan definides. Si no, l'estat d'eixida és 1."
+msgid ""
+"Print a list of configuration options used to build mailutils. If arguments "
+"are given, they are interpreted as a list of configuration options to check "
+"for. In this case the program prints those options from this list that have "
+"been defined. It exits with zero status if all of the specified options are "
+"defined. Otherwise, the exit status is 1."
+msgstr ""
+"Mostra una llista de opcions de compilació usades per construir mailutils. "
+"Si es donen arguments, s'interpreten com una llista d'opcions de compilació "
+"a ser comprovades. En aquest cas, el programa mostra les opcions d'aquesta "
+"llista que estan definides. Ix amb estat zero si totes les opcions "
+"especificades estan definides. Si no, l'estat d'eixida és 1."
-#: config/mailutils-config.c:126 frm/from.c:129 mh/folder.c:568
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
msgid "Too many arguments"
msgstr "S'han donat massa arguments"
-#: auth/pam.c:153 auth/sql.c:196 auth/sql.c:198 auth/sql.c:202
+#: auth/pam.c:153 auth/sql.c:197 auth/sql.c:199 auth/sql.c:203
#: mail.local/main.c:87 mail.local/main.c:92 mh/anno.c:43 mh/pick.c:45
#: mh/pick.c:48 mh/pick.c:50 mh/pick.c:52 mh/pick.c:54 mh/pick.c:56
-#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:84
+#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:83
msgid "STRING"
msgstr "CADENA"
@@ -51,86 +69,92 @@ msgstr "CADENA"
msgid "Use STRING as PAM service name"
msgstr "Usa CADENA com el nom del servei PAM"
-#: auth/sql.c:184 auth/sql.c:194 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
+#: auth/sql.c:185 auth/sql.c:195 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
#: mh/mark.c:32 mh/pick.c:87
msgid "NAME"
msgstr "NOM"
-#: auth/sql.c:185
+#: auth/sql.c:186
msgid "Type of SQL interface to use"
msgstr "Tipus d'interfície SQL a utilitzar"
-#: auth/sql.c:186 auth/sql.c:188 auth/sql.c:190
+#: auth/sql.c:187 auth/sql.c:189 auth/sql.c:191
msgid "QUERY"
msgstr "CONSULTA"
-#: auth/sql.c:187
+#: auth/sql.c:188
msgid "SQL query to retrieve a passwd entry based on username"
-msgstr "Consulta SQL per a obtindre una entrada de contrasenya basada en el nom d'usuari"
+msgstr ""
+"Consulta SQL per a obtindre una entrada de contrasenya basada en el nom "
+"d'usuari"
-#: auth/sql.c:189
+#: auth/sql.c:190
msgid "SQL query to retrieve a passwd entry based on UID"
msgstr "Consulta SQL per a obtindre una entrada de contrasenya basada en l'UID"
-#: auth/sql.c:191
+#: auth/sql.c:192
msgid "SQL query to retrieve a password from the database"
msgstr "Consulta SQL per a obtindre una contrasenya de la base de dades"
-#: auth/sql.c:192
+#: auth/sql.c:193
msgid "HOSTNAME"
msgstr "SERVIDOR"
-#: auth/sql.c:193
+#: auth/sql.c:194
msgid "Name or IP of MySQL server to connect to"
msgstr "Nom o IP del servidor MySQL al que connectar"
-#: auth/sql.c:195
+#: auth/sql.c:196
msgid "SQL user name"
msgstr "Nom d'usuari SQL"
-#: auth/sql.c:197
+#: auth/sql.c:198
msgid "SQL connection password"
msgstr "Contrasenya de connexió SQL"
-#: auth/sql.c:199
+#: auth/sql.c:200
msgid "Name of the database to connect to"
msgstr "Nom de la base de dades a la qual connectar"
-#: auth/sql.c:200 mailbox/mu_argp.c:79 mailbox/mu_argp.c:114
-#: mailbox/mu_argp.c:120 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
+#: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
msgid "NUMBER"
msgstr "NÚMERO"
-#: auth/sql.c:201
+#: auth/sql.c:202
msgid "Port to use"
msgstr "Port a usar"
-#: auth/sql.c:203
-msgid "Type of password returned by --sql-getpass query. STRING is one of: plain, hash, scrambled"
-msgstr "El tipus de contrasenya tornat per la consulta --sql-getpass. CADENA és una de: plan, hash, scrambled"
+#: auth/sql.c:204
+msgid ""
+"Type of password returned by --sql-getpass query. STRING is one of: plain, "
+"hash, scrambled"
+msgstr ""
+"El tipus de contrasenya tornat per la consulta --sql-getpass. CADENA és una "
+"de: plan, hash, scrambled"
-#: auth/sql.c:215
+#: auth/sql.c:216
#, c-format
msgid "Unknown SQL interface `%s'"
msgstr "La interfície SQL «%s» no és coneguda"
-#: auth/sql.c:258
+#: auth/sql.c:259
#, c-format
msgid "Unknown password type `%s'"
msgstr "El tipus de contrasenya «%s» no és conegut"
-#: auth/sql.c:324 auth/sql.c:456 auth/sql.c:577 mail.local/mailquota.c:191
+#: auth/sql.c:325 auth/sql.c:455 auth/sql.c:574 mail.local/mailquota.c:191
#, c-format
msgid "SQL Query failed: %s"
msgstr "la consulta SQL ha fallat: %s"
-#: auth/sql.c:335 auth/sql.c:467 auth/sql.c:588 mail.local/mailquota.c:202
+#: auth/sql.c:336 auth/sql.c:466 auth/sql.c:585 mail.local/mailquota.c:202
#, c-format
msgid "Cannot store SQL result: %s"
msgstr "No es pot emmagatzemar el resultat SQL: %s"
-#: auth/sql.c:598
+#: auth/sql.c:595
#, c-format
msgid "Cannot get password from SQL: %s"
msgstr "No es pot obtenir la contrasenya des d'SQL: %s"
@@ -141,10 +165,10 @@ msgstr "Opcions de xifrat"
#: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
#: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
-#: mailbox/mu_argp.c:124 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
+#: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
-#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:82 pop3d/popauth.c:83
+#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
#: mimeview/mimeview.c:48 mimeview/mimeview.c:52
msgid "FILE"
msgstr "FITXER"
@@ -295,92 +319,94 @@ msgstr "S'està reiniciant"
#: comsat/comsat.c:186
msgid "Cannot restart: program must be invoked using absolute pathname"
-msgstr "No es pot reiniciar: el programa s'ha d'invocar utilitzant un camí absolut"
+msgstr ""
+"No es pot reiniciar: el programa s'ha d'invocar utilitzant un camí absolut"
-#: comsat/comsat.c:220
+#: comsat/comsat.c:216
msgid "Failed to become a daemon"
msgstr "No s'ha pogut convertir en dimoni"
-#: comsat/comsat.c:264
+#: comsat/comsat.c:260
msgid "GNU comsat started"
msgstr "s'ha iniciat GNU comsat"
-#: comsat/comsat.c:292
+#: comsat/comsat.c:288
#, c-format
msgid "Too many requests: pausing for %u second"
msgid_plural "Too many requests: pausing for %u seconds"
msgstr[0] "Hi ha massa peticions: es pausarà durant %u segon"
msgstr[1] "Hi ha massa peticions: es pausarà durant %u segons"
-#: comsat/comsat.c:347
+#: comsat/comsat.c:343
#, c-format
msgid "DENIED attempt to connect from %s"
msgstr "S'ha DENEGAT l'intent de connexió des de %s"
-#: comsat/comsat.c:353
+#: comsat/comsat.c:349
#, c-format
msgid "Received %d byte from %s"
msgid_plural "Received %d bytes from %s"
msgstr[0] "S'ha rebut %d octet des de %s"
msgstr[1] "S'ha rebut %d octets des de %s"
-#: comsat/comsat.c:363
+#: comsat/comsat.c:359
#, c-format
msgid "Malformed input: %s"
msgstr "Entrada malformada: %s"
-#: comsat/comsat.c:378
+#: comsat/comsat.c:374
#, c-format
msgid "Malformed input: %s@%s (near %s)"
msgstr "Entrada malformada: %s@%s (prop de %s)"
-#: comsat/comsat.c:444
+#: comsat/comsat.c:440
#, c-format
msgid "Cannot open device %s: %m"
msgstr "No es pot obrir el dispositiu %s: %m"
-#: comsat/comsat.c:460 mail/file.c:92 mail/mail.c:438 mail.local/main.c:690
-#: mail.local/main.c:709 mh/inc.c:218 mh/mh_init.c:379 pop3d/apop.c:240
+#: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
+#: mh/mh_init.c:379 pop3d/apop.c:240
#, c-format
msgid "Cannot open mailbox %s: %s"
msgstr "No es pot obrir la bústia %s: %s"
-#: comsat/comsat.c:467 mail.local/main.c:728
+#: comsat/comsat.c:463 mail.local/main.c:724
#, c-format
msgid "Cannot get stream for mailbox %s: %s"
msgstr "No es pot obtindre el flux per a la bústia %s: %s"
-#: comsat/comsat.c:474 mail.local/main.c:736
+#: comsat/comsat.c:470 mail.local/main.c:732
#, c-format
msgid "Cannot get stream size (mailbox %s): %s"
msgstr "No es pot obtindre la mida del flux (bústia %s): %s"
-#: comsat/comsat.c:491 pop3d/apop.c:230
+#: comsat/comsat.c:487 pop3d/apop.c:230
#, c-format
msgid "Cannot create temporary mailbox: %s"
msgstr "No es pot crear una bústia temporal: %s"
-#: comsat/comsat.c:498
+#: comsat/comsat.c:494
#, c-format
msgid "Cannot create temporary stream: %s"
msgstr "No es pot crear un flux temporal: %s"
-#: comsat/comsat.c:545
+#: comsat/comsat.c:541
#, c-format
msgid "Bad line name in utmp record: %s"
msgstr "Línia de nom errònia en el registre utmp: %s"
-#: comsat/comsat.c:553
+#: comsat/comsat.c:549
#, c-format
msgid "Not a character device: %s"
msgstr "No és un dispositiu de caràcter: %s"
-#: comsat/comsat.c:586 pop3d/popauth.c:309 pop3d/popauth.c:546
+#: comsat/comsat.c:582 pop3d/popauth.c:308 pop3d/popauth.c:545
#, c-format
msgid "No such user: %s"
msgstr "No existeix l'usuari: %s"
-#: comsat/comsat.c:606
+#: comsat/comsat.c:602
#, c-format
msgid "User nonexistent: %s"
msgstr "No existeix l'usuari: %s"
@@ -388,8 +414,14 @@ msgstr "No existeix l'usuari: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: dotlock/dotlock.c:38
-msgid "GNU dotlock -- lock mail spool files Returns 0 on success, 3 if locking the file fails because it's already locked, and 1 if some other kind of error occurred."
-msgstr "GNU dotlock -- bloca fitxers de cues de correu Torna 0 en èxit, 3 si el blocatge del fitxer falla perquè ja està blocat, i 1 si ha ocorregut qualsevol altra clase d'error."
+msgid ""
+"GNU dotlock -- lock mail spool files Returns 0 on success, 3 if locking the "
+"file fails because it's already locked, and 1 if some other kind of error "
+"occurred."
+msgstr ""
+"GNU dotlock -- bloca fitxers de cues de correu Torna 0 en èxit, 3 si el "
+"blocatge del fitxer falla perquè ja està blocat, i 1 si ha ocorregut "
+"qualsevol altra clase d'error."
#: dotlock/dotlock.c:47
msgid "Unlock"
@@ -481,8 +513,14 @@ msgstr "llegit"
#. differ by the first letter.
#.
#: frm/frm.c:62
-msgid "Select messages with the specific attribute. STATUS is one of the following: new, unread, old (same as unread) or read. Any unambiguous abbreviation of those is also accepted."
-msgstr "Seleccioneu missatges amb l'atribut específic. ESTAT és un dels següents: nou, no llegit, vell (el mateix que no llegit) o llegit. Qualsevol abrevació no ambigua d'aquestes també s'accepta."
+msgid ""
+"Select messages with the specific attribute. STATUS is one of the following: "
+"new, unread, old (same as unread) or read. Any unambiguous abbreviation of "
+"those is also accepted."
+msgstr ""
+"Seleccioneu missatges amb l'atribut específic. ESTAT és un dels següents: "
+"nou, no llegit, vell (el mateix que no llegit) o llegit. Qualsevol abrevació "
+"no ambigua d'aquestes també s'accepta."
#: frm/frm.c:127
#, c-format
@@ -601,7 +639,8 @@ msgstr "ADREÇA"
#: frm/from.c:31
msgid "Print only mail from addresses containing the supplied string"
-msgstr "Mostra només els correus d'adreces que continguen la cadena suministrada"
+msgstr ""
+"Mostra només els correus d'adreces que continguen la cadena suministrada"
#: frm/from.c:33
msgid "Read mail from FILE"
@@ -611,11 +650,11 @@ msgstr "Llegeix el correu des de FITXER"
msgid "[OPTIONS] [USER]"
msgstr "[OPCIONS] [USUARI]"
-#: frm/from.c:136
+#: frm/from.c:135
msgid "Both --from option and user name are specified"
msgstr "S'especifica tant l'opció --from com el nom d'usuari"
-#: frm/from.c:151
+#: frm/from.c:150
#, c-format
msgid "There is %lu message in your incoming mailbox.\n"
msgid_plural "There are %lu messages in your incoming mailbox.\n"
@@ -627,7 +666,7 @@ msgstr[1] "Hi ha %lu missatges a la vostra bústia d'entrada.\n"
msgid "fribidi failed to recognize charset `%s'"
msgstr "fribidi no ha reconegut el joc de caràcters «%s»"
-#: frm/common.c:374 mail/util.c:1398
+#: frm/common.c:374 mail/util.c:1453
#, c-format
msgid "Cannot decode line `%s': %s"
msgstr "No es pot decodificar la línia «%s»: %s"
@@ -659,37 +698,42 @@ msgstr "No s'ha pogut obrir la bústia «%s»: %s"
msgid "Could not scan mailbox `%s': %s."
msgstr "No s'ha pogut analitzar la bústia «%s»: %s."
-#: guimb/collect.c:35 guimb/main.c:45 imap4d/auth_gss.c:267
-#: libsieve/sieve.l:131 libsieve/sieve.l:602 libsieve/sieve.l:666
-#: libsieve/sieve.l:720 mail/folders.c:38 mail/if.c:56 mail/util.c:761
-#: mh/mh_init.c:111 mh/mh_init.c:316 mh/mh_msgset.c:606
-msgid "Not enough memory"
-msgstr "No hi ha memòria suficient"
+#: guimb/collect.c:35
+#, fuzzy, c-format
+msgid "Cannot construct default mailbox URL: %s"
+msgstr "No es pot obrir la bústia per defecte %s: %s"
-#: guimb/collect.c:42
+#: guimb/collect.c:43
#, c-format
msgid "Cannot open default mailbox %s: %s"
msgstr "No es pot obrir la bústia per defecte %s: %s"
-#: guimb/collect.c:86
+#: guimb/collect.c:87
#, c-format
msgid "Cannot open input file %s: %s"
msgstr "No es pot obrir el fitxer d'entrada %s: %s"
-#: guimb/collect.c:114
+#: guimb/collect.c:115
#, c-format
msgid "Cannot create temp mailbox %s: %s"
msgstr "No es pot crear una bústia temporal %s: %s"
-#: guimb/collect.c:125
+#: guimb/collect.c:126
msgid "Input format not recognized"
msgstr "El format d'entrada no és reconegut"
-#: guimb/collect.c:150
+#: guimb/collect.c:151
#, c-format
msgid "Cannot open output mailbox %s: %s\n"
msgstr "No es pot obrir la bústia d'eixida %s: %s\n"
+#: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
+#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
+#: mh/mh_init.c:316 mh/mh_msgset.c:606
+msgid "Not enough memory"
+msgstr "No hi ha memòria suficient"
+
#. TRANSLATORS: (command-line) is the name of Guile function. Do not
#. translate it.
#.
@@ -746,8 +790,12 @@ msgid "Act as local MDA for user NAME"
msgstr "Actua com un MDA local per a l'usuari NOM"
#: guimb/main.c:126
-msgid "GNU guimb -- Process the contents of the specified mailboxes using a Scheme program or expression."
-msgstr "GNU guimb -- Processa els continguts de les bústies especificades utilitzant un programa o expressió Scheme."
+msgid ""
+"GNU guimb -- Process the contents of the specified mailboxes using a Scheme "
+"program or expression."
+msgstr ""
+"GNU guimb -- Processa els continguts de les bústies especificades utilitzant "
+"un programa o expressió Scheme."
#: guimb/main.c:128 messages/messages.c:35
msgid "[mailbox...]"
@@ -755,9 +803,10 @@ msgstr "[bústia...]"
#: guimb/main.c:170
msgid "At least one of -fecs must be used. Try guimb --help for more info."
-msgstr "Al menys una de -fecs s'ha d'usar. Proveu guimp --help per a més informació."
+msgstr ""
+"Al menys una de -fecs s'ha d'usar. Proveu guimp --help per a més informació."
-#: guimb/util.c:51 guimb/util.c:58 mail/util.c:687 mail/util.c:694
+#: guimb/util.c:51 guimb/util.c:58 mail/util.c:799 mail/util.c:806
#, c-format
msgid "Cannot determine sender name (msg %d)"
msgstr "No es pot determinar el nom del remitent (msg %d)"
@@ -819,19 +868,19 @@ msgstr "Inhabilita l'ordre LOGIN"
msgid "Always require STARTTLS before entering authentication phase"
msgstr "Requereix sempre STARTTLS abans d'iniciar la fase d'autenticació"
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:202
+#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
msgid "Error getting mail group"
msgstr "S'ha produït un error a l'obtindre el grup mail"
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:208
+#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
msgid "Error setting mail group"
msgstr "S'ha produït un error a l'establir el grup mail"
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:299
+#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
msgid "Incoming connection opened"
msgstr "Connexió entrant oberta"
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:311
+#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
#, c-format
msgid "Cannot obtain IP address of client: %s"
msgstr "No es pot obtindre l'adreça IP del client: %s"
@@ -841,7 +890,7 @@ msgstr "No es pot obtindre l'adreça IP del client: %s"
msgid "Connect from %s"
msgstr "Connexió des de %s"
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:304
+#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
msgid "Started in debugging mode"
msgstr "S'ha iniciat en mode de depuració"
@@ -894,7 +943,7 @@ msgid "Quitting (numeric reason %d)"
msgstr "S'està eixint (raó numèrica %d)"
#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
-#: mh/rmf.c:147 pop3d/popauth.c:247
+#: mh/rmf.c:147 pop3d/popauth.c:246
#, c-format
msgid "Cannot stat %s: %s"
msgstr "No es pot fer «stat» de %s: %s"
@@ -923,70 +972,70 @@ msgstr "S'ha rebut el senyal %s"
msgid "MASTER: exiting on signal"
msgstr "MESTRE: s'està eixint en el senyal"
-#: imap4d/util.c:485
+#: imap4d/util.c:509
msgid "Unexpected eof on input"
msgstr "eof inesperat en l'entrada"
-#: imap4d/util.c:494
+#: imap4d/util.c:518
#, c-format
msgid "Error reading from input file: %s"
msgstr "Error en llegir des del fitxer d'entrada: %s"
-#: imap4d/util.c:981
+#: imap4d/util.c:1005
msgid "Cannot find out my own hostname"
msgstr "No es pot trobar el nostre propi nom de l'ordinador"
-#: imap4d/util.c:1128
+#: imap4d/util.c:1152
#, c-format
msgid "Cannot poll input stream: %s"
msgstr "No es pot sondejar el flux d'entrada: %s"
-#: imap4d/util.c:1162
+#: imap4d/util.c:1186
#, c-format
msgid "Cannot open TLS stream: %s"
msgstr "No es pot obrir el flux de TLS: %s"
-#: lib/mailcap.c:331
+#: lib/mailcap.c:337
#, c-format
msgid "Run `%s'?"
msgstr "Voleu executar «%s»?"
-#: lib/mailcap.c:367
+#: lib/mailcap.c:373
#, c-format
msgid "cannot retrieve field %lu: %s"
msgstr "no es pot obtenir el camp %lu: %s"
-#: lib/mailcap.c:439
+#: lib/mailcap.c:445
#, c-format
msgid "Cannot execute `%s': %s"
msgstr "No es pot executar «%s»: %s"
-#: lib/mailcap.c:456
+#: lib/mailcap.c:462
#, c-format
msgid "Command exited with status %d\n"
msgstr "L'ordre ha sortit amb l'estat %d\n"
-#: lib/mailcap.c:458
+#: lib/mailcap.c:464
#, c-format
msgid "Command terminated on signal %d\n"
msgstr "L'ordre ha eixit en rebre el senyal %d\n"
-#: lib/mailcap.c:460
+#: lib/mailcap.c:466
#, c-format
msgid "Command terminated\n"
msgstr "L'ordre ha finalitzat\n"
-#: lib/mailcap.c:544 mimeview/mimeview.c:201
+#: lib/mailcap.c:550 mimeview/mimeview.c:201
#, c-format
msgid "Executing %s...\n"
msgstr "S'està executant %s...\n"
-#: lib/mailcap.c:587
+#: lib/mailcap.c:593
#, c-format
msgid "Trying %s...\n"
msgstr "S'està provant %s...\n"
-#: lib/mailcap.c:629
+#: lib/mailcap.c:635
#, c-format
msgid "Found in %s\n"
msgstr "S'ha trobat en %s\n"
@@ -1009,57 +1058,57 @@ msgstr "s'està repartint en %s"
msgid "cannot save to mailbox: %s"
msgstr "no es pot desar en una bústia temporal: %s"
-#: libsieve/actions.c:243
+#: libsieve/actions.c:252
msgid "reject: cannot get text!"
msgstr "reject: no es pot obtindre text!"
-#: libsieve/actions.c:259 libsieve/extensions/vacation.c:445
+#: libsieve/actions.c:268 libsieve/extensions/vacation.c:443
#, c-format
msgid "%d: cannot create recipient address <%s>: %s"
msgstr "%d: no es pot crear l'adreça del destinatari <%s>: %s"
-#: libsieve/actions.c:271 libsieve/actions.c:400
+#: libsieve/actions.c:280 libsieve/actions.c:409
#, c-format
msgid "%d: cannot create sender address <%s>: %s"
msgstr "%d: no es pot crear l'adreça de procedència <%s>: %s"
-#: libsieve/actions.c:285 libsieve/actions.c:440
-#: libsieve/extensions/vacation.c:480
+#: libsieve/actions.c:294 libsieve/actions.c:449
+#: libsieve/extensions/vacation.c:478
#, c-format
msgid "%d: cannot open mailer %s: %s"
msgstr "%d: no es pot obrir el servidor de correu %s: %s"
-#: libsieve/actions.c:360
+#: libsieve/actions.c:369
msgid "cannot get address!"
msgstr "no es pot obtindre l'adreça"
-#: libsieve/actions.c:368
+#: libsieve/actions.c:377
#, c-format
msgid "%d: parsing recipient address `%s' failed: %s"
msgstr "%d: l'anàlisi de l'adreça de destinatari «%s» ha fallat: %s"
-#: libsieve/actions.c:374
+#: libsieve/actions.c:383
#, c-format
msgid "to %s"
msgstr "a %s"
-#: libsieve/actions.c:381
+#: libsieve/actions.c:390
#, c-format
msgid "%d: Redirection loop detected"
msgstr "%d: s'ha detectat un bucle de redirecció"
# Val, una merda de traducció, però de què collons parla? jm
-#: libsieve/actions.c:390
+#: libsieve/actions.c:399
#, c-format
msgid "%d: cannot get envelope sender: %s"
msgstr "%d: no es pot obtindre l'enviador del sobre: %s"
-#: libsieve/actions.c:413
+#: libsieve/actions.c:422
#, c-format
msgid "%d: cannot copy message: %s"
msgstr "%d: no es pot copiar el missatge: %s"
-#: libsieve/actions.c:428
+#: libsieve/actions.c:437
#, c-format
msgid "%d: cannot get my email address"
msgstr "%d: no es pot determinar la nostra adreça de correu"
@@ -1076,7 +1125,8 @@ msgstr "Error d'expreg"
#: libsieve/comparator.c:238
#, c-format
msgid "match type specified twice in call to `%s'"
-msgstr "s'ha especificat dos vegades el tipus de coincidència en la crida a «%s»"
+msgstr ""
+"s'ha especificat dos vegades el tipus de coincidència en la crida a «%s»"
#. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
#: libsieve/comparator.c:275
@@ -1100,7 +1150,9 @@ msgstr "coincidència relacional «%s» no vàlida en la crida a «%s»"
#: libsieve/comparator.c:322
#, c-format
msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
-msgstr "el comparador «%s» és incompatible amb el tipus de coincidència «%s» en la crida a «%s»"
+msgstr ""
+"el comparador «%s» és incompatible amb el tipus de coincidència «%s» en la "
+"crida a «%s»"
#: libsieve/prog.c:39
msgid "out of memory!"
@@ -1182,35 +1234,35 @@ msgstr "pila buida"
msgid "mailbox_scan: %s"
msgstr "mailbox_scan: %s"
-#: libsieve/sieve.l:233
+#: libsieve/sieve.l:234
#, c-format
msgid "cannot stat `%s': %s"
msgstr "no es pot fer «stat» de «%s»: %s"
-#: libsieve/sieve.l:239 libsieve/sieve.l:244
+#: libsieve/sieve.l:240 libsieve/sieve.l:245
msgid "recursive inclusion"
msgstr "inclusió recursiva"
-#: libsieve/sieve.l:247
+#: libsieve/sieve.l:248
#, c-format
msgid "`%s' already included here"
msgstr "«%s» ja està inclòs ací"
-#: libsieve/sieve.l:251
+#: libsieve/sieve.l:252
#, c-format
msgid "`%s' already included at top level"
msgstr "«%s» ja està inclòs en el nivell superior"
-#: libsieve/sieve.l:260
+#: libsieve/sieve.l:261
#, c-format
msgid "cannot open `%s': %s"
msgstr "no es pot obrir «%s»: %s"
-#: libsieve/sieve.l:438
+#: libsieve/sieve.l:439
msgid "preprocessor syntax"
msgstr "sintaxi de preprocessador"
-#: libsieve/sieve.l:447
+#: libsieve/sieve.l:448
msgid "missing closing quote in preprocessor statement"
msgstr "falten les comilles finals en la sentència de preprocessador"
@@ -1243,28 +1295,30 @@ msgstr "tipus de dades invàlid"
msgid "cannot retrieve argument %d"
msgstr "no es pot obtenir l'argument %d"
-#: libsieve/extensions/vacation.c:257
+#: libsieve/extensions/vacation.c:255
#, c-format
msgid "%d: cannot build db file name"
msgstr "%d: no es pot construir el nom del fitxer db"
-#: libsieve/extensions/vacation.c:268
+#: libsieve/extensions/vacation.c:266
#, c-format
msgid "%d: cannot open `%s': %s"
msgstr "%d: no es pot obrir «%s»: %s"
#. TRANSLATORS: 'vacation' and ':days' are Sieve keywords.
#. Do not translate them!
-#: libsieve/extensions/vacation.c:311
+#: libsieve/extensions/vacation.c:309
#, c-format
msgid "%d: vacation compiled without DBM support. Ignoring :days tag"
-msgstr "%d: vacation ha estat compilat sense suport per a DBM. S'està ignorant l'etiqueta :days"
+msgstr ""
+"%d: vacation ha estat compilat sense suport per a DBM. S'està ignorant "
+"l'etiqueta :days"
-#: libsieve/extensions/vacation.c:507
+#: libsieve/extensions/vacation.c:505
msgid "cannot get text!"
msgstr "no es pot obtindre text!"
-#: libsieve/extensions/vacation.c:524
+#: libsieve/extensions/vacation.c:522
#, c-format
msgid "%d: cannot get sender address"
msgstr "%d: no es pot determinar l'adreça de correu del remitent"
@@ -1274,6 +1328,10 @@ msgstr "%d: no es pot determinar l'adreça de correu del remitent"
msgid "cannot parse date specification (%s)"
msgstr "no es pot analitzar l'especificació de la data (%s)"
+#: mail/alias.c:100
+msgid "alias hash table full"
+msgstr ""
+
#: mail/alias.c:195
#, c-format
msgid "\"%s\": not a group"
@@ -1288,12 +1346,18 @@ msgstr "No es pot determinar el nostre nom d'usuari"
msgid "Cannot determine my email address: %s"
msgstr "No es pot determinar la nostra adreça de correu: %s"
-#: mail/copy.c:69 mail/quit.c:113 mail/send.c:542
+#: mail/cd.c:40
+#, fuzzy, c-format
+msgid "cannot change to '%s': %s"
+msgstr "no es pot fer «stat» de «%s»: %s"
+
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
+#: mh/mh_init.c:369
#, c-format
-msgid "Cannot create mailbox %s"
-msgstr "No es pot crear la bústia %s"
+msgid "Cannot create mailbox %s: %s"
+msgstr "No es pot crear la bústia %s: %s"
-#: mail/copy.c:84 mail/quit.c:120 mail/send.c:535
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
#, c-format
msgid "Cannot append message: %s"
msgstr "No es pot agregar el missatge: %s"
@@ -1313,7 +1377,7 @@ msgstr "| Tipus=%s\n"
msgid "| Encoding=%s\n"
msgstr "| Codificació=%s\n"
-#: mail/decode.c:267 mail/print.c:97
+#: mail/decode.c:267 mail/print.c:96
msgid ""
"\n"
"Interrupt"
@@ -1321,19 +1385,104 @@ msgstr ""
"\n"
"Interrupció"
-#: mail/file.c:40
+#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#, c-format
+msgid "Cannot create header: %s"
+msgstr "No es pot crear la capçalera: %s"
+
+#: mail/escape.c:95 mail/escape.c:121
+#, c-format
+msgid "%d: not a header line"
+msgstr "%d: no és una línia de capçalera"
+
+#: mail/escape.c:142
+msgid "Edit again?"
+msgstr "Editar de nou?"
+
+#: mail/escape.c:157
+#, c-format
+msgid "(continue)\n"
+msgstr "(continua)\n"
+
+#: mail/escape.c:167
+#, c-format
+msgid "%c%s requires an argument"
+msgstr "%c%s requereix un argument"
+
+#: mail/escape.c:200 mail/util.c:115
+#, c-format
+msgid "Unknown command: %s"
+msgstr "Ordre desconeguda: %s"
+
+#: mail/escape.c:205
+msgid "Command not allowed in an escape sequence\n"
+msgstr "L'ordre no està permessa en una seqüència d'escapada\n"
+
+#: mail/escape.c:248 mail/escape.c:547 mail/escape.c:602 pop3d/popauth.c:284
+#: pop3d/popauth.c:355 pop3d/popauth.c:429
+#, c-format
+msgid "Cannot open %s: %s"
+msgstr "No es pot obrir %s: %s"
+
+#: mail/escape.c:252
+#, c-format
+msgid "Reading %s\n"
+msgstr "S'està llegint %s\n"
+
+#: mail/escape.c:451
+#, c-format
+msgid "Interpolating: %d\n"
+msgstr "S'està interpolant: %d\n"
+
+#: mail/escape.c:519
+#, c-format
+msgid "Message contains:\n"
+msgstr "El missatge conté:\n"
+
+#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
+#: mail/escape.c:633
+msgid "pipe: no command specified"
+msgstr "pipe: no s'ha especificat cap ordre"
+
+#: mail/escape.c:677
+#, c-format
+msgid "Cannot exec process `%s': %s"
+msgstr "No es pot executar el procés «%s»: %s"
+
+#: mail/escape.c:710
+#, c-format
+msgid "Child terminated abnormally: %d"
+msgstr "El fill ha terminat anormalment: %d"
+
+#: mail/escape.c:717
+#, c-format
+msgid "Cannot stat output file: %s"
+msgstr "No es pot fer «stat» del fitxer d'eixida: %s"
+
+#: mail/escape.c:727
+#, c-format
+msgid "no lines out\n"
+msgstr "no hi ha línies d'eixida\n"
+
+#: mail/file.c:41
msgid "No previous file"
msgstr "Cap fitxer anterior"
-#: mail/file.c:48
+#: mail/file.c:51
msgid "MBOX environment variable not set"
msgstr "La variable d'entorn MBOX no està fixada"
-#: mail/file.c:126
+#: mail/file.c:130
#, c-format
msgid "%s takes only one argument"
msgstr "%s només accepta un argument"
+# Urgh, què malsonant... "on aplicar". jm
+#: mail/followup.c:44 mail/next.c:40 mail/next.c:63 mail/next.c:80
+#: mail/previous.c:49 mail/previous.c:66
+msgid "No applicable message"
+msgstr "No hi ha missatges on aplicar"
+
#: mail/if.c:67
msgid "Internal error: condition stack underflow"
msgstr "Error intern: condició de pila buida"
@@ -1379,7 +1528,7 @@ msgstr "[adreça...]"
msgid "Return true if mail exists"
msgstr "Torna vertader si existeix correu"
-#: mail/mail.c:37 mailbox/mu_argp.c:73
+#: mail/mail.c:37 mailbox/mu_argp.c:74
msgid "URL"
msgstr "URL"
@@ -1460,11 +1609,6 @@ msgstr "Useu «quit» per a eixir."
msgid "Cannot create mailbox for %s: %s"
msgstr "No es pot crear la bústia per a %s: %s"
-#: mail/mail.c:421 mh/inc.c:209 mh/mh_init.c:369
-#, c-format
-msgid "Cannot create mailbox %s: %s"
-msgstr "No es pot crear la bústia %s: %s"
-
#: mail/mail.c:452
#, c-format
msgid "Cannot read mailbox %s: %s"
@@ -1480,17 +1624,19 @@ msgstr "%s: 0 missatges\n"
msgid "No mail for %s\n"
msgstr "No hi ha correu per a %s\n"
-#: mail/mail.c:537
+#: mail/mail.c:539
msgid ""
"GNU Mailutils -- a suite of utilities for electronic mail\n"
-"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software "
+"Foundation, Inc.\n"
"\n"
msgstr ""
"GNU mailutils -- una col·lecció d'eines pel correu electrònic\n"
-"Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.\n"
+"Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software "
+"Foundation, Inc.\n"
"\n"
-#: mail/mail.c:541 mailbox/mu_argp.c:254 mh/mh_argp.c:188
+#: mail/mail.c:543 mailbox/mu_argp.c:255 mh/mh_argp.c:188
#, c-format
msgid ""
" GNU Mailutils is free software; you can redistribute it and/or modify\n"
@@ -1526,40 +1672,34 @@ msgstr ""
" Boston, MA 02110-1301 USA\n"
"\n"
-#: mail/mailline.c:402 mail/mailline.c:430 mail/mailline.c:477
-#: mail/mailline.c:513
+#: mail/mailline.c:694 mail/mailline.c:722 mail/mailline.c:769
+#: mail/mailline.c:805
msgid "Not enough memory to edit the line"
msgstr "No hi ha suficient memòria per a editar la línia"
-#: mail/msgset.y:163
+#: mail/msgset.y:164
msgid "unknown message type"
msgstr "el tipus de missatge és desconegut"
-#: mail/msgset.y:248 mail/msgset.y:253
+#: mail/msgset.y:249 mail/msgset.y:254
#, c-format
msgid " near end"
msgstr " prop del final"
-#: mail/msgset.y:255 mail/msgset.y:258
+#: mail/msgset.y:256 mail/msgset.y:259
#, c-format
msgid " near %s"
msgstr " prop de %s"
-#: mail/msgset.y:473
+#: mail/msgset.y:474
msgid "range error"
msgstr "error en el rang"
-#: mail/msgset.y:736 mail/util.c:213
+#: mail/msgset.y:737 mail/util.c:185
#, c-format
msgid "%lu: Inappropriate message (has been deleted)"
msgstr "%lu: missatge inapropiat (s'ha eliminat)"
-# Urgh, què malsonant... "on aplicar". jm
-#: mail/next.c:40 mail/next.c:63 mail/next.c:80 mail/previous.c:46
-#: mail/previous.c:63
-msgid "No applicable message"
-msgstr "No hi ha missatges on aplicar"
-
#: mail/quit.c:51
#, c-format
msgid "Held %d message in %s\n"
@@ -1567,7 +1707,7 @@ msgid_plural "Held %d messages in %s\n"
msgstr[0] "S'ha mantingut %d missatge en %s\n"
msgstr[1] "S'han mantingut %d missatges en %s\n"
-#: mail/quit.c:141
+#: mail/quit.c:147
#, c-format
msgid "Saved %d message in %s\n"
msgid_plural "Saved %d messages in %s\n"
@@ -1601,11 +1741,6 @@ msgstr "No es pot crear la llista de capçaleres: %s"
msgid "Invalid header: %s"
msgstr "La capçalera és invàlida: %s"
-#: mail/send.c:225 mail/var.c:59 mh/mhn.c:2023 mimeview/mimeview.c:217
-#, c-format
-msgid "Cannot create header: %s"
-msgstr "No es pot crear la capçalera: %s"
-
#: mail/send.c:308
msgid "Cannot open temporary file"
msgstr "No es pot obrir un fitxer temporal"
@@ -1626,25 +1761,25 @@ msgstr "Useu «.» per a finalitzar la carta."
msgid "Use \"~.\" to terminate letter."
msgstr "Useu «~.» per a finalitzar la carta."
-#: mail/send.c:392
+#: mail/send.c:391
#, c-format
msgid "Unknown escape %s"
msgstr "L'escapada %s no és coneguda."
-#: mail/send.c:395
+#: mail/send.c:394
msgid "Unfinished escape"
msgstr "L'escapada no està acabada"
-#: mail/send.c:399
+#: mail/send.c:398
msgid "Cannot parse escape sequence"
msgstr "No es pot analitzar la seqüència d'escapada"
-#: mail/send.c:424 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
#, c-format
msgid "Cannot open file %s: %s"
msgstr "No es pot obrir el fitxer %s: %s"
-#: mail/send.c:485
+#: mail/send.c:484
msgid "Null message body; hope that's ok\n"
msgstr "El cos del missatge és nul, s'espera que siga correcte\n"
@@ -1702,160 +1837,92 @@ msgstr[1] " %d eliminats"
msgid "unalias requires at least one argument"
msgstr "unalias requereix al menys un argument"
-#: mail/util.c:157 mail/var.c:200
-#, c-format
-msgid "Unknown command: %s"
-msgstr "Ordre desconeguda: %s"
-
-#: mail/util.c:159
+#: mail/util.c:117
msgid "Invalid command"
msgstr "L'ordre és invàlida"
-#: mail/util.c:389
+#: mail/util.c:272
+#, c-format
+msgid "Unknown command: %s\n"
+msgstr "Ordre desconeguda: %s\n"
+
+#: mail/util.c:439
#, c-format
msgid "No value set for \"%s\""
msgstr "No hi ha cap valor establit per a «%s»"
-#: mail/util.c:487
+#: mail/util.c:594
#, c-format
msgid "oops?"
msgstr "oops?"
-#: mail/util.c:567
+#: mail/util.c:684
msgid "Incorrect value for decode-fallback"
msgstr "El valor per decode-fallback és incorrecte"
-#: mail/util.c:625
+#: mail/util.c:735
msgid "Cannot get homedir"
msgstr "No es pot obtindre el directori personal"
-#: mail/util.c:937
-#, c-format
-msgid "Cannot open save file %s: %s"
-msgstr "No es pot obrir el fitxer on desar %s: %s"
-
-#: mail/util.c:954
-msgid "Not enough memory for creating save file"
-msgstr "No hi ha memòria suficient per a crear un fitxer on desar"
+#: mail/util.c:1050
+#, fuzzy, c-format
+msgid "Cannot create output mailbox `%s': %s"
+msgstr "No es pot crear una bústia temporal %s: %s"
-#: mail/util.c:1039
-#, c-format
-msgid "Unknown command: %s\n"
-msgstr "Ordre desconeguda: %s\n"
+#: mail/util.c:1058
+#, fuzzy, c-format
+msgid "Cannot open output mailbox `%s': %s"
+msgstr "No es pot obrir la bústia d'eixida %s: %s\n"
#: mail/util.c:1064
+#, fuzzy, c-format
+msgid "Cannot append message to `%s': %s"
+msgstr "No es pot agregar el missatge %lu: %s"
+
+#: mail/util.c:1119
msgid "Cannot unencapsulate message/part"
msgstr "No es pot desencapsular el missatge o part"
-#: mail/util.c:1073
+#: mail/util.c:1128
#, c-format
msgid "No such (sub)part in the message: %d"
msgstr "No hi ha una (sub)part semblant en el missatge: %d"
-#: mail/util.c:1080
+#: mail/util.c:1135
#, c-format
msgid "Cannot get (sub)part from the message: %d"
msgstr "No es pot obtindre la (sub)part del missatge: %d"
-#: mail/util.c:1204
+#: mail/util.c:1259
#, c-format
msgid "Cannot create temporary header: %s"
msgstr "No es pot crear la capçalera temporal: %s"
-#: mail/util.c:1245
+#: mail/util.c:1300
#, c-format
msgid "Cannot parse address `%s' (while expanding `%s'): %s"
msgstr "No es pot analitzar l'adreça «%s» (a l'expandir «%s»): %s"
-#: mail/util.c:1248
+#: mail/util.c:1303
#, c-format
msgid "Cannot parse address `%s': %s"
msgstr "No es pot analitzar l'adreça «%s»: %s"
-#: mail/util.c:1301
+#: mail/util.c:1356
#, c-format
msgid "Cannot get message %lu: %s"
msgstr "No es pot obtenir el missatge %lu: %s"
-#: mail/util.c:1312
+#: mail/util.c:1367
#, c-format
msgid "%d: invalid message number"
msgstr "%d: el número de missatge no és vàlid"
# Urgh, què malsonant... "on aplicar". jm
-#: mail/util.c:1319
+#: mail/util.c:1374
msgid "No applicable messages"
msgstr "No hi ha missatges on aplicar"
-#: mail/var.c:95 mail/var.c:121
-#, c-format
-msgid "%d: not a header line"
-msgstr "%d: no és una línia de capçalera"
-
-#: mail/var.c:142
-msgid "Edit again?"
-msgstr "Editar de nou?"
-
-#: mail/var.c:157
-#, c-format
-msgid "(continue)\n"
-msgstr "(continua)\n"
-
-#: mail/var.c:167
-#, c-format
-msgid "%c%s requires an argument"
-msgstr "%c%s requereix un argument"
-
-#: mail/var.c:205
-msgid "Command not allowed in an escape sequence\n"
-msgstr "L'ordre no està permessa en una seqüència d'escapada\n"
-
-#: mail/var.c:252 mail/var.c:551 mail/var.c:606 pop3d/popauth.c:285
-#: pop3d/popauth.c:356 pop3d/popauth.c:430
-#, c-format
-msgid "Cannot open %s: %s"
-msgstr "No es pot obrir %s: %s"
-
-#: mail/var.c:256
-#, c-format
-msgid "Reading %s\n"
-msgstr "S'està llegint %s\n"
-
-#: mail/var.c:455
-#, c-format
-msgid "Interpolating: %d\n"
-msgstr "S'està interpolant: %d\n"
-
-#: mail/var.c:523
-#, c-format
-msgid "Message contains:\n"
-msgstr "El missatge conté:\n"
-
-#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
-#: mail/var.c:637
-msgid "pipe: no command specified"
-msgstr "pipe: no s'ha especificat cap ordre"
-
-#: mail/var.c:681
-#, c-format
-msgid "Cannot exec process `%s': %s"
-msgstr "No es pot executar el procés «%s»: %s"
-
-#: mail/var.c:714
-#, c-format
-msgid "Child terminated abnormally: %d"
-msgstr "El fill ha terminat anormalment: %d"
-
-#: mail/var.c:721
-#, c-format
-msgid "Cannot stat output file: %s"
-msgstr "No es pot fer «stat» del fitxer d'eixida: %s"
-
-#: mail/var.c:731
-#, c-format
-msgid "no lines out\n"
-msgstr "no hi ha línies d'eixida\n"
-
#: mail/z.c:65
msgid "Bad arguments for the scrolling command"
msgstr "Arguments erronis per a l'ordre de desplaçament"
@@ -1872,12 +1939,12 @@ msgstr "L'argument no és aplicable per a z"
msgid "Bad number of pages"
msgstr "Número erroni de pàgines"
-#: mail/z.c:128
+#: mail/z.c:124
#, c-format
msgid "On first screenful of messages\n"
msgstr "En la primera pantalla de missatges\n"
-#: mail/z.c:140 mail/z.c:151
+#: mail/z.c:132
#, c-format
msgid "On last screenful of messages\n"
msgstr "En la última pantalla de missatges\n"
@@ -1916,7 +1983,7 @@ msgstr "No tornes errors quan s'envie a múltiples destinataris"
msgid "Return temporary failure if disk or mailbox quota is exceeded"
msgstr "Torna un error temporal si la quota de disc o bústia s'ha excedit"
-#: mail.local/main.c:79 mailbox/mu_argp.c:90
+#: mail.local/main.c:79 mailbox/mu_argp.c:91
msgid "EMAIL"
msgstr "CORREU-E"
@@ -1938,17 +2005,23 @@ msgstr "PATRÓ"
#: mail.local/main.c:91
msgid "Set name pattern for user-defined Sieve mail filters"
-msgstr "Estableix el patró de noms per filtres de correu de Sieve definits per l'usuari"
+msgstr ""
+"Estableix el patró de noms per filtres de correu de Sieve definits per "
+"l'usuari"
#: mail.local/main.c:93
-msgid "Identify messages by the value of this header when logging Sieve actions"
-msgstr "Identifica missatges pel valor d'aquesta capçalera quan es registren accions Sieve"
+msgid ""
+"Identify messages by the value of this header when logging Sieve actions"
+msgstr ""
+"Identifica missatges pel valor d'aquesta capçalera quan es registren accions "
+"Sieve"
#: mail.local/main.c:96
msgid "Set name pattern for user-defined Scheme mail filters"
-msgstr "Estableix el patró de noms per filtres de correu Scheme definits per l'usuari"
+msgstr ""
+"Estableix el patró de noms per filtres de correu Scheme definits per l'usuari"
-#: mail.local/main.c:98 mailbox/mu_argp.c:75 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
#: mimeview/mimeview.c:46
msgid "FLAGS"
msgstr "SENYALADORS"
@@ -2006,81 +2079,84 @@ msgstr "mu_debug_set_print ha fallat: %s\n"
msgid "Missing arguments. Try --help for more info."
msgstr "Manquen arguments. Proveu --help per a obtindre més informació."
-#: mail.local/main.c:423 mail.local/script.c:94
+#: mail.local/main.c:419 mail.local/script.c:94
#, c-format
msgid "Access to %s failed: %m"
msgstr "No s'ha pogut accedir a %s: %m"
-#: mail.local/main.c:431 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:375
#, c-format
msgid "Cannot initialize sieve machine: %s"
msgstr "No es pot iniciar la màquina de sieve: %s"
-#: mail.local/main.c:552
+#: mail.local/main.c:548
#, c-format
msgid "Unable to open temporary file: %s"
msgstr "No es pot obrir un fitxer temporal: %s"
-#: mail.local/main.c:558
+#: mail.local/main.c:554
#, c-format
msgid "unable to open temporary file: %s"
msgstr "no es pot obrir un fitxer temporal: %s"
-#: mail.local/main.c:589
+#: mail.local/main.c:585
msgid "Cannot determine sender address"
msgstr "No es pot determinar el nom del remitent"
-#: mail.local/main.c:607 mail.local/main.c:624
+#: mail.local/main.c:603 mail.local/main.c:620
#, c-format
msgid "Error writing temporary file: %s"
msgstr "S'ha produït un error a l'escriure un fitxer temporal: %s"
-#: mail.local/main.c:634
+#: mail.local/main.c:630
#, c-format
msgid "Error opening temporary file: %s"
msgstr "S'ha produït un error en obrir un fitxer temporal: %s"
-#: mail.local/main.c:643
+#: mail.local/main.c:639
#, c-format
msgid "Error creating temporary message: %s"
msgstr "S'ha produït un error en crear un missatge temporal: %s"
-#: mail.local/main.c:668
+#: mail.local/main.c:664
#, c-format
msgid "%s: no such user"
msgstr "%s: no existeix l'usuari"
-#: mail.local/main.c:682
+#: mail.local/main.c:678
#, c-format
msgid "Cannot get input message stream: %s"
msgstr "No es pot obtindre el flux de missatge d'entrada: %s"
-#: mail.local/main.c:720
+#: mail.local/main.c:716
#, c-format
msgid "Cannot lock mailbox `%s': %s"
msgstr "No es pot blocar la bústia «%s»: %s"
-#: mail.local/main.c:750
+#: mail.local/main.c:746
#, c-format
msgid "%s: mailbox quota exceeded for this recipient"
msgstr "%s: s'ha excedit la quota de bústia per a aquest destinatari"
-#: mail.local/main.c:761
+#: mail.local/main.c:757
#, c-format
msgid "Cannot get stream size (input message): %s"
msgstr "No es pot obtindre la mida del flux (missatge d'entrada): %s"
-#: mail.local/main.c:768
+#: mail.local/main.c:764
#, c-format
msgid "%s: message would exceed maximum mailbox size for this recipient"
-msgstr "%s: el missatge excediria la mida màxima de bústia per a aquest destinatari"
+msgstr ""
+"%s: el missatge excediria la mida màxima de bústia per a aquest destinatari"
-#: mail.local/main.c:821
+#: mail.local/main.c:817
#, c-format
msgid "Error writing to mailbox: %s. Mailbox NOT truncated: %s"
-msgstr "S'ha produït un error a l'escriure en la bústia: %s. La bústia NO s'ha truncat: %s"
+msgstr ""
+"S'ha produït un error a l'escriure en la bústia: %s. La bústia NO s'ha "
+"truncat: %s"
-#: mail.local/main.c:824
+#: mail.local/main.c:820
#, c-format
msgid "Error writing to mailbox: %s"
msgstr "S'ha produït un error l'escriure en la bústia: %s"
@@ -2108,7 +2184,7 @@ msgstr "No es pot obtenir la quota de bústia des de SQL: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
-#: mail.remote/mail.remote.c:51
+#: mail.remote/mail.remote.c:52
msgid ""
"GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
" This is a simple drop-in replacement for sendmail to forward mail directly\n"
@@ -2133,7 +2209,8 @@ msgid ""
" mail.remote --mailer smtp://mail.example.com -t devnull@foo.bar\n"
msgstr ""
"GNU mail.remote -- intefície pseudo-sendmail per al lliurament de correu\n"
-" Aquest és un reemplaç simple per a sendmail per a reenviar correu directament\n"
+" Aquest és un reemplaç simple per a sendmail per a reenviar correu "
+"directament\n"
"a una pasarel·la SMTP.\n"
"Sempre haurieu d'especificar la pasarel·la SMTP utilitzant l'opció --mailer\n"
"(el millor lloc per a fer això és al vostre fitxer de configuració).\n"
@@ -2154,74 +2231,79 @@ msgstr ""
"\n"
" mail.remote --mailer smtp://mail.example.com -t devnull@foo.bar\n"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "ADDR"
msgstr "ADREÇA"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "Override the default from address"
msgstr "Substitueix l'adreça del remitent per defecte"
-#: mail.remote/mail.remote.c:76
+#: mail.remote/mail.remote.c:77
msgid "Read message for recipients."
msgstr "Llig el missatge per a obtenir els destinataris."
-#: mail.remote/mail.remote.c:77
-msgid "Print envelope commands in the SMTP protocol transaction. If specified more than once, the data part of the protocol transaction will also be printed."
-msgstr "Imprimeix les ordres de sobre en la transacció del protocol SMTP. Si s'especifica més d'una vegada, les parts de dades de la transacció del protocol també s'imprimiran."
+#: mail.remote/mail.remote.c:78
+msgid ""
+"Print envelope commands in the SMTP protocol transaction. If specified more "
+"than once, the data part of the protocol transaction will also be printed."
+msgstr ""
+"Imprimeix les ordres de sobre en la transacció del protocol SMTP. Si "
+"s'especifica més d'una vegada, les parts de dades de la transacció del "
+"protocol també s'imprimiran."
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
msgid "OPT"
msgstr "OPC"
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
-#: mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:81
msgid "Ignored for sendmail compatibility"
msgstr "S'ignora per compatibilitat amb sendmail"
-#: mail.remote/mail.remote.c:119
+#: mail.remote/mail.remote.c:120
msgid "[TO-ADDR]..."
msgstr "[ADREÇA-DEST]..."
-#: mail.remote/mail.remote.c:176
+#: mail.remote/mail.remote.c:173
#, c-format
msgid "Parsing from addresses failed: %s"
msgstr "L'anàlisi de les adreces de remitent ha fallat: %s"
-#: mail.remote/mail.remote.c:186
+#: mail.remote/mail.remote.c:183
#, c-format
msgid "Parsing recipient addresses failed: %s"
msgstr "L'anàlisi de les adreces de destinatari ha fallat: %s"
-#: mail.remote/mail.remote.c:194 mail.remote/mail.remote.c:206
-#: mail.remote/mail.remote.c:212
+#: mail.remote/mail.remote.c:191 mail.remote/mail.remote.c:203
+#: mail.remote/mail.remote.c:209
#, c-format
msgid "Failed: %s"
msgstr "Ha fallat: %s"
-#: mail.remote/mail.remote.c:200
+#: mail.remote/mail.remote.c:197
#, c-format
msgid "Opening stdin failed: %s"
msgstr "L'obertura de l'entrada estàndard ha fallat: %s"
# Peh. En aquesta, "mailer" = "servidor de correu" no funciona,
# així que caldrà canviar-los tots. jm
-#: mail.remote/mail.remote.c:220
+#: mail.remote/mail.remote.c:217
#, c-format
msgid "Creating mailer `%s' failed: %s"
msgstr "La creació de l'enviador «%s» ha fallat: %s"
-#: mail.remote/mail.remote.c:247
+#: mail.remote/mail.remote.c:244
#, c-format
msgid "Opening mailer `%s' failed: %s"
msgstr "L'obertura de l'enviador «%s» ha fallat: %s"
-#: mail.remote/mail.remote.c:254
+#: mail.remote/mail.remote.c:251
#, c-format
msgid "Sending message failed: %s"
msgstr "L'enviament del missatge ha fallat: %s"
-#: mail.remote/mail.remote.c:260
+#: mail.remote/mail.remote.c:257
#, c-format
msgid "Closing mailer failed: %s"
msgstr "El tancament de l'enviador de correu ha fallat: %s"
@@ -2300,8 +2382,12 @@ msgid "Garbage in ARGP_HELP_FMT: %s"
msgstr "Hi ha escombraries en ARGP_HELP_FMT: %s"
#: mailbox/argp-help.c:1195
-msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
-msgstr "Els arguments necessaris o opcionals per a les opcions llargues també són necessaris o opcionals per a qualsevol opció curta corresponent."
+msgid ""
+"Mandatory or optional arguments to long options are also mandatory or "
+"optional for any corresponding short options."
+msgstr ""
+"Els arguments necessaris o opcionals per a les opcions llargues també són "
+"necessaris o opcionals per a qualsevol opció curta corresponent."
#: mailbox/argp-help.c:1582
msgid "Usage:"
@@ -2386,136 +2472,144 @@ msgstr "S'ha produït un error d'iconv: %s"
msgid "Stream is closed"
msgstr "El flux està tancat"
-#: mailbox/message.c:1089
+#: mailbox/message.c:1092
#, c-format
msgid "mailbox_create_default (%s) failed: %s\n"
msgstr "mailbox_create_default (%s) ha fallat: %s\n"
-#: mailbox/message.c:1120
+#: mailbox/message.c:1123
#, c-format
msgid "mailbox_open (%s) failed: %s\n"
msgstr "mailbox_open (%s) ha fallat: %s\n"
-#: mailbox/message.c:1128
+#: mailbox/message.c:1131
#, c-format
msgid "mailbox_append_message (%s) failed: %s\n"
msgstr "mailbox_append_message (%s) ha fallat: %s\n"
-#: mailbox/message.c:1140
+#: mailbox/message.c:1143
#, c-format
msgid "mailbox_close (%s) failed: %s\n"
msgstr "mailbox_close (%s) ha fallat: %s\n"
-#: mailbox/mu_argp.c:59
+#: mailbox/mu_argp.c:60
msgid "Common options"
msgstr "Opcions comuns"
-#: mailbox/mu_argp.c:61
+#: mailbox/mu_argp.c:62
msgid "Show compilation options"
msgstr "Mostra les opcions de compilació"
-#: mailbox/mu_argp.c:67
+#: mailbox/mu_argp.c:68
msgid "Print license and exit"
msgstr "Mostra la llicència i ix"
-#: mailbox/mu_argp.c:74
+#: mailbox/mu_argp.c:75
msgid "Use specified URL as a mailspool directory"
msgstr "Utilitza la URL especificada com el directori de bústies de correu"
-#: mailbox/mu_argp.c:76
+#: mailbox/mu_argp.c:77
msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
-msgstr "Senyals per defecte del programa blocador (E=extern, R=reintenta, T=temps, P=pid)"
+msgstr ""
+"Senyals per defecte del programa blocador (E=extern, R=reintenta, T=temps, "
+"P=pid)"
-#: mailbox/mu_argp.c:77 mailbox/mu_argp.c:81 mh/send.c:67 pop3d/pop3d.c:77
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
msgid "SECONDS"
msgstr "SEGONS"
-#: mailbox/mu_argp.c:78
+#: mailbox/mu_argp.c:79
msgid "Set timeout for acquiring the lockfile"
msgstr "Estableix el temps d'espera per a adquirir el blocatge"
-#: mailbox/mu_argp.c:80
+#: mailbox/mu_argp.c:81
msgid "Set the maximum number of times to retry acquiring the lockfile"
-msgstr "Estableix el màxim nombre de vegades a reintentar l'adquisició del fitxer de blocatge"
+msgstr ""
+"Estableix el màxim nombre de vegades a reintentar l'adquisició del fitxer de "
+"blocatge"
-#: mailbox/mu_argp.c:82
+#: mailbox/mu_argp.c:83
msgid "Number of seconds after which the lock expires"
msgstr "Nombre de segons després dels quals expira el blocatge"
-#: mailbox/mu_argp.c:83
+#: mailbox/mu_argp.c:84
msgid "PATH"
msgstr "CAMÍ"
-#: mailbox/mu_argp.c:84
+#: mailbox/mu_argp.c:85
msgid "Set full path to the external locker program"
msgstr "Estableix el camí sencer al programa de blocatge extern"
-#: mailbox/mu_argp.c:91
+#: mailbox/mu_argp.c:92
msgid "Set current user's email address (default is loginname@defaultdomain)"
-msgstr "Estableix l'adreça de correu de l'usuari actual (per defecte és usuari@domini)"
+msgstr ""
+"Estableix l'adreça de correu de l'usuari actual (per defecte és "
+"usuari@domini)"
-#: mailbox/mu_argp.c:92
+#: mailbox/mu_argp.c:93
msgid "DOMAIN"
msgstr "DOMINI"
-#: mailbox/mu_argp.c:93
+#: mailbox/mu_argp.c:94
msgid "Set domain for unqualified user names (default is this host)"
-msgstr "Estableix el domini per a noms d'usuari no qualificats (per defecte és aquesta màquina)"
+msgstr ""
+"Estableix el domini per a noms d'usuari no qualificats (per defecte és "
+"aquesta màquina)"
-#: mailbox/mu_argp.c:99
+#: mailbox/mu_argp.c:100
msgid "MAILER"
msgstr "ENVIADOR"
-#: mailbox/mu_argp.c:100
+#: mailbox/mu_argp.c:101
msgid "Use specified URL as the default mailer"
msgstr "Usa la URL especificada com l'enviador de correu per defecte"
-#: mailbox/mu_argp.c:106
+#: mailbox/mu_argp.c:107
msgid "FACILITY"
msgstr "EQUIPAMENT"
-#: mailbox/mu_argp.c:107
+#: mailbox/mu_argp.c:108
msgid "Output logs to syslog FACILITY"
msgstr "Mostra els logs en l'EQUIPAMENT de syslog"
-#: mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:116
msgid "Runs in daemon mode with a maximum of NUMBER children"
msgstr "S'executa en mode dimoni amb un màxim de NÚMERO fills"
-#: mailbox/mu_argp.c:117
+#: mailbox/mu_argp.c:118
msgid "Run in inetd mode"
msgstr "S'executa en mode inetd"
-#: mailbox/mu_argp.c:118
+#: mailbox/mu_argp.c:119
msgid "PORT"
msgstr "PORT"
-#: mailbox/mu_argp.c:119
+#: mailbox/mu_argp.c:120
msgid "Listen on specified port number"
msgstr "Escolta en el número de port especificat"
-#: mailbox/mu_argp.c:121
+#: mailbox/mu_argp.c:122
msgid "Set idle timeout value to NUMBER seconds"
msgstr "Estableix el valor de temps d'espera d'inactivitat a NÚMERO segons"
-#: mailbox/mu_argp.c:123
+#: mailbox/mu_argp.c:124
msgid "Output session transcript via syslog"
msgstr "Mostra la transcripció de la sessió a través de syslog"
-#: mailbox/mu_argp.c:125
+#: mailbox/mu_argp.c:126
msgid "Set PID file"
msgstr "Estableix el fitxer PID"
-#: mailbox/mu_argp.c:214
+#: mailbox/mu_argp.c:215
msgid "Daemon configuration options"
msgstr "Opcions de configuració del dimoni"
-#: mailbox/mu_argp.c:249
+#: mailbox/mu_argp.c:250
#, c-format
msgid "Unknown facility `%s'\n"
msgstr "Equipament «%s» desconegut\n"
-#: mailbox/mu_argp.c:387
+#: mailbox/mu_argp.c:390
#, c-format
msgid ""
"License for %s:\n"
@@ -2524,31 +2618,31 @@ msgstr ""
"Llicència per a %s:\n"
"\n"
-#: mailbox/mu_argp.c:424
+#: mailbox/mu_argp.c:402
+#, fuzzy, c-format
+msgid "Cannot set mail directory name: %s"
+msgstr "No es pot crear el directori %s: %s"
+
+#: mailbox/mu_argp.c:430
#, c-format
msgid "Invalid lock flag `%c'"
msgstr "Senyal de blocatge «%c» no vàlid"
-#: mailbox/mu_argp.c:464
+#: mailbox/mu_argp.c:470
#, c-format
msgid "Invalid email address `%s': %s"
msgstr "Adreça de correu-e «%s» no vàlida: %s"
-#: mailbox/mu_argp.c:472
+#: mailbox/mu_argp.c:478
#, c-format
msgid "Invalid email domain `%s': %s"
msgstr "Domini de correu-e «%s» no vàlid: %s"
-#: mailbox/mu_argp.c:481
+#: mailbox/mu_argp.c:487
#, c-format
msgid "Invalid mailer URL `%s': %s"
msgstr "URL de l'enviador de correu «%s» no vàlida: %s"
-#: mailbox/mu_argp.c:495
-#, c-format
-msgid "Badly formed mailspool path: %s"
-msgstr "Camí de bústia de correu malformat: %s"
-
#: mailbox/mu_argp.c:631 mailbox/mu_argp.c:670 mailbox/mu_argp.c:710
#: mailbox/mu_argp.c:753 mailbox/mu_argp.c:782
#, c-format
@@ -2558,11 +2652,15 @@ msgstr "%s: no hi ha memòria suficient\n"
#: mailbox/mu_argp.c:892
#, c-format
msgid "INTERNAL ERROR: requested unknown argp capability %s (please report)"
-msgstr "ERROR INTERN: s'ha sol·licitat una capacitat d'argp «%s» desconeguda (si us plau, informeu)"
+msgstr ""
+"ERROR INTERN: s'ha sol·licitat una capacitat d'argp «%s» desconeguda (si us "
+"plau, informeu)"
#: mailbox/mu_argp.c:955
msgid "INTERNAL ERROR: cannot register argp capability auth (please report)"
-msgstr "ERROR INTERN: no es pot registrar la capacitat d'argp auth (si us plau, informeu)"
+msgstr ""
+"ERROR INTERN: no es pot registrar la capacitat d'argp auth (si us plau, "
+"informeu)"
#: mailbox/mu_auth.c:214 mailbox/mu_auth.c:216
msgid "MODLIST"
@@ -2576,200 +2674,213 @@ msgstr "Estableix una llista de mòduls a utilitzar per a l'autenticació"
msgid "Set list of modules to be used for authorization"
msgstr "Estableix una llista de mòduls a utilitzar per a l'autorització"
-#: mailbox/errors:18
+#: mailbox/errors:19
msgid "Operation failed"
msgstr "L'operació ha fallat"
-#: mailbox/errors:20
+#: mailbox/errors:21
msgid "No registered handler"
msgstr "No hi ha cap gestor registrat"
-#: mailbox/errors:21
+#: mailbox/errors:22
msgid "Empty virtual function"
msgstr "La funció virtual està buida"
-#: mailbox/errors:23
+#: mailbox/errors:24
msgid "Pointer to output null"
msgstr "El punter a l'eixida és nul"
-#: mailbox/errors:24
+#: mailbox/errors:25
msgid "Pointer to output pointer null"
msgstr "El punter al punter d'eixida és nul"
-#: mailbox/errors:26
+#: mailbox/errors:27
msgid "Mailbox null"
msgstr "Bústia nula"
-#: mailbox/errors:28
+#: mailbox/errors:29
msgid "Format of RFC822 object is bad"
msgstr "El format de l'objecte RFC822 és erroni"
-#: mailbox/errors:29
+#: mailbox/errors:30
msgid "Address contains no addr specs"
msgstr "L'adreça no conté cap especificació d'adreça"
-#: mailbox/errors:31
+#: mailbox/errors:32
msgid "Locker null"
msgstr "El programa blocador és nul"
-#: mailbox/errors:32
+#: mailbox/errors:33
msgid "Conflict with previous locker"
msgstr "Conflicte amb el programa blocador previ"
-#: mailbox/errors:33
+#: mailbox/errors:34
msgid "Lock file check failed"
msgstr "La comprovació del fitxer de blocatge ha fallat"
-#: mailbox/errors:34
+#: mailbox/errors:35
msgid "File check failed"
msgstr "La comprovació del fitxer ha fallat"
# Hrm... jm
-#: mailbox/errors:35
+#: mailbox/errors:36
msgid "Lock not held on file"
msgstr "El fitxer no està blocat"
-#: mailbox/errors:36
+#: mailbox/errors:37
msgid "Failed to exec external locker"
msgstr "No s'ha pogut executar el programa blocador extern"
-#: mailbox/errors:37
+#: mailbox/errors:38
msgid "External locker failed"
msgstr "El programa blocador extern ha fallat"
-#: mailbox/errors:38
+#: mailbox/errors:39
msgid "External locker killed"
msgstr "S'ha matat el programa blocador extern"
-#: mailbox/errors:40
+#: mailbox/errors:41
msgid "No such user name"
msgstr "No existeix l'usuari"
-#: mailbox/errors:42
+#: mailbox/errors:43
msgid "DNS name resolution failed"
msgstr "La resolució de noms DNS ha fallat"
-#: mailbox/errors:43
+#: mailbox/errors:44
msgid "State busy must resume operation"
msgstr "Estat ocupat, s'ha de resumir l'operació"
-#: mailbox/errors:44
+#: mailbox/errors:45
msgid "Not a valid mailer from address"
msgstr "No és una adreça de remitent de l'enviador de correu vàlida"
-#: mailbox/errors:45
+#: mailbox/errors:46
msgid "Not a valid mailer to address"
msgstr "No és una adreça de destinatari de l'enviador de correu vàlida"
-#: mailbox/errors:46
+#: mailbox/errors:47
msgid "No receipt addresses found"
msgstr "No s'han trobat adreces de rebut"
-#: mailbox/errors:47
+#: mailbox/errors:48
msgid "Malformed or unsupported mailer URL"
msgstr "URL de l'enviador de correu malformada o no implementada"
-#: mailbox/errors:48
+#: mailbox/errors:49
msgid "SMTP rcpt to command failed"
msgstr "L'ordre SMTP rcpt to ha fallat"
-#: mailbox/errors:49
+#: mailbox/errors:50
msgid "Tcp connections need a host"
msgstr "Les connexions Tcp necessiten una màquina"
-#: mailbox/errors:50
+#: mailbox/errors:51
msgid "Tcp connections need a postive port"
msgstr "Les connexions Tcp necessiten un port positiu"
-#: mailbox/errors:52
+#: mailbox/errors:53
msgid "Input string is not RFC 2047 encoded"
msgstr "El flux d'entrada no està codificat segons RFC 2047"
#: mailbox/errors:54
+msgid "Not a valid RFC 2047 encoding"
+msgstr ""
+
+#: mailbox/errors:56
msgid "User name is not supplied"
msgstr "No s'ha donat el nom d'usuari"
-#: mailbox/errors:55
+#: mailbox/errors:57
msgid "User password is not supplied"
msgstr "No s'ha donat la contrasenya de l'usuari"
-#: mailbox/errors:57
+#: mailbox/errors:59
msgid "Unsafe file permissions. Set 0600"
msgstr "Permisos de fitxer insegurs en %s. Establiu 0600"
-#: mailbox/errors:58
+#: mailbox/errors:60
msgid "Unsupported authentication scheme"
msgstr "L'esquema de autenticació no és suportat"
-#: mailbox/errors:59
+#: mailbox/errors:61
msgid "Authentication failed"
msgstr "Ha fallat l'autentificació"
-#: mailbox/errors:61
+#: mailbox/errors:63
msgid "Cannot execute"
msgstr "No es pot executar"
-#: mailbox/errors:62
+#: mailbox/errors:64
msgid "Process exited with a non-zero status"
msgstr "El procés ha eixit amb un estat no-zero"
-#: mailbox/errors:63
+#: mailbox/errors:65
msgid "Process exited on signal"
msgstr "El procés ha eixit en el senyal"
-#: mailbox/errors:64
+#: mailbox/errors:66
msgid "Unknown failure while executing subprocess"
msgstr "S'ha produït una fallada desconeguda mentre s'executava el subprocés"
-#: mailbox/errors:65
+#: mailbox/errors:67
msgid "Connection closed by remote host"
msgstr "El servidor remot ha tallat la connexió"
-#: mailbox/errors:66
+#: mailbox/errors:68
msgid "Parse error"
msgstr "S'ha produït un error d'anàlisi"
-#: mailbox/errors:67
+#: mailbox/errors:69
msgid "Requested item not found"
msgstr "No es troba l'element sol·licitat"
-#: mailbox/errors:68
+#: mailbox/errors:70
msgid "Not enough buffer space"
msgstr "No hi ha espai de búfer suficient"
-#: mailbox/errors:70
+#: mailbox/errors:72
msgid "SQL error"
msgstr "S'ha produït un error d'SQL"
-#: mailbox/errors:71
+#: mailbox/errors:73
msgid "Already connected to the database"
msgstr "Està connectat a la base de dades"
-#: mailbox/errors:72
+#: mailbox/errors:74
msgid "Not connected to the database"
msgstr "No està connectat a la base de dades"
-#: mailbox/errors:73
+#: mailbox/errors:75
msgid "Result of the previous query is not released"
msgstr "No s'ha publicat el resultat de la consulta anterior"
-#: mailbox/errors:74
+#: mailbox/errors:76
msgid "No query was yet executed"
msgstr "No s'ha executat cap consulta"
-#: mailbox/errors:75
+#: mailbox/errors:77
msgid "Bad column address"
msgstr "L'adreça de la columna és errònia"
-#: mailbox/errors:76
+#: mailbox/errors:78
msgid "No result from the previous query available"
msgstr "No hi ha resultats disponibles de l'anterior consulta SQL"
-#: mailbox/errors:77
+#: mailbox/errors:79
msgid "No such interface"
msgstr "No existeix eixa interfície"
-#: mailbox/mutil.c:581
+#: mailbox/errors:81
+msgid "Badly formed file or directory name"
+msgstr ""
+
+#: mailbox/errors:82
+#, fuzzy
+msgid "Read error"
+msgstr "Error d'expreg"
+
+#: mailbox/mutil.c:590
#, c-format
msgid "Cannot open temporary file: %s"
msgstr "No es pot obrir un fitxer temporal: %s"
@@ -2780,7 +2891,7 @@ msgstr "No es pot obrir un fitxer temporal: %s"
#.
#. msgstr "yYbB";
#.
-#: mailbox/mutil.c:1166
+#: mailbox/mutil.c:1175
msgid "yY"
msgstr "yYsS"
@@ -2790,7 +2901,7 @@ msgstr "yYsS"
#.
#. msgstr "nNeE";
#.
-#: mailbox/mutil.c:1175
+#: mailbox/mutil.c:1184
msgid "nN"
msgstr "nN"
@@ -2834,7 +2945,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH anno Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/anno.c:29
msgid "[msg [msg...]]"
@@ -2844,7 +2956,7 @@ msgstr "[msg [msg...]]"
#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
#: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
-#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:44
+#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
msgid "FOLDER"
msgstr "CARPETA"
@@ -2890,7 +3002,9 @@ msgstr "Nom del component: "
#. in this message
#: mh/fmtcheck.c:26
msgid "GNU MH fmtcheck Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH fmtcheck Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH fmtcheck Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
#: mh/scan.c:45
@@ -2925,13 +3039,15 @@ msgstr "La cadena de format és errònia"
#. in this message
#: mh/folder.c:39
msgid "GNU MH folder Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH folder Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH folder Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/folder.c:41
msgid "[action] [msg]"
msgstr "[acció] [msg]"
-#: mh/folder.c:44 pop3d/popauth.c:69
+#: mh/folder.c:44 pop3d/popauth.c:68
msgid "Actions are:"
msgstr "Les accions són:"
@@ -2944,14 +3060,22 @@ msgid "List the contents of the folder stack"
msgstr "Llista els continguts de la pila de carpetes"
#: mh/folder.c:50
-msgid "Push the folder on the folder stack. If FOLDER is specified, it is pushed. Otherwise, if a folder is given in the command line (via + or --folder), it is pushed on stack. Otherwise, the current folder and the top of the folder stack are exchanged"
-msgstr "Empila la carpeta en la pila de carpetes. Si s'especifica CARPETA, s'empila. D'altra manera, si es dóna una carpeta en la línia d'ordres (mitjançant + o --folder), s'empila en la pila. Si no, s'intercanvien la carpeta actual i l'últim element de la pila de carpetes."
+msgid ""
+"Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
+"Otherwise, if a folder is given in the command line (via + or --folder), it "
+"is pushed on stack. Otherwise, the current folder and the top of the folder "
+"stack are exchanged"
+msgstr ""
+"Empila la carpeta en la pila de carpetes. Si s'especifica CARPETA, s'empila. "
+"D'altra manera, si es dóna una carpeta en la línia d'ordres (mitjançant + o "
+"--folder), s'empila en la pila. Si no, s'intercanvien la carpeta actual i "
+"l'últim element de la pila de carpetes."
#: mh/folder.c:55
msgid "Pop the folder off the folder stack"
msgstr "Desempila la carpeta de la pila de carpetes"
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:81
+#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
msgid "Options are:"
msgstr "Les opcions són:"
@@ -3001,23 +3125,27 @@ msgstr " no té missatges"
msgid "(others)"
msgstr "(altres)"
-#: mh/folder.c:449
+#: mh/folder.c:450
#, c-format
-msgid "Folder # of messages ( range ) cur msg (other files)\n"
-msgstr "Carpeta # de missatges ( rang ) mis act (altres fitxers)\n"
+msgid ""
+"Folder # of messages ( range ) cur msg (other "
+"files)\n"
+msgstr ""
+"Carpeta # de missatges ( rang ) mis act (altres "
+"fitxers)\n"
-#: mh/folder.c:455
+#: mh/folder.c:456
msgid "TOTAL"
msgstr "TOTAL"
-#: mh/folder.c:456
+#: mh/folder.c:457
#, c-format
msgid "%4lu message "
msgid_plural "%4lu messages "
msgstr[0] "%4lu missatge"
msgstr[1] "%4lu missatges"
-#: mh/folder.c:459
+#: mh/folder.c:460
#, c-format
msgid "in %4lu folder"
msgid_plural "in %4lu folders"
@@ -3032,7 +3160,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH forw Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/forw.c:34 mh/repl.c:37
msgid "* Add Replied: header to the message being replied to"
@@ -3101,7 +3230,9 @@ msgstr "* Estableix el reemplaç per al programa whatnow"
#: mh/forw.c:69
msgid "* Ignore whatnowproc variable. Use standard `whatnow' shell instead"
-msgstr "* Descarta la variable whatnowproc. Utilitza l'intèrpret estàndard «whatnow» en el seu lloc"
+msgstr ""
+"* Descarta la variable whatnowproc. Utilitza l'intèrpret estàndard «whatnow» "
+"en el seu lloc"
#: mh/forw.c:71 mh/repl.c:70
msgid "Use draft file preserved after the last session"
@@ -3140,7 +3271,9 @@ msgstr "Final dels missatges reenviats"
#. in this message
#: mh/inc.c:26
msgid "GNU MH inc Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH inc Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH inc Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/inc.c:28 mh/rmf.c:37
msgid "[+folder]"
@@ -3201,8 +3334,11 @@ msgstr "%d: s'ha produït un error en agregar el missatge: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mh/install-mh.c:24
-msgid "GNU MH install-mh Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH install-mh Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgid ""
+"GNU MH install-mh Use -help to obtain the list of traditional MH options."
+msgstr ""
+"GNU MH install-mh Utilitzeu el commutador -help per a obtindre la llista de "
+"les opcions tradicionals d'MH."
#: mh/install-mh.c:30
msgid "Do not ask for anything"
@@ -3212,7 +3348,9 @@ msgstr "No preguntes res"
#. in this message
#: mh/mark.c:24
msgid "GNU MH mark Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mark Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH mark Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/mark.c:33
msgid "Specify sequence name to operate upon"
@@ -3395,12 +3533,12 @@ msgstr "Error d'escriptura en «%s»: %s"
msgid "Cannot stat file %s: %s"
msgstr "No es pot fer «stat» del fitxer %s: %s"
-#: mh/mh_init.c:585 mh/mhn.c:2231
+#: mh/mh_init.c:585 mh/mhn.c:2267
#, c-format
msgid "Cannot create input stream (file %s): %s"
msgstr "No es pot crear un flux d'entrada (fitxer %s): %s"
-#: mh/mh_init.c:592 mh/mhn.c:2238
+#: mh/mh_init.c:592 mh/mhn.c:2274
#, c-format
msgid "Cannot open input stream (file %s): %s"
msgstr "No es pot obrir el flux d'entrada (fitxer %s): %s"
@@ -3563,8 +3701,14 @@ msgid "List the message being distributed/replied-to on the terminal."
msgstr "Llista el missatge que està sent distribuït/contestat en el terminal."
#: mh/mh_whatnow.c:394
-msgid "Edit the message. If EDITOR is omitted use the one that was used on the preceeding round unless the profile entry \"LASTEDITOR-next\" names an alternate editor."
-msgstr "Edita el missatge. Si s'omet EDITOR, usa el que es va usar en la ronda anterior a no ser que l'entrada «LASTEDITOR-next» del perfil nombre un editor alternatiu."
+msgid ""
+"Edit the message. If EDITOR is omitted use the one that was used on the "
+"preceeding round unless the profile entry \"LASTEDITOR-next\" names an "
+"alternate editor."
+msgstr ""
+"Edita el missatge. Si s'omet EDITOR, usa el que es va usar en la ronda "
+"anterior a no ser que l'entrada «LASTEDITOR-next» del perfil nombre un "
+"editor alternatiu."
#: mh/mh_whatnow.c:398 mh/mh_whatnow.c:428 mh/mh_whatnow.c:518
msgid "List the draft on the terminal."
@@ -3575,20 +3719,32 @@ msgid "Send the message in the background."
msgstr "Envia el missatge en segon pla."
#: mh/mh_whatnow.c:402
-msgid "Terminate the session. Preserve the draft, unless -delete flag is given."
-msgstr "Finalitza la sessió. Preserva l'esborrany, si no s'ha donat el senyalador -delete."
+msgid ""
+"Terminate the session. Preserve the draft, unless -delete flag is given."
+msgstr ""
+"Finalitza la sessió. Preserva l'esborrany, si no s'ha donat el senyalador -"
+"delete."
#: mh/mh_whatnow.c:404 mh/mh_whatnow.c:429
msgid "Refile the draft into the given FOLDER."
msgstr "Torna a desar l'esborrany en la CARPETA donada."
#: mh/mh_whatnow.c:406
-msgid "Send the message. The -watch flag causes the delivery process to be monitored. SWITCHES are passed to send program verbatim."
-msgstr "Envia el missatge. El senyalador -watch fa que el procés d'enviament es monitoritze. Els COMMUTADORS es passen al programa d'enviament sense modificació."
+msgid ""
+"Send the message. The -watch flag causes the delivery process to be "
+"monitored. SWITCHES are passed to send program verbatim."
+msgstr ""
+"Envia el missatge. El senyalador -watch fa que el procés d'enviament es "
+"monitoritze. Els COMMUTADORS es passen al programa d'enviament sense "
+"modificació."
#: mh/mh_whatnow.c:409
-msgid "List the addresses and verify that they are acceptable to the transport service."
-msgstr "Llista les adreces i verifica que siguen acceptables per al servei de transport."
+msgid ""
+"List the addresses and verify that they are acceptable to the transport "
+"service."
+msgstr ""
+"Llista les adreces i verifica que siguen acceptables per al servei de "
+"transport."
#: mh/mh_whatnow.c:425
msgid "Terminate the session. Preserve the draft."
@@ -3658,7 +3814,9 @@ msgstr "Cap destinatari"
#. in this message
#: mh/mhl.c:28
msgid "GNU MH mhl Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mhl Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH mhl Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/mhl.c:30
msgid "[files]"
@@ -3721,7 +3879,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH mhn Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/mhn.c:40
msgid "Specify file to operate upon"
@@ -3802,7 +3961,8 @@ msgstr "CONTINGUT"
#: mh/mhn.c:83
msgid "Operate on message part with given multipart content"
-msgstr "Opera en la part del missatge amb el contingut de múltiples parts donat"
+msgstr ""
+"Opera en la part del missatge amb el contingut de múltiples parts donat"
#: mh/mhn.c:85
msgid "Print additional information"
@@ -3872,12 +4032,12 @@ msgstr "s'està desant el missatge %lu, part %s en el fitxer %s\n"
msgid "File %s already exists. Rewrite"
msgstr "El fitxer %s ja existeix. Reescriure"
-#: mh/mhn.c:1680 mh/mhn.c:2497
+#: mh/mhn.c:1680 mh/mhn.c:2547
#, c-format
msgid "Cannot create output stream (file %s): %s"
msgstr "No es pot crear un flux d'eixida (fitxer %s): %s"
-#: mh/mhn.c:1688 mh/mhn.c:2505
+#: mh/mhn.c:1688 mh/mhn.c:2555
#, c-format
msgid "Cannot open output stream (file %s): %s"
msgstr "No es pot obrir el flux d'eixida (fitxer %s): %s"
@@ -3892,17 +4052,17 @@ msgstr "%s:%lu: manca %c"
msgid "%s:%lu: comment redefined"
msgstr "%s:%lu: el comentari està redefinit"
-#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2115
+#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2151
#, c-format
msgid "%s:%lu: syntax error"
msgstr "%s:%lu: error de sintaxi"
-#: mh/mhn.c:1858 mh/mhn.c:2082
+#: mh/mhn.c:1858 mh/mhn.c:2118
#, c-format
msgid "%s:%lu: description redefined"
msgstr "%s:%lu: la descripció està redefinida"
-#: mh/mhn.c:1870 mh/mhn.c:2094
+#: mh/mhn.c:1870 mh/mhn.c:2130
#, c-format
msgid "%s:%lu: content id redefined"
msgstr "%s:%lu: l'id del contingut està redefinit"
@@ -3912,27 +4072,27 @@ msgstr "%s:%lu: l'id del contingut està redefinit"
msgid "%s:%lu: missing subtype"
msgstr "%s:%lu: manca el subtipus"
-#: mh/mhn.c:2129
+#: mh/mhn.c:2165
#, c-format
msgid "%s:%lu: no such message: %lu"
msgstr "%s:%lu no existeix el missatge: %lu"
-#: mh/mhn.c:2220
+#: mh/mhn.c:2256
#, c-format
msgid "%s:%lu: missing filename"
msgstr "%s:%lu: manca el nom del fitxer"
-#: mh/mhn.c:2276
+#: mh/mhn.c:2312
#, c-format
msgid "Cannot open filter stream: %s"
msgstr "No es pot obrir el flux de filtre: %s"
-#: mh/mhn.c:2397
+#: mh/mhn.c:2445
#, c-format
msgid "%s:%lu: unmatched #end"
msgstr "%s:%lu: #end no emparellat"
-#: mh/mhn.c:2551 mh/mhn.c:2562
+#: mh/mhn.c:2601 mh/mhn.c:2612
msgid "extra arguments"
msgstr "arguments extra"
@@ -3940,7 +4100,9 @@ msgstr "arguments extra"
#. in this message
#: mh/mhpath.c:26
msgid "GNU MH mhpath Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mhpath Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH mhpath Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
msgid "[+folder] [msgs]"
@@ -3954,7 +4116,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH pick Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/pick.c:35
msgid "[messages]"
@@ -3974,8 +4137,19 @@ msgid "A pattern to look for"
msgstr "Un patró pel qual cercar"
#: mh/pick.c:49
-msgid "Flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias)."
-msgstr "Els senyaladors que controlen el tipus de les expressions regulars. CADENA ha de consistir d'una o més de les següents lletres: B=bàsica, E=extesa, I=no distingeix entre majúscules i minúscules, C=distingeix entre majúscules i minúscules. El valor per defecte és «EI». Els senyaladors tenen efecte fins la següent ocurrència d'una opció --cflags. L'opció ha de tindre lloc just abans d'una opció --pattern o --component (o els seus àlies)."
+msgid ""
+"Flags controlling the type of regular expressions. STRING must consist of "
+"one or more of the following letters: B=basic, E=extended, I=ignore case, "
+"C=case sensitive. Default is \"EI\". The flags remain in effect until the "
+"next occurrence of --cflags option. The option must occur right before --"
+"pattern or --component option (or its alias)."
+msgstr ""
+"Els senyaladors que controlen el tipus de les expressions regulars. CADENA "
+"ha de consistir d'una o més de les següents lletres: B=bàsica, E=extesa, "
+"I=no distingeix entre majúscules i minúscules, C=distingeix entre majúscules "
+"i minúscules. El valor per defecte és «EI». Els senyaladors tenen efecte "
+"fins la següent ocurrència d'una opció --cflags. L'opció ha de tindre lloc "
+"just abans d'una opció --pattern o --component (o els seus àlies)."
#: mh/pick.c:51
msgid "Same as --component cc --pattern STRING"
@@ -4004,7 +4178,8 @@ msgstr "Operacions de restricció de data:"
#: mh/pick.c:63
msgid "Search in the named date header field (default is `Date:')"
-msgstr "Cerca en el camp de capçalera de data esmentada (per defecte és «Date:»)"
+msgstr ""
+"Cerca en el camp de capçalera de data esmentada (per defecte és «Date:»)"
#: mh/pick.c:64 mh/pick.c:66
msgid "DATE"
@@ -4067,7 +4242,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH refile Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/refile.c:34
msgid "messages folder [folder...]"
@@ -4086,8 +4262,12 @@ msgid "* Try to preserve message sequence numbers"
msgstr "* Tracta de preservar la numeració de la seqüència dels missatges"
#: mh/refile.c:48
-msgid "Specify source folder. FOLDER will become the current folder after the program exits"
-msgstr "Especifica la carpeta d'origen. CARPETA es convertirà en la carpeta actual després de l'eixida del programa"
+msgid ""
+"Specify source folder. FOLDER will become the current folder after the "
+"program exits"
+msgstr ""
+"Especifica la carpeta d'origen. CARPETA es convertirà en la carpeta actual "
+"després de l'eixida del programa"
#: mh/refile.c:50
msgid "Use FILE as the source message"
@@ -4122,7 +4302,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH repl Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/repl.c:31
msgid "[+folder] [msg]"
@@ -4154,11 +4335,19 @@ msgstr "FILTRE-MHL"
#: mh/repl.c:57
msgid "Set the mhl filter to preprocess the body of the message being replied"
-msgstr "Estableix el filtre mhl per a preprocessar el cos del missatge al que s'està responent"
+msgstr ""
+"Estableix el filtre mhl per a preprocessar el cos del missatge al que s'està "
+"responent"
#: mh/repl.c:60
-msgid "Include a copy of the message being replied. The message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option"
-msgstr "Inclou una còpia del missatge al que s'està responent. El missatge serà processat utilitzant el filtre per defecte «mhl.reply», o el filtre especificat per l'opció --filter"
+msgid ""
+"Include a copy of the message being replied. The message will be processed "
+"using either the default filter \"mhl.reply\", or the filter specified by --"
+"filter option"
+msgstr ""
+"Inclou una còpia del missatge al que s'està responent. El missatge serà "
+"processat utilitzant el filtre per defecte «mhl.reply», o el filtre "
+"especificat per l'opció --filter"
#: mh/repl.c:64
msgid "Query for addresses to place in To: and Cc: lists"
@@ -4166,7 +4355,9 @@ msgstr "Consulta les adreces a ficar en les llistes To: i Cc:"
#: mh/repl.c:69
msgid "* Ignore whatnowproc variable. Use standard `whatnow' shell instead."
-msgstr "* Descarta la variable whatnowproc. Utilitza l'intèrpret estàndard «whatnow» en el seu lloc."
+msgstr ""
+"* Descarta la variable whatnowproc. Utilitza l'intèrpret estàndard «whatnow» "
+"en el seu lloc."
#: mh/repl.c:131
#, c-format
@@ -4180,7 +4371,7 @@ msgid_plural "Draft \"%s\" exists (%lu bytes).\n"
msgstr[0] "L'esborrany «%s» existeix (%lu byte).\n"
msgstr[1] "L'esborrany «%s» existeix (%lu bytes).\n"
-#: mh/repl.c:298 movemail/movemail.c:214
+#: mh/repl.c:298
#, c-format
msgid "Cannot read message %lu: %s"
msgstr "No es pot llegir el missatge %lu: %s"
@@ -4203,7 +4394,9 @@ msgstr "només un missatge a l'hora!"
#. in this message
#: mh/rmf.c:35
msgid "GNU MH rmf Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH rmf Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH rmf Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/rmf.c:42
msgid "Specify the folder to delete"
@@ -4231,13 +4424,17 @@ msgstr "No es pot desenllaçar %s: %s"
#. in this message
#: mh/rmm.c:26
msgid "GNU MH rmm Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH rmm Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH rmm Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mh/scan.c:33
msgid "GNU MH scan Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH scan Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH scan Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/scan.c:40
msgid "Specify folder to scan"
@@ -4277,7 +4474,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH send Les opcions marcades amb «*» encara no estan implementades.\n"
-"Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+"Utilitzeu el commutador -help per a obtindre la llista de les opcions "
+"tradicionals d'MH."
#: mh/send.c:33
msgid "file [file...]"
@@ -4293,7 +4491,8 @@ msgstr "Utilitza l'esborrany preparat"
#: mh/send.c:45 mh/whom.c:37
msgid "Treat the arguments as a list of messages from the draftfolder"
-msgstr "Tracta els arguments com una llista de missatges de la carpeta d'esborranys"
+msgstr ""
+"Tracta els arguments com una llista de missatges de la carpeta d'esborranys"
#: mh/send.c:49
msgid "* Use filter FILE to preprocess the body of the message"
@@ -4308,8 +4507,12 @@ msgid "* Reformat To: and Cc: addresses"
msgstr "* Reformata les adreces To: i Cc:"
#: mh/send.c:56
-msgid "* In case of failure forward the draft along with the failure notice to the sender"
-msgstr "* En cas de fallada, reenvia l'esborrany junt amb la nota de la fallada al remitent"
+msgid ""
+"* In case of failure forward the draft along with the failure notice to the "
+"sender"
+msgstr ""
+"* En cas de fallada, reenvia l'esborrany junt amb la nota de la fallada al "
+"remitent"
#: mh/send.c:59
msgid "* Use MIME encapsulation"
@@ -4324,8 +4527,12 @@ msgid "Run in the backround."
msgstr "Executa-ho en segon pla."
#: mh/send.c:68
-msgid "* Split the draft into several partial messages and send them with SECONDS interval"
-msgstr "* Divideix l'esborrany en diversos missatges parcials i envial's en un intervals de SEGONS"
+msgid ""
+"* Split the draft into several partial messages and send them with SECONDS "
+"interval"
+msgstr ""
+"* Divideix l'esborrany en diversos missatges parcials i envial's en un "
+"intervals de SEGONS"
#: mh/send.c:70
msgid "Print the transcript of interactions with the transport system"
@@ -4337,9 +4544,11 @@ msgstr "Monitoritza l'enviament de correu"
#: mh/send.c:76
msgid "* Make header fields no longer than NUMBER columns"
-msgstr "* Fes que els camps de les capçaleres no siguen més llargs que NÚMERO columnes"
+msgstr ""
+"* Fes que els camps de les capçaleres no siguen més llargs que NÚMERO "
+"columnes"
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
msgid "Invalid number"
msgstr "El número no és vàlid"
@@ -4396,7 +4605,7 @@ msgstr "S'està destruint l'enviador"
msgid "Cannot switch to background: %s"
msgstr "No es pot canviar al segon pla: %s"
-#: mh/send.c:559
+#: mh/send.c:560
#, c-format
msgid "cannot stat %s: %s"
msgstr "no es pot fer «stat» de %s: %s"
@@ -4413,7 +4622,9 @@ msgstr "Estableix l'indicatiu"
#. in this message
#: mh/whom.c:24
msgid "GNU MH whom Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH whom Utilitzeu el commutador -help per a obtindre la llista de les opcions tradicionals d'MH."
+msgstr ""
+"GNU MH whom Utilitzeu el commutador -help per a obtindre la llista de les "
+"opcions tradicionals d'MH."
#: mh/whom.c:41
msgid "Check if addresses are deliverable"
@@ -4473,9 +4684,14 @@ msgstr "authority_set_ticket ha fallat"
msgid "Cannot open"
msgstr "No es pot obrir"
+#: movemail/movemail.c:214
+#, fuzzy, c-format
+msgid "Cannot read message %lu: %s\n"
+msgstr "No es pot llegir el missatge %lu: %s"
+
#: movemail/movemail.c:220
-#, c-format
-msgid "Cannot append message %lu: %s"
+#, fuzzy, c-format
+msgid "Cannot append message %lu: %s\n"
msgstr "No es pot agregar el missatge %lu: %s"
#: movemail/movemail.c:251
@@ -4563,60 +4779,60 @@ msgstr "eof inesperat en l'entrada"
msgid "Locking mailbox `%s' failed: %s"
msgstr "Ha fallat l'obertura de «%s»: %s"
-#: pop3d/pop3d.c:65
+#: pop3d/pop3d.c:64
msgid "GNU pop3d -- the POP3 daemon"
msgstr "GNU pop4d -- el dimoni POP3"
-#: pop3d/pop3d.c:75
+#: pop3d/pop3d.c:74
msgid "Undelete all messages on startup"
msgstr "Lleva la marca d'eliminació de tots els missatges en iniciar"
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:77
msgid "Allowed delay between the two successive logins"
msgstr "Retard permés entre les dos entrades consecutives"
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:78
msgid "FILENAME"
msgstr "FITXER"
-#: pop3d/pop3d.c:80
+#: pop3d/pop3d.c:79
msgid "Name of login statistics file"
msgstr "Nom del fitxer d'estadístiques d'entrades"
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:81
msgid "DAYS"
msgstr "DIES"
-#: pop3d/pop3d.c:83
+#: pop3d/pop3d.c:82
msgid "Expire read messages after the given number of days"
msgstr "Fes caducar els missatges llegits posteriors a la data donada"
-#: pop3d/pop3d.c:85
+#: pop3d/pop3d.c:84
msgid "Delete expired messages upon closing the mailbox"
msgstr "Elimina els missatges caducats quan es tanca la bústia"
-#: pop3d/pop3d.c:88
+#: pop3d/pop3d.c:87
msgid "Always require STLS before entering authentication phase"
msgstr "Requereix sempre STLS abans d'iniciar la fase d'autenticació"
-#: pop3d/pop3d.c:278
+#: pop3d/pop3d.c:277
msgid "Failed to become a daemon:"
msgstr "No s'ha pogut convertir en dimoni:"
-#: pop3d/pop3d.c:314
+#: pop3d/pop3d.c:313
#, c-format
msgid "connect from %s"
msgstr "connexió des de %s"
-#: pop3d/pop3d.c:438
+#: pop3d/pop3d.c:437
msgid "Session terminated"
msgstr "La sessió ha finalitzat"
-#: pop3d/pop3d.c:524
+#: pop3d/pop3d.c:523
msgid "GNU pop3d started"
msgstr "S'ha iniciat el GNU comsat"
-#: pop3d/pop3d.c:531
+#: pop3d/pop3d.c:530
#, c-format
msgid "too many children (%lu)"
msgstr "massa fills (%lu)"
@@ -4625,27 +4841,27 @@ msgstr "massa fills (%lu)"
msgid "GNU popauth -- manage pop3 authentication database"
msgstr "GNU popauth -- gestiona la base de dades d'autentificació de pop3"
-#: pop3d/popauth.c:70
+#: pop3d/popauth.c:69
msgid "Add user"
msgstr "Afegeix un usuari"
-#: pop3d/popauth.c:71
+#: pop3d/popauth.c:70
msgid "Modify user's record (change password)"
msgstr "Modifica el registre d'un usuari (canvia la contrasenya)"
-#: pop3d/popauth.c:72
+#: pop3d/popauth.c:71
msgid "Delete user's record"
msgstr "Elimina el registre d'un usuari"
-#: pop3d/popauth.c:73
+#: pop3d/popauth.c:72
msgid "List the contents of DBM file"
msgstr "Llista els continguts del fitxer DBM"
-#: pop3d/popauth.c:74
+#: pop3d/popauth.c:73
msgid "Create the DBM from a plaintext file"
msgstr "Crea la DBM des d'un fitxer de text pla"
-#: pop3d/popauth.c:77
+#: pop3d/popauth.c:76
msgid ""
"Default action is:\n"
" For the file owner: --list\n"
@@ -4655,119 +4871,119 @@ msgstr ""
" Per al propietari del fitxer: --list\n"
" Per a un usuari: --modify --username <nom d'usuari>\n"
-#: pop3d/popauth.c:82
+#: pop3d/popauth.c:81
msgid "Read input from FILE (default stdin)"
msgstr "Llig l'entrada des de FITXER (per defecte l'entrada estàndard)"
-#: pop3d/popauth.c:83
+#: pop3d/popauth.c:82
msgid "Direct output to file"
msgstr "Eixida directa a un fitxer"
-#: pop3d/popauth.c:84
+#: pop3d/popauth.c:83
msgid "Specify user's password"
msgstr "Especifica la contrasenya de l'usuari"
-#: pop3d/popauth.c:85
+#: pop3d/popauth.c:84
msgid "USERNAME"
msgstr "NOM D'USUARI"
-#: pop3d/popauth.c:85
+#: pop3d/popauth.c:84
msgid "Specify user name"
msgstr "Especifica el nom de l'usuari"
-#: pop3d/popauth.c:86
+#: pop3d/popauth.c:85
msgid "PERM"
msgstr "PERM"
-#: pop3d/popauth.c:86
+#: pop3d/popauth.c:85
msgid "Force given permissions on the database"
msgstr "Força els permisos donats en la base de dades"
-#: pop3d/popauth.c:116
+#: pop3d/popauth.c:115
#, c-format
msgid "Invalid octal number: %s"
msgstr "El número octal és invàlid: %s"
-#: pop3d/popauth.c:216
+#: pop3d/popauth.c:215
msgid "You may not specify more than one `-aldp' option"
msgstr "No podeu especificar més d'una opció «-aldp»"
-#: pop3d/popauth.c:238 pop3d/popauth.c:294 pop3d/popauth.c:370
+#: pop3d/popauth.c:237 pop3d/popauth.c:293 pop3d/popauth.c:369
#, c-format
msgid "Cannot create %s: %s"
msgstr "No es pot crear %s: %s"
-#: pop3d/popauth.c:258
+#: pop3d/popauth.c:257
msgid "Only the file owner can use --username"
msgstr "Només el propietari del fitxer pot usar --username"
-#: pop3d/popauth.c:264
+#: pop3d/popauth.c:263
msgid "Operation not allowed"
msgstr "L'operació no es permet"
-#: pop3d/popauth.c:400
+#: pop3d/popauth.c:399
#, c-format
msgid "%s:%d: malformed line"
msgstr "%s:%d: línia mal formada"
-#: pop3d/popauth.c:413
+#: pop3d/popauth.c:412
#, c-format
msgid "%s:%d: cannot store datum"
msgstr "%s:%d: no es pot desar la dada"
-#: pop3d/popauth.c:446
+#: pop3d/popauth.c:445
msgid "Password:"
msgstr "Contrasenya:"
#. TRANSLATORS: Please try to format this string so that it has
#. the same length as the translation of 'Password:' above
-#: pop3d/popauth.c:452
+#: pop3d/popauth.c:451
msgid "Confirm :"
msgstr "Confirmació:"
-#: pop3d/popauth.c:455
+#: pop3d/popauth.c:454
msgid "Passwords differ. Please retry."
msgstr "Les contrasenyes no són iguals. Si us plau, proveu de nou."
-#: pop3d/popauth.c:470
+#: pop3d/popauth.c:469
msgid "Missing username to add"
msgstr "Manca el nom d'usuari a afegir"
-#: pop3d/popauth.c:488
+#: pop3d/popauth.c:487
msgid "Cannot store datum"
msgstr "No es pot emmagatzemar la dada"
-#: pop3d/popauth.c:503
+#: pop3d/popauth.c:502
msgid "Missing username to delete"
msgstr "Manca el nom d'usuari a eliminar"
-#: pop3d/popauth.c:515
+#: pop3d/popauth.c:514
#, c-format
msgid "Cannot remove record for %s"
msgstr "No es pot eliminar el registre per a %s"
-#: pop3d/popauth.c:535
+#: pop3d/popauth.c:534
msgid "Missing username"
msgstr "Manca el nom d'usuari"
-#: pop3d/popauth.c:557
+#: pop3d/popauth.c:556
msgid "Old Password:"
msgstr "Contrasenya antiga:"
-#: pop3d/popauth.c:562
+#: pop3d/popauth.c:561
msgid "Sorry"
msgstr "Ho sentim"
-#: pop3d/popauth.c:573
+#: pop3d/popauth.c:572
msgid "Cannot replace datum"
msgstr "No es pot reemplaçar la dada"
-#: pop3d/popauth.c:592
+#: pop3d/popauth.c:591
#, c-format
msgid "Database format: %s\n"
msgstr "Format de la base de dades: %s\n"
-#: pop3d/popauth.c:593
+#: pop3d/popauth.c:592
#, c-format
msgid "Database location: %s\n"
msgstr "Localització de la base de dades: %s\n"
@@ -4814,49 +5030,50 @@ msgstr[1] "L'usuari «%s» ha entrat amb la bústia «%s» (%d missatges)"
msgid "GNU readmsg -- print messages"
msgstr "GNU readmsg -- mostra missatges"
-#: readmsg/readmsg.c:40
+#: readmsg/readmsg.c:39
msgid "Display debugging information"
msgstr "Mostra informació de depuració"
-#: readmsg/readmsg.c:41
+#: readmsg/readmsg.c:40
msgid "Display entire header"
msgstr "Mostra les capçaleres senceres"
-#: readmsg/readmsg.c:42
+#: readmsg/readmsg.c:41
msgid "LIST"
msgstr "LLISTA"
-#: readmsg/readmsg.c:43
+#: readmsg/readmsg.c:42
msgid "List of header names separated by whitespace or commas"
msgstr "Llista de noms de capçalera separades per espais en blanc o comas"
-#: readmsg/readmsg.c:44
+#: readmsg/readmsg.c:43
msgid "Folder to use"
msgstr "Carpeta a utilitzar"
-#: readmsg/readmsg.c:45
+#: readmsg/readmsg.c:44
msgid "Exclude all headers"
msgstr "Exclou totes les capçaleres"
-#: readmsg/readmsg.c:46
+#: readmsg/readmsg.c:45
msgid "Output formfeeds between messages"
msgstr "Separa els missatges amb un salt de pàgina"
-#: readmsg/readmsg.c:48
+#: readmsg/readmsg.c:47
msgid "Print all messages matching pattern, not just the first"
-msgstr "Mostra tots els missatges que coincideixen amb un patró, no només el primer"
+msgstr ""
+"Mostra tots els missatges que coincideixen amb un patró, no només el primer"
-#: readmsg/readmsg.c:250
+#: readmsg/readmsg.c:249
#, c-format
msgid "Could not create mailbox `%s': %s\n"
msgstr "No s'ha pogut crear la bústia «%s»: %s\n"
-#: readmsg/readmsg.c:254
+#: readmsg/readmsg.c:253
#, c-format
msgid "Could not create default mailbox: %s\n"
msgstr "No es pot crear la bústia per defecte: %s\n"
-#: readmsg/readmsg.c:273
+#: readmsg/readmsg.c:272
#, c-format
msgid "Could not open mailbox `%s': %s\n"
msgstr "No s'ha pogut obrir la bústia «%s»: %s\n"
@@ -4895,7 +5112,8 @@ msgstr "Compila l'script i ix"
#: sieve/sieve.c:78
msgid "Compile script, dump disassembled sieve code to terminal and exit"
-msgstr "Compila l'script, bolca el codi de sieve desassemblat en el terminal i ix"
+msgstr ""
+"Compila l'script, bolca el codi de sieve desassemblat en el terminal i ix"
#: sieve/sieve.c:80
msgid "MBOX"
@@ -5033,8 +5251,12 @@ msgstr "Ha fallat l'eliminació a la bústia per defecte: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mimeview/mimeview.c:31
-msgid "GNU mimeview -- display files, using mailcap mechanism. Default mime.types file is "
-msgstr "GNU mimeview -- mostra fitxers, utilitzant el mecanisme mailcap. El fitxer mime.type és "
+msgid ""
+"GNU mimeview -- display files, using mailcap mechanism. Default mime.types "
+"file is "
+msgstr ""
+"GNU mimeview -- mostra fitxers, utilitzant el mecanisme mailcap. El fitxer "
+"mime.type és "
#: mimeview/mimeview.c:33
msgid ""
@@ -5057,8 +5279,14 @@ msgid "TYPE-LIST"
msgstr "LLISTA-TIPUS"
#: mimeview/mimeview.c:42
-msgid "Do not ask for confirmation before displaying files. If TYPE-LIST is given, do not ask for confirmation before displaying such files whose MIME type matches one of the patterns from TYPE-LIST"
-msgstr "No demanes confirmació abans de mostrar els fitxers. Si es dóna LLISTA-TIPUS, no demanes conformació abans de mostrar els fitxers amb un tipus MIME que coincidisca amb els patrons de LLISTA-TIPUS"
+msgid ""
+"Do not ask for confirmation before displaying files. If TYPE-LIST is given, "
+"do not ask for confirmation before displaying such files whose MIME type "
+"matches one of the patterns from TYPE-LIST"
+msgstr ""
+"No demanes confirmació abans de mostrar els fitxers. Si es dóna LLISTA-"
+"TIPUS, no demanes conformació abans de mostrar els fitxers amb un tipus MIME "
+"que coincidisca amb els patrons de LLISTA-TIPUS"
#: mimeview/mimeview.c:44
msgid "Disable interactive mode"
@@ -5104,6 +5332,18 @@ msgstr "%s: la funció és desconeguda"
msgid "argument %d has wrong type in call to `%s'"
msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
+#~ msgid "Cannot create mailbox %s"
+#~ msgstr "No es pot crear la bústia %s"
+
+#~ msgid "Cannot open save file %s: %s"
+#~ msgstr "No es pot obrir el fitxer on desar %s: %s"
+
+#~ msgid "Not enough memory for creating save file"
+#~ msgstr "No hi ha memòria suficient per a crear un fitxer on desar"
+
+#~ msgid "Badly formed mailspool path: %s"
+#~ msgstr "Camí de bústia de correu malformat: %s"
+
#~ msgid "out of memory"
#~ msgstr "memòria exhaurida"
@@ -5218,7 +5458,8 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ msgstr "no es pot obrir %s: %s\n"
#~ msgid "Set name pattern for user-defined mail filters"
-#~ msgstr "Estableix el patró de noms per filtres de correu definits per l'usuari"
+#~ msgstr ""
+#~ "Estableix el patró de noms per filtres de correu definits per l'usuari"
#~ msgid "temporary file write error: %s"
#~ msgstr "s'ha produït un error d'escriptura en un fitxer temporal: %s"
@@ -5293,8 +5534,12 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ msgstr[0] "la consulta ha tornat %d camp: %s"
#~ msgstr[1] "la consulta ha tornat %d camps: %s"
-#~ msgid "Maximum retention period for messages in the maildrop, default -1 means NEVER"
-#~ msgstr "Màxim periode de retenció per als missatges en la bústia, per defecte -1 vol dir MAI"
+#~ msgid ""
+#~ "Maximum retention period for messages in the maildrop, default -1 means "
+#~ "NEVER"
+#~ msgstr ""
+#~ "Màxim periode de retenció per als missatges en la bústia, per defecte -1 "
+#~ "vol dir MAI"
#~ msgid "%s %s failed: %s\n"
#~ msgstr "%s %s ha fallat: %s\n"
@@ -5306,7 +5551,9 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ msgstr "s'està blocant"
#~ msgid "Select message with the specific attribute: [n]ew, [r]ead, [u]nread."
-#~ msgstr "Selecciona missatges amb atributs específics: n: nou, r: llegits, u: no llegits."
+#~ msgstr ""
+#~ "Selecciona missatges amb atributs específics: n: nou, r: llegits, u: no "
+#~ "llegits."
#~ msgid "You have %d message.\n"
#~ msgid_plural "You have %d messages.\n"
@@ -5334,28 +5581,38 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ "with a line such as:\n"
#~ " :mailer --mailer=smtp://mail.example.com\n"
#~ "\n"
-#~ "If not explicitly specified, the default from address is derived from the\n"
+#~ "If not explicitly specified, the default from address is derived from "
+#~ "the\n"
#~ "\"From:\" field in the message, if present, or the default user's email\n"
#~ "address if not present.\n"
#~ "\n"
-#~ "If not explicitly specified, the default to addresses are derived from the\n"
+#~ "If not explicitly specified, the default to addresses are derived from "
+#~ "the\n"
#~ "\"To:\", \"Cc:\", and \"Bcc:\" fields in the message.\n"
#~ "\n"
#~ "If --debug is specified, the envelope commands in the SMTP protocol\n"
#~ "transaction will be printed to stdout. If specified more than once,\n"
-#~ "the data part of the protocol transaction will also be printed to stdout.\n"
+#~ "the data part of the protocol transaction will also be printed to "
+#~ "stdout.\n"
#~ msgstr ""
-#~ "GNU mail.remote -- interfície pareguda a sendmail per a l'enviament de correu\n"
+#~ "GNU mail.remote -- interfície pareguda a sendmail per a l'enviament de "
+#~ "correu\n"
#~ " \n"
-#~ "Un missatge formatat segons RFC2822 es llig des de la entrada estàndard i\n"
+#~ "Un missatge formatat segons RFC2822 es llig des de la entrada estàndard "
+#~ "i\n"
#~ "repartit usant l'enviador de correu. Aquesta utilitat es pot usar com un\n"
-#~ "reemplaç de /bin/sendmail per a reenviar correu directament a una passarel·la\n"
+#~ "reemplaç de /bin/sendmail per a reenviar correu directament a una "
+#~ "passarel·la\n"
#~ "SMTP.\n"
#~ "\n"
-#~ "L'enviador de correu per defecte és «sendmail:», que no està suportat per\n"
-#~ "aquesta utilitat (la intenció és que s'utilitze quan no teniu un sendmail\n"
-#~ "funcional). Hauríeu d'especificar la vostra passarel·la SMTP amb --mailer i\n"
-#~ "algo similar a «smtp://mail.exemple.com». Normalment, açò s'afegiria a la\n"
+#~ "L'enviador de correu per defecte és «sendmail:», que no està suportat "
+#~ "per\n"
+#~ "aquesta utilitat (la intenció és que s'utilitze quan no teniu un "
+#~ "sendmail\n"
+#~ "funcional). Hauríeu d'especificar la vostra passarel·la SMTP amb --mailer "
+#~ "i\n"
+#~ "algo similar a «smtp://mail.exemple.com». Normalment, açò s'afegiria a "
+#~ "la\n"
#~ "vostra configuració específica d'usuari,\n"
#~ " ~/.mailutils/mailutils,\n"
#~ "o el fitxer de configuració global,\n"
@@ -5363,16 +5620,22 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ "amb una línia similar a:\n"
#~ " :mailer --mailer=smtp://mail.exemple.com\n"
#~ "\n"
-#~ "Si no s'especifica explícitament, l'adreça del remitent per defecte deriva del\n"
-#~ "camp «From:» del missatge, si està present, o l'adreça per defecte de l'usuari\n"
+#~ "Si no s'especifica explícitament, l'adreça del remitent per defecte "
+#~ "deriva del\n"
+#~ "camp «From:» del missatge, si està present, o l'adreça per defecte de "
+#~ "l'usuari\n"
#~ "si no està present.\n"
#~ "\n"
-#~ "Si no s'especifica explícitament, les adreces de destinatari deriven dels\n"
+#~ "Si no s'especifica explícitament, les adreces de destinatari deriven "
+#~ "dels\n"
#~ "camps «To:», «Cc:» i «Bcc:» del missatge.\n"
#~ "\n"
-#~ "Si s'especifica --debug, es mostraran les ordres del sobre en la transacció\n"
-#~ "del protocol SMTP en l'eixida estàndard. Si s'especifica més d'una vegada,\n"
-#~ "la part de les dades de la transacció del protocol també es mostraran en la\n"
+#~ "Si s'especifica --debug, es mostraran les ordres del sobre en la "
+#~ "transacció\n"
+#~ "del protocol SMTP en l'eixida estàndard. Si s'especifica més d'una "
+#~ "vegada,\n"
+#~ "la part de les dades de la transacció del protocol també es mostraran en "
+#~ "la\n"
#~ "eixida.\n"
#~ msgid "Couldn't create mailbox %s.\n"
@@ -5381,19 +5644,39 @@ msgstr "l'argument %d té el tipus incorrecte en la crida a «%s»"
#~ msgid "could not create mailbox: %s"
#~ msgstr "no s'ha pogut crear la bústia: %s"
-#~ msgid "Note: Argument to --file (-f) option is optional. If it is present, it must follow the short option immediately, without any intervening whitespace. If it is used with the long option, it must be separated from it by an equal sign, with no intervening whitespace."
-#~ msgstr "Nota: L'argument per a l'opció --file (-f) és opcional. Si està present, ha d'anar després de l'opció curta immediatament, sense cap espai en blanc en mig. Si 'usa amb l'opció llarga, ha d'estar separada d'aquesta amb un signe d'igualtat, sense cap espai en blanc."
+#~ msgid ""
+#~ "Note: Argument to --file (-f) option is optional. If it is present, it "
+#~ "must follow the short option immediately, without any intervening "
+#~ "whitespace. If it is used with the long option, it must be separated from "
+#~ "it by an equal sign, with no intervening whitespace."
+#~ msgstr ""
+#~ "Nota: L'argument per a l'opció --file (-f) és opcional. Si està present, "
+#~ "ha d'anar després de l'opció curta immediatament, sense cap espai en "
+#~ "blanc en mig. Si 'usa amb l'opció llarga, ha d'estar separada d'aquesta "
+#~ "amb un signe d'igualtat, sense cap espai en blanc."
#~ msgid ""
-#~ "Usage error: --file takes an optional argument, it must follow the option\n"
+#~ "Usage error: --file takes an optional argument, it must follow the "
+#~ "option\n"
#~ "without any intervening whitespace."
-#~ msgstr "Error d'ús: --file accepta un argument opcional, però ha de anar després de l'opció sense cap espai en mig."
+#~ msgstr ""
+#~ "Error d'ús: --file accepta un argument opcional, però ha de anar després "
+#~ "de l'opció sense cap espai en mig."
#~ msgid "Run mail --help for more info."
#~ msgstr "Executeu mail --help per a obtindre més informació."
-#~ msgid "print libraries to link with. Up to two args can be given. Arguments are: auth, to display libraries needed for linking against libmuauth, and guile, to display libraries needed for linking against libmu_scm. Both can be given simultaneously"
-#~ msgstr "mostra les biblioteques en les qual lincar. Es poden donar fins a dos arguments. Els arguments són: auth, per a mostrar les biblioteques que es necessiten per a lincar amb libmuauth, i guile, per a mostrar les biblioteques que es necessiten per a lincar amb libmu_scm. Totes dos es poden donar simultàniament. "
+#~ msgid ""
+#~ "print libraries to link with. Up to two args can be given. Arguments are: "
+#~ "auth, to display libraries needed for linking against libmuauth, and "
+#~ "guile, to display libraries needed for linking against libmu_scm. Both "
+#~ "can be given simultaneously"
+#~ msgstr ""
+#~ "mostra les biblioteques en les qual lincar. Es poden donar fins a dos "
+#~ "arguments. Els arguments són: auth, per a mostrar les biblioteques que es "
+#~ "necessiten per a lincar amb libmuauth, i guile, per a mostrar les "
+#~ "biblioteques que es necessiten per a lincar amb libmu_scm. Totes dos es "
+#~ "poden donar simultàniament. "
#~ msgid "waiting for debug"
#~ msgstr "s'està esperant a la depuració"
diff --git a/po/es.po b/po/es.po
index bd65e3c..14e648e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mailutils 0.6.90\n"
"Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-05-17 15:23+0300\n"
+"POT-Creation-Date: 2005-08-16 13:23+0300\n"
"PO-Revision-Date: 2005-05-23 18:04-0500\n"
"Last-Translator: Cristian Othón Martínez Vera <cfuga@itam.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -20,8 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: config/mailutils-config.c:28
-msgid "GNU mailutils-config -- Display compiler and loader options needed for building a program with mailutils"
-msgstr "GNU mailutils-config -- Muestra las opciones necesarias para el compilador y el cargador para construir un programa con mailutils"
+msgid ""
+"GNU mailutils-config -- Display compiler and loader options needed for "
+"building a program with mailutils"
+msgstr ""
+"GNU mailutils-config -- Muestra las opciones necesarias para el compilador y "
+"el cargador para construir un programa con mailutils"
#: config/mailutils-config.c:29
msgid "[arg...]"
@@ -32,21 +36,36 @@ msgid "Print C compiler flags to compile with"
msgstr "Muestra las banderas del compilador de C para compilar"
#: config/mailutils-config.c:35
-msgid "Print libraries to link with. Possible arguments are: auth, guile, all, mbox, mh, maildir, imap, pop"
-msgstr "Muestra las bibliotecas a enlazar. Los argumentos posibles son: auth, guile, all, mbox, mh, maildir, imap, pop"
+msgid ""
+"Print libraries to link with. Possible arguments are: auth, guile, all, "
+"mbox, mh, maildir, imap, pop"
+msgstr ""
+"Muestra las bibliotecas a enlazar. Los argumentos posibles son: auth, guile, "
+"all, mbox, mh, maildir, imap, pop"
#: config/mailutils-config.c:38
-msgid "Print a list of configuration options used to build mailutils. If arguments are given, they are interpreted as a list of configuration options to check for. In this case the program prints those options from this list that have been defined. It exits with zero status if all of the specified options are defined. Otherwise, the exit status is 1."
-msgstr "Muestra una lista de opciones de compilación utilizadas para construir mailutils. Si se dan argumentos, se interpretan como una lista de opciones de configuración para revisar. En este caso el programa muestra aquellas opciones de esta lista que estén definidas. Termina con estado cero si todas las opciones especificadas están definidas. De otra manera, el estado de salida es 1."
-
-#: config/mailutils-config.c:126 frm/from.c:129 mh/folder.c:568
+msgid ""
+"Print a list of configuration options used to build mailutils. If arguments "
+"are given, they are interpreted as a list of configuration options to check "
+"for. In this case the program prints those options from this list that have "
+"been defined. It exits with zero status if all of the specified options are "
+"defined. Otherwise, the exit status is 1."
+msgstr ""
+"Muestra una lista de opciones de compilación utilizadas para construir "
+"mailutils. Si se dan argumentos, se interpretan como una lista de opciones "
+"de configuración para revisar. En este caso el programa muestra aquellas "
+"opciones de esta lista que estén definidas. Termina con estado cero si todas "
+"las opciones especificadas están definidas. De otra manera, el estado de "
+"salida es 1."
+
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
msgid "Too many arguments"
msgstr "Demasiados argumentos"
-#: auth/pam.c:153 auth/sql.c:196 auth/sql.c:198 auth/sql.c:202
+#: auth/pam.c:153 auth/sql.c:197 auth/sql.c:199 auth/sql.c:203
#: mail.local/main.c:87 mail.local/main.c:92 mh/anno.c:43 mh/pick.c:45
#: mh/pick.c:48 mh/pick.c:50 mh/pick.c:52 mh/pick.c:54 mh/pick.c:56
-#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:84
+#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:83
msgid "STRING"
msgstr "CADENA"
@@ -62,86 +81,92 @@ msgstr "CADENA"
msgid "Use STRING as PAM service name"
msgstr "Utiliza CADENA como el nombre de servicio PAM"
-#: auth/sql.c:184 auth/sql.c:194 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
+#: auth/sql.c:185 auth/sql.c:195 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
#: mh/mark.c:32 mh/pick.c:87
msgid "NAME"
msgstr "NOMBRE"
-#: auth/sql.c:185
+#: auth/sql.c:186
msgid "Type of SQL interface to use"
msgstr "Tipo de interfaz SQL a utilizar"
-#: auth/sql.c:186 auth/sql.c:188 auth/sql.c:190
+#: auth/sql.c:187 auth/sql.c:189 auth/sql.c:191
msgid "QUERY"
msgstr "PETICIÓN"
-#: auth/sql.c:187
+#: auth/sql.c:188
msgid "SQL query to retrieve a passwd entry based on username"
-msgstr "Petición SQL para obtener una entrada de contraseña basada en el nombre de usuario"
+msgstr ""
+"Petición SQL para obtener una entrada de contraseña basada en el nombre de "
+"usuario"
-#: auth/sql.c:189
+#: auth/sql.c:190
msgid "SQL query to retrieve a passwd entry based on UID"
msgstr "Petición SQL para obtener una entrada de contraseña basada en el UID"
-#: auth/sql.c:191
+#: auth/sql.c:192
msgid "SQL query to retrieve a password from the database"
msgstr "Petición SQL para obtener una contraseña de la base de datos"
-#: auth/sql.c:192
+#: auth/sql.c:193
msgid "HOSTNAME"
msgstr "ANFITRIÓN"
-#: auth/sql.c:193
+#: auth/sql.c:194
msgid "Name or IP of MySQL server to connect to"
msgstr "Nombre o IP del servidor MySQL a conectarse"
-#: auth/sql.c:195
+#: auth/sql.c:196
msgid "SQL user name"
msgstr "Nombre de usuario SQL"
-#: auth/sql.c:197
+#: auth/sql.c:198
msgid "SQL connection password"
msgstr "Contraseña de conexión SQL"
-#: auth/sql.c:199
+#: auth/sql.c:200
msgid "Name of the database to connect to"
msgstr "Nombre de la base de datos a conectarse"
-#: auth/sql.c:200 mailbox/mu_argp.c:79 mailbox/mu_argp.c:114
-#: mailbox/mu_argp.c:120 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
+#: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
msgid "NUMBER"
msgstr "NÚMERO"
-#: auth/sql.c:201
+#: auth/sql.c:202
msgid "Port to use"
msgstr "Puerto a utilizar"
-#: auth/sql.c:203
-msgid "Type of password returned by --sql-getpass query. STRING is one of: plain, hash, scrambled"
-msgstr "Tipo de contraseña devuelto por la consulta --sql-getpass. CADENA es una de: plain, hash, scramble"
+#: auth/sql.c:204
+msgid ""
+"Type of password returned by --sql-getpass query. STRING is one of: plain, "
+"hash, scrambled"
+msgstr ""
+"Tipo de contraseña devuelto por la consulta --sql-getpass. CADENA es una de: "
+"plain, hash, scramble"
-#: auth/sql.c:215
+#: auth/sql.c:216
#, c-format
msgid "Unknown SQL interface `%s'"
msgstr "Interfaz SQL `%s' desconocida"
-#: auth/sql.c:258
+#: auth/sql.c:259
#, c-format
msgid "Unknown password type `%s'"
msgstr "Tipo de contraseña %s desconocido"
-#: auth/sql.c:324 auth/sql.c:456 auth/sql.c:577 mail.local/mailquota.c:191
+#: auth/sql.c:325 auth/sql.c:455 auth/sql.c:574 mail.local/mailquota.c:191
#, c-format
msgid "SQL Query failed: %s"
msgstr "Falló la petición SQL: %s"
-#: auth/sql.c:335 auth/sql.c:467 auth/sql.c:588 mail.local/mailquota.c:202
+#: auth/sql.c:336 auth/sql.c:466 auth/sql.c:585 mail.local/mailquota.c:202
#, c-format
msgid "Cannot store SQL result: %s"
msgstr "No se puede almacenar el resultado SQL: %s"
-#: auth/sql.c:598
+#: auth/sql.c:595
#, c-format
msgid "Cannot get password from SQL: %s"
msgstr "No se puede obtener la contraseña de SQL: %s"
@@ -156,10 +181,10 @@ msgstr "Opciones de cifrado"
#: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
#: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
-#: mailbox/mu_argp.c:124 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
+#: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
-#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:82 pop3d/popauth.c:83
+#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
#: mimeview/mimeview.c:48 mimeview/mimeview.c:52
msgid "FILE"
msgstr "FICHERO"
@@ -320,92 +345,95 @@ msgstr "Reiniciando"
#: comsat/comsat.c:186
msgid "Cannot restart: program must be invoked using absolute pathname"
-msgstr "No se puede reiniciar: el programa se debe invocar con el nombre de ruta absoluto"
+msgstr ""
+"No se puede reiniciar: el programa se debe invocar con el nombre de ruta "
+"absoluto"
# Si no tuviera el original no lo entendería. Yo pondría tal vez algo así:
# "Fallo al convertirse en demonio". sv
# Corrección aceptada e integrada a la traducción. cfuga
-#: comsat/comsat.c:220
+#: comsat/comsat.c:216
msgid "Failed to become a daemon"
msgstr "Fallo al convertirse en demonio"
-#: comsat/comsat.c:264
+#: comsat/comsat.c:260
msgid "GNU comsat started"
msgstr "GNU comsat iniciado"
-#: comsat/comsat.c:292
+#: comsat/comsat.c:288
#, c-format
msgid "Too many requests: pausing for %u second"
msgid_plural "Too many requests: pausing for %u seconds"
msgstr[0] "Demasiadas peticiones: haciendo una pausa por %u segundo"
msgstr[1] "Demasiadas peticiones: haciendo una pausa por %u segundos"
-#: comsat/comsat.c:347
+#: comsat/comsat.c:343
#, c-format
msgid "DENIED attempt to connect from %s"
msgstr "intento DENEGADO de conectarse desde %s"
-#: comsat/comsat.c:353
+#: comsat/comsat.c:349
#, c-format
msgid "Received %d byte from %s"
msgid_plural "Received %d bytes from %s"
msgstr[0] "Se recibió %d byte desde %s"
msgstr[1] "Se recibieron %d bytes desde %s"
-#: comsat/comsat.c:363
+#: comsat/comsat.c:359
#, c-format
msgid "Malformed input: %s"
msgstr "Entrada malformada: %s"
-#: comsat/comsat.c:378
+#: comsat/comsat.c:374
#, c-format
msgid "Malformed input: %s@%s (near %s)"
msgstr "Entrada malformada: %s@%s (cerca de %s)"
-#: comsat/comsat.c:444
+#: comsat/comsat.c:440
#, c-format
msgid "Cannot open device %s: %m"
msgstr "No se puede abrir el dispositivo %s: %m"
-#: comsat/comsat.c:460 mail/file.c:92 mail/mail.c:438 mail.local/main.c:690
-#: mail.local/main.c:709 mh/inc.c:218 mh/mh_init.c:379 pop3d/apop.c:240
+#: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
+#: mh/mh_init.c:379 pop3d/apop.c:240
#, c-format
msgid "Cannot open mailbox %s: %s"
msgstr "No se puede abrir el buzón %s: %s"
-#: comsat/comsat.c:467 mail.local/main.c:728
+#: comsat/comsat.c:463 mail.local/main.c:724
#, c-format
msgid "Cannot get stream for mailbox %s: %s"
msgstr "No se puede obtener un flujo para el buzón %s: %s"
-#: comsat/comsat.c:474 mail.local/main.c:736
+#: comsat/comsat.c:470 mail.local/main.c:732
#, c-format
msgid "Cannot get stream size (mailbox %s): %s"
msgstr "No se puede obtener el tamaño del flujo (buzón %s): %s"
-#: comsat/comsat.c:491 pop3d/apop.c:230
+#: comsat/comsat.c:487 pop3d/apop.c:230
#, c-format
msgid "Cannot create temporary mailbox: %s"
msgstr "No se puede crear un buzón temporal: %s"
-#: comsat/comsat.c:498
+#: comsat/comsat.c:494
#, c-format
msgid "Cannot create temporary stream: %s"
msgstr "No se puede crear un flujo temporal: %s"
-#: comsat/comsat.c:545
+#: comsat/comsat.c:541
#, c-format
msgid "Bad line name in utmp record: %s"
msgstr "Nombre de línea erróneo en el registro utmp: %s"
# ¿"de carácter" o "de caracteres"? sv
# "de caracteres". cfuga
-#: comsat/comsat.c:553
+#: comsat/comsat.c:549
#, c-format
msgid "Not a character device: %s"
msgstr "No es un dispositivo de caracteres: %s"
-#: comsat/comsat.c:586 pop3d/popauth.c:309 pop3d/popauth.c:546
+#: comsat/comsat.c:582 pop3d/popauth.c:308 pop3d/popauth.c:545
#, c-format
msgid "No such user: %s"
msgstr "No existe ese usuario: %s"
@@ -413,7 +441,7 @@ msgstr "No existe ese usuario: %s"
# no existente -> inexistente
# o si no te gusta: "el usuario no existe: %s" sv
# Prefiero la segunda forma. cfuga
-#: comsat/comsat.c:606
+#: comsat/comsat.c:602
#, c-format
msgid "User nonexistent: %s"
msgstr "El usuario no existe: %s"
@@ -424,8 +452,14 @@ msgstr "El usuario no existe: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: dotlock/dotlock.c:38
-msgid "GNU dotlock -- lock mail spool files Returns 0 on success, 3 if locking the file fails because it's already locked, and 1 if some other kind of error occurred."
-msgstr "GNU dotlock -- bloquea los ficheros de la cola de correos Devuelve 0 en caso de éxito, 3 si falla el bloqueo del fichero porque ya está bloqueado, y 1 si sucede cualquier otro tipo de error."
+msgid ""
+"GNU dotlock -- lock mail spool files Returns 0 on success, 3 if locking the "
+"file fails because it's already locked, and 1 if some other kind of error "
+"occurred."
+msgstr ""
+"GNU dotlock -- bloquea los ficheros de la cola de correos Devuelve 0 en caso "
+"de éxito, 3 si falla el bloqueo del fichero porque ya está bloqueado, y 1 si "
+"sucede cualquier otro tipo de error."
#: dotlock/dotlock.c:47
msgid "Unlock"
@@ -440,7 +474,8 @@ msgstr "MINUTOS"
# Sí, era fuerza. "rotura" no me gusta mucho, creo que queda mejor así. cfuga
#: dotlock/dotlock.c:50
msgid "Forcibly break an existing lock older than a certain time"
-msgstr "Fuerza la interrupción de un bloqueo existente más antiguo que cierto tiempo"
+msgstr ""
+"Fuerza la interrupción de un bloqueo existente más antiguo que cierto tiempo"
#: dotlock/dotlock.c:52
msgid "RETRIES"
@@ -454,7 +489,8 @@ msgstr "Reintenta el bloqueo unas veces más"
# Lo ponemos así. cfuga
#: dotlock/dotlock.c:56
msgid "Print details of failure reasons to stderr"
-msgstr "Muestra detalles de las razones del fallo en la salida de error estándar"
+msgstr ""
+"Muestra detalles de las razones del fallo en la salida de error estándar"
# "Mayor que", no "mayor a". sv
# Ups. Cierto. cfuga
@@ -522,8 +558,14 @@ msgstr "leído"
#. differ by the first letter.
#.
#: frm/frm.c:62
-msgid "Select messages with the specific attribute. STATUS is one of the following: new, unread, old (same as unread) or read. Any unambiguous abbreviation of those is also accepted."
-msgstr "Selecciona mensajes con el atributo especificado. ESTADO es uno de los siguientes: nuevo, sin leer, antiguo (igual que sin leer) o leído. También se acepta cualquier abreviatura que no sea ambigua."
+msgid ""
+"Select messages with the specific attribute. STATUS is one of the following: "
+"new, unread, old (same as unread) or read. Any unambiguous abbreviation of "
+"those is also accepted."
+msgstr ""
+"Selecciona mensajes con el atributo especificado. ESTADO es uno de los "
+"siguientes: nuevo, sin leer, antiguo (igual que sin leer) o leído. También "
+"se acepta cualquier abreviatura que no sea ambigua."
#: frm/frm.c:127
#, c-format
@@ -648,7 +690,8 @@ msgstr "DIRECCIÓN"
#: frm/from.c:31
msgid "Print only mail from addresses containing the supplied string"
-msgstr "Muestra sólo el correo de direcciones que contienen la cadena proporcionada"
+msgstr ""
+"Muestra sólo el correo de direcciones que contienen la cadena proporcionada"
#: frm/from.c:33
msgid "Read mail from FILE"
@@ -658,11 +701,12 @@ msgstr "Leer el formato del FICHERO"
msgid "[OPTIONS] [USER]"
msgstr "[OPCIONES] [USUARIO]"
-#: frm/from.c:136
+#: frm/from.c:135
msgid "Both --from option and user name are specified"
-msgstr "Se especificaron la opción --from y el nombre de usuario al mismo tiempo"
+msgstr ""
+"Se especificaron la opción --from y el nombre de usuario al mismo tiempo"
-#: frm/from.c:151
+#: frm/from.c:150
#, c-format
msgid "There is %lu message in your incoming mailbox.\n"
msgid_plural "There are %lu messages in your incoming mailbox.\n"
@@ -674,7 +718,7 @@ msgstr[1] "Hay %lu mensajes en su buzón de entrada.\n"
msgid "fribidi failed to recognize charset `%s'"
msgstr "fribidi falló al reconocer el conjunto de caracteres `%s'"
-#: frm/common.c:374 mail/util.c:1398
+#: frm/common.c:374 mail/util.c:1453
#, c-format
msgid "Cannot decode line `%s': %s"
msgstr "No se puede decodificar la línea `%s': %s"
@@ -706,37 +750,42 @@ msgstr "No se puede abrir el buzón `%s': %s"
msgid "Could not scan mailbox `%s': %s."
msgstr "No se puede revisar el buzón `%s': %s."
-#: guimb/collect.c:35 guimb/main.c:45 imap4d/auth_gss.c:267
-#: libsieve/sieve.l:131 libsieve/sieve.l:602 libsieve/sieve.l:666
-#: libsieve/sieve.l:720 mail/folders.c:38 mail/if.c:56 mail/util.c:761
-#: mh/mh_init.c:111 mh/mh_init.c:316 mh/mh_msgset.c:606
-msgid "Not enough memory"
-msgstr "No hay suficiente memoria"
+#: guimb/collect.c:35
+#, fuzzy, c-format
+msgid "Cannot construct default mailbox URL: %s"
+msgstr "No se puede abrir el buzón por defecto %s: %s"
-#: guimb/collect.c:42
+#: guimb/collect.c:43
#, c-format
msgid "Cannot open default mailbox %s: %s"
msgstr "No se puede abrir el buzón por defecto %s: %s"
-#: guimb/collect.c:86
+#: guimb/collect.c:87
#, c-format
msgid "Cannot open input file %s: %s"
msgstr "No se puede abrir el fichero de entrada %s: %s"
-#: guimb/collect.c:114
+#: guimb/collect.c:115
#, c-format
msgid "Cannot create temp mailbox %s: %s"
msgstr "No se puede crear el buzón temporal %s: %s"
-#: guimb/collect.c:125
+#: guimb/collect.c:126
msgid "Input format not recognized"
msgstr "No se reconoce el formato de entrada"
-#: guimb/collect.c:150
+#: guimb/collect.c:151
#, c-format
msgid "Cannot open output mailbox %s: %s\n"
msgstr "No se puede abrir el buzón %s: %s\n"
+#: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
+#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
+#: mh/mh_init.c:316 mh/mh_msgset.c:606
+msgid "Not enough memory"
+msgstr "No hay suficiente memoria"
+
# (command-line) es una función de Guile, por eso no se traduce. cfuga
#. TRANSLATORS: (command-line) is the name of Guile function. Do not
#. translate it.
@@ -768,7 +817,8 @@ msgstr "Carga código fuente Scheme de FICHPROG, y termina"
#: guimb/main.c:63
msgid "The following options do not change the order of options parsing:"
-msgstr "Las siguientes opciones no cambian el orden de la decodificación de opciones:"
+msgstr ""
+"Las siguientes opciones no cambian el orden de la decodificación de opciones:"
#: guimb/main.c:67
msgid "Other options:"
@@ -797,8 +847,12 @@ msgid "Act as local MDA for user NAME"
msgstr "Actúa como un MDA local para el usuario NOMBRE"
#: guimb/main.c:126
-msgid "GNU guimb -- Process the contents of the specified mailboxes using a Scheme program or expression."
-msgstr "GNU guimb -- Procesa el contenido de los buzones especificados utilizando un programa o una expresión Scheme."
+msgid ""
+"GNU guimb -- Process the contents of the specified mailboxes using a Scheme "
+"program or expression."
+msgstr ""
+"GNU guimb -- Procesa el contenido de los buzones especificados utilizando un "
+"programa o una expresión Scheme."
#: guimb/main.c:128 messages/messages.c:35
msgid "[mailbox...]"
@@ -806,9 +860,11 @@ msgstr "[buzón...]"
#: guimb/main.c:170
msgid "At least one of -fecs must be used. Try guimb --help for more info."
-msgstr "Al menos se debe usar uno de -fecs. Pruebe `guimb --help' para obtener más información."
+msgstr ""
+"Al menos se debe usar uno de -fecs. Pruebe `guimb --help' para obtener más "
+"información."
-#: guimb/util.c:51 guimb/util.c:58 mail/util.c:687 mail/util.c:694
+#: guimb/util.c:51 guimb/util.c:58 mail/util.c:799 mail/util.c:806
#, c-format
msgid "Cannot determine sender name (msg %d)"
msgstr "No se puede determinar el nombre del remitente (msg %d)"
@@ -873,19 +929,19 @@ msgstr "Desactiva la orden LOGIN"
msgid "Always require STARTTLS before entering authentication phase"
msgstr "Requiere siempre STARTTLS antes de entrar a la fase de autenticación"
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:202
+#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
msgid "Error getting mail group"
msgstr "Error al obtener el grupo mail"
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:208
+#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
msgid "Error setting mail group"
msgstr "Error al establecer el grupo mail"
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:299
+#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
msgid "Incoming connection opened"
msgstr "Conexión de entrada abierta"
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:311
+#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
#, c-format
msgid "Cannot obtain IP address of client: %s"
msgstr "No se puede obtener la dirección IP del cliente: %s"
@@ -895,7 +951,7 @@ msgstr "No se puede obtener la dirección IP del cliente: %s"
msgid "Connect from %s"
msgstr "Conectado desde %s"
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:304
+#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
msgid "Started in debugging mode"
msgstr "Iniciado en modo de depuración"
@@ -951,7 +1007,7 @@ msgid "Quitting (numeric reason %d)"
msgstr "Saliendo (razón numérica %d)"
#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
-#: mh/rmf.c:147 pop3d/popauth.c:247
+#: mh/rmf.c:147 pop3d/popauth.c:246
#, c-format
msgid "Cannot stat %s: %s"
msgstr "No se puede hacer stat a %s: %s"
@@ -980,72 +1036,72 @@ msgstr "Se recibió la señal %s"
msgid "MASTER: exiting on signal"
msgstr "MAESTRO: terminando con la señal"
-#: imap4d/util.c:485
+#: imap4d/util.c:509
msgid "Unexpected eof on input"
msgstr "Fin-de-fichero inesperado en la entrada"
-#: imap4d/util.c:494
+#: imap4d/util.c:518
#, c-format
msgid "Error reading from input file: %s"
msgstr "Error al leer del fichero de entrada: %s"
-#: imap4d/util.c:981
+#: imap4d/util.c:1005
msgid "Cannot find out my own hostname"
msgstr "No se puede encontrar el nombre de anfitrión propio"
# La traducción de poll se basa en la empleada en la traducción de
# fetchmail. - cfuga
-#: imap4d/util.c:1128
+#: imap4d/util.c:1152
#, c-format
msgid "Cannot poll input stream: %s"
msgstr "No se puede recibir del flujo de entrada: %s"
-#: imap4d/util.c:1162
+#: imap4d/util.c:1186
#, c-format
msgid "Cannot open TLS stream: %s"
msgstr "no se puede abrir el flujo TLS: %s"
-#: lib/mailcap.c:331
+#: lib/mailcap.c:337
#, c-format
msgid "Run `%s'?"
msgstr "¿Ejecutar `%s'?"
-#: lib/mailcap.c:367
+#: lib/mailcap.c:373
#, c-format
msgid "cannot retrieve field %lu: %s"
msgstr "no se obtener el campo %lu: %s"
-#: lib/mailcap.c:439
+#: lib/mailcap.c:445
#, c-format
msgid "Cannot execute `%s': %s"
msgstr "No se puede ejecutar `%s': %s"
-#: lib/mailcap.c:456
+#: lib/mailcap.c:462
#, c-format
msgid "Command exited with status %d\n"
msgstr "La orden terminó con el estado %d\n"
-#: lib/mailcap.c:458
+#: lib/mailcap.c:464
#, c-format
msgid "Command terminated on signal %d\n"
msgstr "La orden terminó con la señal %d\n"
-#: lib/mailcap.c:460
+#: lib/mailcap.c:466
#, c-format
msgid "Command terminated\n"
msgstr "Orden terminada\n"
-#: lib/mailcap.c:544 mimeview/mimeview.c:201
+#: lib/mailcap.c:550 mimeview/mimeview.c:201
#, c-format
msgid "Executing %s...\n"
msgstr "Ejecutando %s...\n"
-#: lib/mailcap.c:587
+#: lib/mailcap.c:593
#, c-format
msgid "Trying %s...\n"
msgstr "Intentando %s...\n"
-#: lib/mailcap.c:629
+#: lib/mailcap.c:635
#, c-format
msgid "Found in %s\n"
msgstr "Se encontró en %s\n"
@@ -1068,56 +1124,56 @@ msgstr "entregando en %s"
msgid "cannot save to mailbox: %s"
msgstr "no se puede guardar en el buzón: %s"
-#: libsieve/actions.c:243
+#: libsieve/actions.c:252
msgid "reject: cannot get text!"
msgstr "reject: ¡No se puede obtener el texto!"
-#: libsieve/actions.c:259 libsieve/extensions/vacation.c:445
+#: libsieve/actions.c:268 libsieve/extensions/vacation.c:443
#, c-format
msgid "%d: cannot create recipient address <%s>: %s"
msgstr "%d: no se puede crear la dirección de destinatario <%s>: %s"
-#: libsieve/actions.c:271 libsieve/actions.c:400
+#: libsieve/actions.c:280 libsieve/actions.c:409
#, c-format
msgid "%d: cannot create sender address <%s>: %s"
msgstr "%d: no se puede crear la dirección de remitente <%s>: %s"
-#: libsieve/actions.c:285 libsieve/actions.c:440
-#: libsieve/extensions/vacation.c:480
+#: libsieve/actions.c:294 libsieve/actions.c:449
+#: libsieve/extensions/vacation.c:478
#, c-format
msgid "%d: cannot open mailer %s: %s"
msgstr "%d: no se puede abrir el programa de correo %s: %s"
-#: libsieve/actions.c:360
+#: libsieve/actions.c:369
msgid "cannot get address!"
msgstr "¡No se puede obtener la dirección!"
-#: libsieve/actions.c:368
+#: libsieve/actions.c:377
#, c-format
msgid "%d: parsing recipient address `%s' failed: %s"
msgstr "%d: falló la decodificación de la dirección de destinatario `%s': %s"
-#: libsieve/actions.c:374
+#: libsieve/actions.c:383
#, c-format
msgid "to %s"
msgstr "para %s"
-#: libsieve/actions.c:381
+#: libsieve/actions.c:390
#, c-format
msgid "%d: Redirection loop detected"
msgstr "%d: Se detectó un ciclo de redirección"
-#: libsieve/actions.c:390
+#: libsieve/actions.c:399
#, c-format
msgid "%d: cannot get envelope sender: %s"
msgstr "%d: no se puede obtener el sobre del remitente: %s"
-#: libsieve/actions.c:413
+#: libsieve/actions.c:422
#, c-format
msgid "%d: cannot copy message: %s"
msgstr "%d: no se puede copiar el mensaje: %s"
-#: libsieve/actions.c:428
+#: libsieve/actions.c:437
#, c-format
msgid "%d: cannot get my email address"
msgstr "%d: no se puede obtener la dirección de correo electrónico propia"
@@ -1158,7 +1214,9 @@ msgstr "coincidencia relacional `%s' inválida en la llamada a `%s'"
#: libsieve/comparator.c:322
#, c-format
msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
-msgstr "el comparador `%s' es incompatible con el tipo de coincidencia `%s' en la llamada a `%s'"
+msgstr ""
+"el comparador `%s' es incompatible con el tipo de coincidencia `%s' en la "
+"llamada a `%s'"
#: libsieve/prog.c:39
msgid "out of memory!"
@@ -1239,37 +1297,37 @@ msgstr "desbordamiento por debajo de la pila"
msgid "mailbox_scan: %s"
msgstr "mailbox_scan: %s"
-#: libsieve/sieve.l:233
+#: libsieve/sieve.l:234
#, c-format
msgid "cannot stat `%s': %s"
msgstr "no se puede hacer stat a `%s': %s"
-#: libsieve/sieve.l:239 libsieve/sieve.l:244
+#: libsieve/sieve.l:240 libsieve/sieve.l:245
msgid "recursive inclusion"
msgstr "inclusión recursiva"
-#: libsieve/sieve.l:247
+#: libsieve/sieve.l:248
#, c-format
msgid "`%s' already included here"
msgstr "`%s' ya se incluyó aquí"
-#: libsieve/sieve.l:251
+#: libsieve/sieve.l:252
#, c-format
msgid "`%s' already included at top level"
msgstr "`%s' ya se incluyó en el nivel principal"
-#: libsieve/sieve.l:260
+#: libsieve/sieve.l:261
#, c-format
msgid "cannot open `%s': %s"
msgstr "no se puede abrir `%s': %s"
-#: libsieve/sieve.l:438
+#: libsieve/sieve.l:439
msgid "preprocessor syntax"
msgstr "sintaxis de preprocesador"
# yo traduciría "closing quote" -> "comilla de cierre" sv
# Sugerencia aceptada. cfuga
-#: libsieve/sieve.l:447
+#: libsieve/sieve.l:448
msgid "missing closing quote in preprocessor statement"
msgstr "falta una comilla de cierre en una declaración del preprocesador"
@@ -1302,28 +1360,29 @@ msgstr "tipo de datos inválido"
msgid "cannot retrieve argument %d"
msgstr "no se puede obtener el argumento %d"
-#: libsieve/extensions/vacation.c:257
+#: libsieve/extensions/vacation.c:255
#, c-format
msgid "%d: cannot build db file name"
msgstr "%d: no se puede construir el nombre de fichero de la bd"
-#: libsieve/extensions/vacation.c:268
+#: libsieve/extensions/vacation.c:266
#, c-format
msgid "%d: cannot open `%s': %s"
msgstr "%d: no se puede abrir `%s': %s"
#. TRANSLATORS: 'vacation' and ':days' are Sieve keywords.
#. Do not translate them!
-#: libsieve/extensions/vacation.c:311
+#: libsieve/extensions/vacation.c:309
#, c-format
msgid "%d: vacation compiled without DBM support. Ignoring :days tag"
-msgstr "%d: vacation se compiló sin soporte para DBM. Se ignora la etiqueta :days"
+msgstr ""
+"%d: vacation se compiló sin soporte para DBM. Se ignora la etiqueta :days"
-#: libsieve/extensions/vacation.c:507
+#: libsieve/extensions/vacation.c:505
msgid "cannot get text!"
msgstr "¡No se puede obtener el texto!"
-#: libsieve/extensions/vacation.c:524
+#: libsieve/extensions/vacation.c:522
#, c-format
msgid "%d: cannot get sender address"
msgstr "%d: no se puede obtener la dirección del remitente"
@@ -1333,6 +1392,10 @@ msgstr "%d: no se puede obtener la dirección del remitente"
msgid "cannot parse date specification (%s)"
msgstr "no se puede decodificar la especificación de fecha (%s)"
+#: mail/alias.c:100
+msgid "alias hash table full"
+msgstr ""
+
#: mail/alias.c:195
#, c-format
msgid "\"%s\": not a group"
@@ -1347,12 +1410,18 @@ msgstr "No se puede determinar el nombre de usuario propio"
msgid "Cannot determine my email address: %s"
msgstr "no se puede determinar la dirección de correo electrónico propia: %s"
-#: mail/copy.c:69 mail/quit.c:113 mail/send.c:542
+#: mail/cd.c:40
+#, fuzzy, c-format
+msgid "cannot change to '%s': %s"
+msgstr "no se puede hacer stat a `%s': %s"
+
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
+#: mh/mh_init.c:369
#, c-format
-msgid "Cannot create mailbox %s"
-msgstr "No se puede crear el buzón %s"
+msgid "Cannot create mailbox %s: %s"
+msgstr "No se puede crear el buzón %s: %s"
-#: mail/copy.c:84 mail/quit.c:120 mail/send.c:535
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
#, c-format
msgid "Cannot append message: %s"
msgstr "No se puede agregar al mensaje: %s"
@@ -1372,7 +1441,7 @@ msgstr "| Tipo=%s\n"
msgid "| Encoding=%s\n"
msgstr "| Codificación=%s\n"
-#: mail/decode.c:267 mail/print.c:97
+#: mail/decode.c:267 mail/print.c:96
msgid ""
"\n"
"Interrupt"
@@ -1380,19 +1449,103 @@ msgstr ""
"\n"
"Interrumpir"
-#: mail/file.c:40
+#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#, c-format
+msgid "Cannot create header: %s"
+msgstr "no se puede crear el encabezado: %s"
+
+#: mail/escape.c:95 mail/escape.c:121
+#, c-format
+msgid "%d: not a header line"
+msgstr "%d: no es una línea de encabezado"
+
+#: mail/escape.c:142
+msgid "Edit again?"
+msgstr "¿Editar de nuevo?"
+
+#: mail/escape.c:157
+#, c-format
+msgid "(continue)\n"
+msgstr "(continúa)\n"
+
+#: mail/escape.c:167
+#, c-format
+msgid "%c%s requires an argument"
+msgstr "%c%s requiere de un argumento"
+
+#: mail/escape.c:200 mail/util.c:115
+#, c-format
+msgid "Unknown command: %s"
+msgstr "Orden desconocida: %s"
+
+#: mail/escape.c:205
+msgid "Command not allowed in an escape sequence\n"
+msgstr "No se permite una orden en una secuencia de escape\n"
+
+#: mail/escape.c:248 mail/escape.c:547 mail/escape.c:602 pop3d/popauth.c:284
+#: pop3d/popauth.c:355 pop3d/popauth.c:429
+#, c-format
+msgid "Cannot open %s: %s"
+msgstr "No se puede abrir %s: %s"
+
+#: mail/escape.c:252
+#, c-format
+msgid "Reading %s\n"
+msgstr "Leyendo %s\n"
+
+#: mail/escape.c:451
+#, c-format
+msgid "Interpolating: %d\n"
+msgstr "Interpolando: %d\n"
+
+#: mail/escape.c:519
+#, c-format
+msgid "Message contains:\n"
+msgstr "El mensaje contiene:\n"
+
+#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
+#: mail/escape.c:633
+msgid "pipe: no command specified"
+msgstr "pipe: no se especificó una orden"
+
+#: mail/escape.c:677
+#, c-format
+msgid "Cannot exec process `%s': %s"
+msgstr "no se puede ejecutar el proceso `%s': %s"
+
+#: mail/escape.c:710
+#, c-format
+msgid "Child terminated abnormally: %d"
+msgstr "El hijo terminó anormalmente: %d"
+
+#: mail/escape.c:717
+#, c-format
+msgid "Cannot stat output file: %s"
+msgstr "No se puede hacer stat sobre el fichero de salida: %s"
+
+#: mail/escape.c:727
+#, c-format
+msgid "no lines out\n"
+msgstr "no hay líneas de salida\n"
+
+#: mail/file.c:41
msgid "No previous file"
msgstr "No hay un fichero previo"
-#: mail/file.c:48
+#: mail/file.c:51
msgid "MBOX environment variable not set"
msgstr "La variable de ambiente MBOX no está establecida"
-#: mail/file.c:126
+#: mail/file.c:130
#, c-format
msgid "%s takes only one argument"
msgstr "%s sólo toma un argumento"
+#: mail/followup.c:44 mail/next.c:40 mail/next.c:63 mail/next.c:80
+#: mail/previous.c:49 mail/previous.c:66
+msgid "No applicable message"
+msgstr "No hay un mensaje aplicable"
+
#: mail/if.c:67
msgid "Internal error: condition stack underflow"
msgstr "Error interno: condición de desbordamiento por debajo de la pila"
@@ -1440,7 +1593,7 @@ msgstr "[dirección...]"
msgid "Return true if mail exists"
msgstr "Devuelve verdadero si hay correo"
-#: mail/mail.c:37 mailbox/mu_argp.c:73
+#: mail/mail.c:37 mailbox/mu_argp.c:74
msgid "URL"
msgstr "URL"
@@ -1521,11 +1674,6 @@ msgstr "Utilice \"quit\" para salir."
msgid "Cannot create mailbox for %s: %s"
msgstr "No se puede crear el buzón para %s: %s"
-#: mail/mail.c:421 mh/inc.c:209 mh/mh_init.c:369
-#, c-format
-msgid "Cannot create mailbox %s: %s"
-msgstr "No se puede crear el buzón %s: %s"
-
#: mail/mail.c:452
#, c-format
msgid "Cannot read mailbox %s: %s"
@@ -1541,17 +1689,19 @@ msgstr "%s: 0 mensajes\n"
msgid "No mail for %s\n"
msgstr "No hay correo para %s\n"
-#: mail/mail.c:537
+#: mail/mail.c:539
msgid ""
"GNU Mailutils -- a suite of utilities for electronic mail\n"
-"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software "
+"Foundation, Inc.\n"
"\n"
msgstr ""
"GNU Mailutils -- un conjunto de utilidades para el correo electrónico\n"
-"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software "
+"Foundation, Inc.\n"
"\n"
-#: mail/mail.c:541 mailbox/mu_argp.c:254 mh/mh_argp.c:188
+#: mail/mail.c:543 mailbox/mu_argp.c:255 mh/mh_argp.c:188
#, c-format
msgid ""
" GNU Mailutils is free software; you can redistribute it and/or modify\n"
@@ -1582,43 +1732,39 @@ msgstr ""
"\n"
" Debió recibir una copia de la Licencia Pública General GNU junto\n"
" con GNU Mailutils; si no es así, escriba a la Free Software\n"
-" Foundation, Inc., 51 Franklin Street, Quinto Piso, Boston, MA 02110-1301 USA\n"
+" Foundation, Inc., 51 Franklin Street, Quinto Piso, Boston, MA 02110-1301 "
+"USA\n"
"\n"
"\n"
-#: mail/mailline.c:402 mail/mailline.c:430 mail/mailline.c:477
-#: mail/mailline.c:513
+#: mail/mailline.c:694 mail/mailline.c:722 mail/mailline.c:769
+#: mail/mailline.c:805
msgid "Not enough memory to edit the line"
msgstr "No hay suficiente memoria para editar la línea"
-#: mail/msgset.y:163
+#: mail/msgset.y:164
msgid "unknown message type"
msgstr "tipo de mensaje desconocido"
-#: mail/msgset.y:248 mail/msgset.y:253
+#: mail/msgset.y:249 mail/msgset.y:254
#, c-format
msgid " near end"
msgstr " cerca del final"
-#: mail/msgset.y:255 mail/msgset.y:258
+#: mail/msgset.y:256 mail/msgset.y:259
#, c-format
msgid " near %s"
msgstr " cerca de %s"
-#: mail/msgset.y:473
+#: mail/msgset.y:474
msgid "range error"
msgstr "error de rango"
-#: mail/msgset.y:736 mail/util.c:213
+#: mail/msgset.y:737 mail/util.c:185
#, c-format
msgid "%lu: Inappropriate message (has been deleted)"
msgstr "%lu: Mensaje inapropiado (se ha borrado)"
-#: mail/next.c:40 mail/next.c:63 mail/next.c:80 mail/previous.c:46
-#: mail/previous.c:63
-msgid "No applicable message"
-msgstr "No hay un mensaje aplicable"
-
#: mail/quit.c:51
#, c-format
msgid "Held %d message in %s\n"
@@ -1626,7 +1772,7 @@ msgid_plural "Held %d messages in %s\n"
msgstr[0] "%d mensaje conservado en %s\n"
msgstr[1] "%d mensajes conservados en %s\n"
-#: mail/quit.c:141
+#: mail/quit.c:147
#, c-format
msgid "Saved %d message in %s\n"
msgid_plural "Saved %d messages in %s\n"
@@ -1660,11 +1806,6 @@ msgstr "No se puede crear la lista de encabezado: %s"
msgid "Invalid header: %s"
msgstr "Encabezado inválido: %s"
-#: mail/send.c:225 mail/var.c:59 mh/mhn.c:2023 mimeview/mimeview.c:217
-#, c-format
-msgid "Cannot create header: %s"
-msgstr "no se puede crear el encabezado: %s"
-
#: mail/send.c:308
msgid "Cannot open temporary file"
msgstr "No se puede abrir el fichero temporal"
@@ -1685,25 +1826,25 @@ msgstr "Utilice \".\" para terminar el mensaje."
msgid "Use \"~.\" to terminate letter."
msgstr "Utilice \"~.\" para terminar el mensaje."
-#: mail/send.c:392
+#: mail/send.c:391
#, c-format
msgid "Unknown escape %s"
msgstr "Escape %s desconocido"
-#: mail/send.c:395
+#: mail/send.c:394
msgid "Unfinished escape"
msgstr "Escape sin terminar"
-#: mail/send.c:399
+#: mail/send.c:398
msgid "Cannot parse escape sequence"
msgstr "No se puede decodificar la secuencia de escape"
-#: mail/send.c:424 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
#, c-format
msgid "Cannot open file %s: %s"
msgstr "No se puede abrir el fichero %s: %s"
-#: mail/send.c:485
+#: mail/send.c:484
msgid "Null message body; hope that's ok\n"
msgstr "Cuerpo del mensaje nulo; se espera que esté bien\n"
@@ -1760,159 +1901,91 @@ msgstr[1] " %d borrados"
msgid "unalias requires at least one argument"
msgstr "unalias requiere por lo menos un argumento"
-#: mail/util.c:157 mail/var.c:200
-#, c-format
-msgid "Unknown command: %s"
-msgstr "Orden desconocida: %s"
-
-#: mail/util.c:159
+#: mail/util.c:117
msgid "Invalid command"
msgstr "Orden inválida"
-#: mail/util.c:389
+#: mail/util.c:272
+#, c-format
+msgid "Unknown command: %s\n"
+msgstr "Orden desconocida: %s\n"
+
+#: mail/util.c:439
#, c-format
msgid "No value set for \"%s\""
msgstr "No se ha establecido un valor para \"%s\""
-#: mail/util.c:487
+#: mail/util.c:594
#, c-format
msgid "oops?"
msgstr "¿Ups?"
-#: mail/util.c:567
+#: mail/util.c:684
msgid "Incorrect value for decode-fallback"
msgstr "Valor incorrecto para respaldo-codificación"
-#: mail/util.c:625
+#: mail/util.c:735
msgid "Cannot get homedir"
msgstr "no se puede obtener el directorio inicial"
-#: mail/util.c:937
-#, c-format
-msgid "Cannot open save file %s: %s"
-msgstr "No se puede abrir el fichero para guardar %s: %s"
-
-#: mail/util.c:954
-msgid "Not enough memory for creating save file"
-msgstr "No hay suficiente memoria para crear el fichero para guardar"
+#: mail/util.c:1050
+#, fuzzy, c-format
+msgid "Cannot create output mailbox `%s': %s"
+msgstr "No se puede crear el buzón temporal %s: %s"
-#: mail/util.c:1039
-#, c-format
-msgid "Unknown command: %s\n"
-msgstr "Orden desconocida: %s\n"
+#: mail/util.c:1058
+#, fuzzy, c-format
+msgid "Cannot open output mailbox `%s': %s"
+msgstr "No se puede abrir el buzón %s: %s\n"
#: mail/util.c:1064
+#, fuzzy, c-format
+msgid "Cannot append message to `%s': %s"
+msgstr "No se puede agregar el mensaje %lu: %s"
+
+#: mail/util.c:1119
msgid "Cannot unencapsulate message/part"
msgstr "No se puede desencapsular el mensaje/parte"
-#: mail/util.c:1073
+#: mail/util.c:1128
#, c-format
msgid "No such (sub)part in the message: %d"
msgstr "No hay tal (sub)parte en el mensaje: %d"
-#: mail/util.c:1080
+#: mail/util.c:1135
#, c-format
msgid "Cannot get (sub)part from the message: %d"
msgstr "No se puede obtener la (sub)parte del mensaje: %d"
-#: mail/util.c:1204
+#: mail/util.c:1259
#, c-format
msgid "Cannot create temporary header: %s"
msgstr "No se puede crear el encabezado temporal: %s"
-#: mail/util.c:1245
+#: mail/util.c:1300
#, c-format
msgid "Cannot parse address `%s' (while expanding `%s'): %s"
msgstr "No se puede decodificar la dirección `%s' (al expandir `%s'): %s"
-#: mail/util.c:1248
+#: mail/util.c:1303
#, c-format
msgid "Cannot parse address `%s': %s"
msgstr "No se puede decodificar la dirección `%s': %s"
-#: mail/util.c:1301
+#: mail/util.c:1356
#, c-format
msgid "Cannot get message %lu: %s"
msgstr "No se puede obtener el mensaje %lu: %s"
-#: mail/util.c:1312
+#: mail/util.c:1367
#, c-format
msgid "%d: invalid message number"
msgstr "%d: número de mensaje inválido"
-#: mail/util.c:1319
+#: mail/util.c:1374
msgid "No applicable messages"
msgstr "No hay mensajes aplicables"
-#: mail/var.c:95 mail/var.c:121
-#, c-format
-msgid "%d: not a header line"
-msgstr "%d: no es una línea de encabezado"
-
-#: mail/var.c:142
-msgid "Edit again?"
-msgstr "¿Editar de nuevo?"
-
-#: mail/var.c:157
-#, c-format
-msgid "(continue)\n"
-msgstr "(continúa)\n"
-
-#: mail/var.c:167
-#, c-format
-msgid "%c%s requires an argument"
-msgstr "%c%s requiere de un argumento"
-
-#: mail/var.c:205
-msgid "Command not allowed in an escape sequence\n"
-msgstr "No se permite una orden en una secuencia de escape\n"
-
-#: mail/var.c:252 mail/var.c:551 mail/var.c:606 pop3d/popauth.c:285
-#: pop3d/popauth.c:356 pop3d/popauth.c:430
-#, c-format
-msgid "Cannot open %s: %s"
-msgstr "No se puede abrir %s: %s"
-
-#: mail/var.c:256
-#, c-format
-msgid "Reading %s\n"
-msgstr "Leyendo %s\n"
-
-#: mail/var.c:455
-#, c-format
-msgid "Interpolating: %d\n"
-msgstr "Interpolando: %d\n"
-
-#: mail/var.c:523
-#, c-format
-msgid "Message contains:\n"
-msgstr "El mensaje contiene:\n"
-
-#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
-#: mail/var.c:637
-msgid "pipe: no command specified"
-msgstr "pipe: no se especificó una orden"
-
-#: mail/var.c:681
-#, c-format
-msgid "Cannot exec process `%s': %s"
-msgstr "no se puede ejecutar el proceso `%s': %s"
-
-#: mail/var.c:714
-#, c-format
-msgid "Child terminated abnormally: %d"
-msgstr "El hijo terminó anormalmente: %d"
-
-#: mail/var.c:721
-#, c-format
-msgid "Cannot stat output file: %s"
-msgstr "No se puede hacer stat sobre el fichero de salida: %s"
-
-#: mail/var.c:731
-#, c-format
-msgid "no lines out\n"
-msgstr "no hay líneas de salida\n"
-
#: mail/z.c:65
msgid "Bad arguments for the scrolling command"
msgstr "Argumentos erróneos para la orden de desplazamiento"
@@ -1929,12 +2002,12 @@ msgstr "No se puede aplicar el argumento para z"
msgid "Bad number of pages"
msgstr "Número erróneo de páginas"
-#: mail/z.c:128
+#: mail/z.c:124
#, c-format
msgid "On first screenful of messages\n"
msgstr "En la primera pantalla de mensajes\n"
-#: mail/z.c:140 mail/z.c:151
+#: mail/z.c:132
#, c-format
msgid "On last screenful of messages\n"
msgstr "En la última pantalla de mensajes\n"
@@ -1973,7 +2046,7 @@ msgstr "No devuelve errores al entregar a varios destinatarios"
msgid "Return temporary failure if disk or mailbox quota is exceeded"
msgstr "Devuelve un fallo temporal si se excede la cuota de disco o del buzón"
-#: mail.local/main.c:79 mailbox/mu_argp.c:90
+#: mail.local/main.c:79 mailbox/mu_argp.c:91
msgid "EMAIL"
msgstr "CORREO"
@@ -1995,17 +2068,24 @@ msgstr "PATRÓN"
#: mail.local/main.c:91
msgid "Set name pattern for user-defined Sieve mail filters"
-msgstr "Establece el nombre del patrón para los filtros de correo Sieve definidos por el usuario"
+msgstr ""
+"Establece el nombre del patrón para los filtros de correo Sieve definidos "
+"por el usuario"
#: mail.local/main.c:93
-msgid "Identify messages by the value of this header when logging Sieve actions"
-msgstr "Identifica mensajes por el valor de este encabezado al registrar las acciones Sieve"
+msgid ""
+"Identify messages by the value of this header when logging Sieve actions"
+msgstr ""
+"Identifica mensajes por el valor de este encabezado al registrar las "
+"acciones Sieve"
#: mail.local/main.c:96
msgid "Set name pattern for user-defined Scheme mail filters"
-msgstr "Establece el nombre del patrón para los filtros de correo Scheme definidos por el usuario"
+msgstr ""
+"Establece el nombre del patrón para los filtros de correo Scheme definidos "
+"por el usuario"
-#: mail.local/main.c:98 mailbox/mu_argp.c:75 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
#: mimeview/mimeview.c:46
msgid "FLAGS"
msgstr "OPTS"
@@ -2062,81 +2142,82 @@ msgstr "falló mu_debug_set_print: %s\n"
msgid "Missing arguments. Try --help for more info."
msgstr "Faltan argumentos. Pruebe --help para más información."
-#: mail.local/main.c:423 mail.local/script.c:94
+#: mail.local/main.c:419 mail.local/script.c:94
#, c-format
msgid "Access to %s failed: %m"
msgstr "Falló el acceso a %s: %m"
-#: mail.local/main.c:431 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:375
#, c-format
msgid "Cannot initialize sieve machine: %s"
msgstr "No se puede inicializar el motor sieve: %s"
-#: mail.local/main.c:552
+#: mail.local/main.c:548
#, c-format
msgid "Unable to open temporary file: %s"
msgstr "No se puede abrir el fichero temporal: %s"
-#: mail.local/main.c:558
+#: mail.local/main.c:554
#, c-format
msgid "unable to open temporary file: %s"
msgstr "no se puede abrir el fichero temporal: %s"
-#: mail.local/main.c:589
+#: mail.local/main.c:585
msgid "Cannot determine sender address"
msgstr "No se puede determinar la dirección del remitente"
-#: mail.local/main.c:607 mail.local/main.c:624
+#: mail.local/main.c:603 mail.local/main.c:620
#, c-format
msgid "Error writing temporary file: %s"
msgstr "Error al escribir el fichero temporal: %s"
-#: mail.local/main.c:634
+#: mail.local/main.c:630
#, c-format
msgid "Error opening temporary file: %s"
msgstr "Error al abrir el fichero temporal: %s"
-#: mail.local/main.c:643
+#: mail.local/main.c:639
#, c-format
msgid "Error creating temporary message: %s"
msgstr "Error al crear el mensaje temporal: %s"
-#: mail.local/main.c:668
+#: mail.local/main.c:664
#, c-format
msgid "%s: no such user"
msgstr "%s: no existe ese usuario"
-#: mail.local/main.c:682
+#: mail.local/main.c:678
#, c-format
msgid "Cannot get input message stream: %s"
msgstr "No se puede obtener el flujo del mensaje de entrada: %s"
-#: mail.local/main.c:720
+#: mail.local/main.c:716
#, c-format
msgid "Cannot lock mailbox `%s': %s"
msgstr "No se puede bloquear el buzón '%s': %s"
-#: mail.local/main.c:750
+#: mail.local/main.c:746
#, c-format
msgid "%s: mailbox quota exceeded for this recipient"
msgstr "%s: se excedió la cuota del buzón para este destinatario"
-#: mail.local/main.c:761
+#: mail.local/main.c:757
#, c-format
msgid "Cannot get stream size (input message): %s"
msgstr "No se puede obtener el tamaño del flujo (mensaje de entrada): %s"
-#: mail.local/main.c:768
+#: mail.local/main.c:764
#, c-format
msgid "%s: message would exceed maximum mailbox size for this recipient"
-msgstr "%s: el mensaje excedería el tamaño máximo del buzón para este destinatario"
+msgstr ""
+"%s: el mensaje excedería el tamaño máximo del buzón para este destinatario"
-#: mail.local/main.c:821
+#: mail.local/main.c:817
#, c-format
msgid "Error writing to mailbox: %s. Mailbox NOT truncated: %s"
msgstr "Error al escribir al buzón: %s. NO se trunca el buzón: %s"
-#: mail.local/main.c:824
+#: mail.local/main.c:820
#, c-format
msgid "Error writing to mailbox: %s"
msgstr "Error al escribir al buzón: %s"
@@ -2164,7 +2245,7 @@ msgstr "No se puede obtener la cuota del buzón de SQL: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
-#: mail.remote/mail.remote.c:51
+#: mail.remote/mail.remote.c:52
msgid ""
"GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
" This is a simple drop-in replacement for sendmail to forward mail directly\n"
@@ -2189,7 +2270,8 @@ msgid ""
" mail.remote --mailer smtp://mail.example.com -t devnull@foo.bar\n"
msgstr ""
"GNU mail.remote -- interfaz seudo-sendmail para entrega de correo\n"
-" Este es un reemplazo simple de sendmail para reenviar el correo directamente\n"
+" Este es un reemplazo simple de sendmail para reenviar el correo "
+"directamente\n"
"a una pasarela SMTP.\n"
"Siempre se debe especificar su pasarela SMTP utilizando la opción --mailer\n"
"(el mejor lugar para hacerlo es en su fichero de configuración).\n"
@@ -2210,72 +2292,77 @@ msgstr ""
"\n"
" mail.remote --mailer smtp://mail.example.com -t devnull@foo.bar\n"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "ADDR"
msgstr "DIREC"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "Override the default from address"
msgstr "Sobrepone la dirección de por defecto"
-#: mail.remote/mail.remote.c:76
+#: mail.remote/mail.remote.c:77
msgid "Read message for recipients."
msgstr "Lee el mensaje por destinatarios."
-#: mail.remote/mail.remote.c:77
-msgid "Print envelope commands in the SMTP protocol transaction. If specified more than once, the data part of the protocol transaction will also be printed."
-msgstr "Muestra las órdenes de sobre en la transacción del protocolo SMTP. Si se especifica más de una vez, también se mostrará la parte de datos de la transacción del protocolo."
+#: mail.remote/mail.remote.c:78
+msgid ""
+"Print envelope commands in the SMTP protocol transaction. If specified more "
+"than once, the data part of the protocol transaction will also be printed."
+msgstr ""
+"Muestra las órdenes de sobre en la transacción del protocolo SMTP. Si se "
+"especifica más de una vez, también se mostrará la parte de datos de la "
+"transacción del protocolo."
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
msgid "OPT"
msgstr "OPC"
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
-#: mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:81
msgid "Ignored for sendmail compatibility"
msgstr "Se ignora por compatibilidad con sendmail"
-#: mail.remote/mail.remote.c:119
+#: mail.remote/mail.remote.c:120
msgid "[TO-ADDR]..."
msgstr "[DIREC-PARA]..."
-#: mail.remote/mail.remote.c:176
+#: mail.remote/mail.remote.c:173
#, c-format
msgid "Parsing from addresses failed: %s"
msgstr "Falló la decodificación de la dirección remitente: %s"
-#: mail.remote/mail.remote.c:186
+#: mail.remote/mail.remote.c:183
#, c-format
msgid "Parsing recipient addresses failed: %s"
msgstr "Falló la decodificación de las direcciones destinatarias: %s"
-#: mail.remote/mail.remote.c:194 mail.remote/mail.remote.c:206
-#: mail.remote/mail.remote.c:212
+#: mail.remote/mail.remote.c:191 mail.remote/mail.remote.c:203
+#: mail.remote/mail.remote.c:209
#, c-format
msgid "Failed: %s"
msgstr "Fallo: %s"
-#: mail.remote/mail.remote.c:200
+#: mail.remote/mail.remote.c:197
#, c-format
msgid "Opening stdin failed: %s"
msgstr "Fallo al abrir la entrada estándar: %s"
-#: mail.remote/mail.remote.c:220
+#: mail.remote/mail.remote.c:217
#, c-format
msgid "Creating mailer `%s' failed: %s"
msgstr "Falló al crear el programa de correo `%s': %s"
-#: mail.remote/mail.remote.c:247
+#: mail.remote/mail.remote.c:244
#, c-format
msgid "Opening mailer `%s' failed: %s"
msgstr "Falló al abrir el programa de correo `%s': %s"
-#: mail.remote/mail.remote.c:254
+#: mail.remote/mail.remote.c:251
#, c-format
msgid "Sending message failed: %s"
msgstr "Falló al enviar el mensaje: %s"
-#: mail.remote/mail.remote.c:260
+#: mail.remote/mail.remote.c:257
#, c-format
msgid "Closing mailer failed: %s"
msgstr "Falló al cerrar el programa de correo: %s"
@@ -2353,8 +2440,12 @@ msgid "Garbage in ARGP_HELP_FMT: %s"
msgstr "Basura en ARGP_HELP_FMT: %s"
#: mailbox/argp-help.c:1195
-msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
-msgstr "Los argumentos obligatorios u opcionales para las opciones largas también son obligatorios u opcionales para cualquier opción corta correspondiente."
+msgid ""
+"Mandatory or optional arguments to long options are also mandatory or "
+"optional for any corresponding short options."
+msgstr ""
+"Los argumentos obligatorios u opcionales para las opciones largas también "
+"son obligatorios u opcionales para cualquier opción corta correspondiente."
#: mailbox/argp-help.c:1582
msgid "Usage:"
@@ -2439,136 +2530,143 @@ msgstr "Error de iconv: %s"
msgid "Stream is closed"
msgstr "El flujo está cerrado"
-#: mailbox/message.c:1089
+#: mailbox/message.c:1092
#, c-format
msgid "mailbox_create_default (%s) failed: %s\n"
msgstr "falló mailbox_create_default (%s): %s\n"
-#: mailbox/message.c:1120
+#: mailbox/message.c:1123
#, c-format
msgid "mailbox_open (%s) failed: %s\n"
msgstr "falló mailbox_open (%s): %s\n"
-#: mailbox/message.c:1128
+#: mailbox/message.c:1131
#, c-format
msgid "mailbox_append_message (%s) failed: %s\n"
msgstr "falló mailbox_append_message (%s): %s\n"
-#: mailbox/message.c:1140
+#: mailbox/message.c:1143
#, c-format
msgid "mailbox_close (%s) failed: %s\n"
msgstr "falló mailbox_close (%s): %s\n"
-#: mailbox/mu_argp.c:59
+#: mailbox/mu_argp.c:60
msgid "Common options"
msgstr "Opciones comunes"
-#: mailbox/mu_argp.c:61
+#: mailbox/mu_argp.c:62
msgid "Show compilation options"
msgstr "Muestra las opciones de compilación"
-#: mailbox/mu_argp.c:67
+#: mailbox/mu_argp.c:68
msgid "Print license and exit"
msgstr "Muestra la licencia y termina"
-#: mailbox/mu_argp.c:74
+#: mailbox/mu_argp.c:75
msgid "Use specified URL as a mailspool directory"
msgstr "Usa el URL especificado como un directorio de cola de correo"
-#: mailbox/mu_argp.c:76
+#: mailbox/mu_argp.c:77
msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
-msgstr "Opciones por defecto de bloqueo (E=externa, R=reintentar, T=tiempo, P=pid)"
+msgstr ""
+"Opciones por defecto de bloqueo (E=externa, R=reintentar, T=tiempo, P=pid)"
-#: mailbox/mu_argp.c:77 mailbox/mu_argp.c:81 mh/send.c:67 pop3d/pop3d.c:77
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
msgid "SECONDS"
msgstr "SEGUNDOS"
-#: mailbox/mu_argp.c:78
+#: mailbox/mu_argp.c:79
msgid "Set timeout for acquiring the lockfile"
msgstr "Establece un tiempo de expiración para adquirir el fichero de bloqueo"
-#: mailbox/mu_argp.c:80
+#: mailbox/mu_argp.c:81
msgid "Set the maximum number of times to retry acquiring the lockfile"
-msgstr "Establece el número máximo de veces para reintentar adquirir el fichero de bloqueo"
+msgstr ""
+"Establece el número máximo de veces para reintentar adquirir el fichero de "
+"bloqueo"
-#: mailbox/mu_argp.c:82
+#: mailbox/mu_argp.c:83
msgid "Number of seconds after which the lock expires"
msgstr "Número de segundos para que expire el bloqueo"
-#: mailbox/mu_argp.c:83
+#: mailbox/mu_argp.c:84
msgid "PATH"
msgstr "RUTA"
-#: mailbox/mu_argp.c:84
+#: mailbox/mu_argp.c:85
msgid "Set full path to the external locker program"
msgstr "Establece la ruta completa al programa de bloqueo externo"
-#: mailbox/mu_argp.c:91
+#: mailbox/mu_argp.c:92
msgid "Set current user's email address (default is loginname@defaultdomain)"
-msgstr "Establece el correo electrónica del usuario actual (por defecto es nombreentrada@dominioporomision)"
+msgstr ""
+"Establece el correo electrónica del usuario actual (por defecto es "
+"nombreentrada@dominioporomision)"
-#: mailbox/mu_argp.c:92
+#: mailbox/mu_argp.c:93
msgid "DOMAIN"
msgstr "DOMINIO"
-#: mailbox/mu_argp.c:93
+#: mailbox/mu_argp.c:94
msgid "Set domain for unqualified user names (default is this host)"
-msgstr "Establece el dominio para los nombres de usuario no calificados (por defecto es este anfitrión)"
+msgstr ""
+"Establece el dominio para los nombres de usuario no calificados (por defecto "
+"es este anfitrión)"
-#: mailbox/mu_argp.c:99
+#: mailbox/mu_argp.c:100
msgid "MAILER"
msgstr "PROGCORREO"
-#: mailbox/mu_argp.c:100
+#: mailbox/mu_argp.c:101
msgid "Use specified URL as the default mailer"
msgstr "Usa el URL especificado como el programa de correo por defecto"
-#: mailbox/mu_argp.c:106
+#: mailbox/mu_argp.c:107
msgid "FACILITY"
msgstr "FACILIDAD"
-#: mailbox/mu_argp.c:107
+#: mailbox/mu_argp.c:108
msgid "Output logs to syslog FACILITY"
msgstr "Vacía los registros al syslog FACILIDAD"
-#: mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:116
msgid "Runs in daemon mode with a maximum of NUMBER children"
msgstr "Se ejecuta en modo demonio con un NÚMERO máximo de hijos"
-#: mailbox/mu_argp.c:117
+#: mailbox/mu_argp.c:118
msgid "Run in inetd mode"
msgstr "Se ejecuta en modo inetd"
-#: mailbox/mu_argp.c:118
+#: mailbox/mu_argp.c:119
msgid "PORT"
msgstr "PUERTO"
-#: mailbox/mu_argp.c:119
+#: mailbox/mu_argp.c:120
msgid "Listen on specified port number"
msgstr "Escucha en el número de puerto especificado"
-#: mailbox/mu_argp.c:121
+#: mailbox/mu_argp.c:122
msgid "Set idle timeout value to NUMBER seconds"
msgstr "Establece el tiempo de expiración por inactividad a NÚMERO segundos"
-#: mailbox/mu_argp.c:123
+#: mailbox/mu_argp.c:124
msgid "Output session transcript via syslog"
msgstr "Vacía la transcripción de la sesión a través de syslog"
-#: mailbox/mu_argp.c:125
+#: mailbox/mu_argp.c:126
msgid "Set PID file"
msgstr "Establece el fichero PID"
-#: mailbox/mu_argp.c:214
+#: mailbox/mu_argp.c:215
msgid "Daemon configuration options"
msgstr "Opciones de configuración del demonio"
-#: mailbox/mu_argp.c:249
+#: mailbox/mu_argp.c:250
#, c-format
msgid "Unknown facility `%s'\n"
msgstr "Facilidad `%s' desconocida\n"
-#: mailbox/mu_argp.c:387
+#: mailbox/mu_argp.c:390
#, c-format
msgid ""
"License for %s:\n"
@@ -2577,31 +2675,31 @@ msgstr ""
"Licencia para %s:\n"
"\n"
-#: mailbox/mu_argp.c:424
+#: mailbox/mu_argp.c:402
+#, fuzzy, c-format
+msgid "Cannot set mail directory name: %s"
+msgstr "No se puede crear el directorio %s: %s"
+
+#: mailbox/mu_argp.c:430
#, c-format
msgid "Invalid lock flag `%c'"
msgstr "Opción de bloqueo '%c' inválida"
-#: mailbox/mu_argp.c:464
+#: mailbox/mu_argp.c:470
#, c-format
msgid "Invalid email address `%s': %s"
msgstr "Dirección de correo electrónico '%s' inválida: %s"
-#: mailbox/mu_argp.c:472
+#: mailbox/mu_argp.c:478
#, c-format
msgid "Invalid email domain `%s': %s"
msgstr "Dominio de correo electrónico '%s' inválido: %s"
-#: mailbox/mu_argp.c:481
+#: mailbox/mu_argp.c:487
#, c-format
msgid "Invalid mailer URL `%s': %s"
msgstr "URL de programa de correo electrónico `%s' inválido: %s"
-#: mailbox/mu_argp.c:495
-#, c-format
-msgid "Badly formed mailspool path: %s"
-msgstr "Ruta de cola de correo malformada: %s"
-
#: mailbox/mu_argp.c:631 mailbox/mu_argp.c:670 mailbox/mu_argp.c:710
#: mailbox/mu_argp.c:753 mailbox/mu_argp.c:782
#, c-format
@@ -2611,11 +2709,15 @@ msgstr "%s: memoria insuficiente\n"
#: mailbox/mu_argp.c:892
#, c-format
msgid "INTERNAL ERROR: requested unknown argp capability %s (please report)"
-msgstr "ERROR INTERNO: capacidad solicitada %s de argp desconocida (reporte por favor)"
+msgstr ""
+"ERROR INTERNO: capacidad solicitada %s de argp desconocida (reporte por "
+"favor)"
#: mailbox/mu_argp.c:955
msgid "INTERNAL ERROR: cannot register argp capability auth (please report)"
-msgstr "ERROR INTERNO: no se puede registrar la capacidad auth de argp (reporte por favor)"
+msgstr ""
+"ERROR INTERNO: no se puede registrar la capacidad auth de argp (reporte por "
+"favor)"
#: mailbox/mu_auth.c:214 mailbox/mu_auth.c:216
msgid "MODLIST"
@@ -2629,199 +2731,212 @@ msgstr "Establece la lista de módulos a utilizar para la autenticación"
msgid "Set list of modules to be used for authorization"
msgstr "Establece la lista de módulos a utilizar para la autorización"
-#: mailbox/errors:18
+#: mailbox/errors:19
msgid "Operation failed"
msgstr "La operación falló"
-#: mailbox/errors:20
+#: mailbox/errors:21
msgid "No registered handler"
msgstr "No hay un manejador registrado"
-#: mailbox/errors:21
+#: mailbox/errors:22
msgid "Empty virtual function"
msgstr "Función virtual vacía"
-#: mailbox/errors:23
+#: mailbox/errors:24
msgid "Pointer to output null"
msgstr "Puntero a salida nula"
-#: mailbox/errors:24
+#: mailbox/errors:25
msgid "Pointer to output pointer null"
msgstr "Puntero a puntero de salida nulo"
-#: mailbox/errors:26
+#: mailbox/errors:27
msgid "Mailbox null"
msgstr "Buzón nulo"
-#: mailbox/errors:28
+#: mailbox/errors:29
msgid "Format of RFC822 object is bad"
msgstr "El formato del objeto RFC822 es erróneo"
-#: mailbox/errors:29
+#: mailbox/errors:30
msgid "Address contains no addr specs"
msgstr "La dirección no contiene ninguna especificación de dirección"
-#: mailbox/errors:31
+#: mailbox/errors:32
msgid "Locker null"
msgstr "Bloqueador nulo"
-#: mailbox/errors:32
+#: mailbox/errors:33
msgid "Conflict with previous locker"
msgstr "Conflicto con un bloqueador previo"
-#: mailbox/errors:33
+#: mailbox/errors:34
msgid "Lock file check failed"
msgstr "Falló la revisión del fichero de bloqueo"
-#: mailbox/errors:34
+#: mailbox/errors:35
msgid "File check failed"
msgstr "Falló la revisión del fichero"
-#: mailbox/errors:35
+#: mailbox/errors:36
msgid "Lock not held on file"
msgstr "No se conservó el bloqueo en el fichero"
-#: mailbox/errors:36
+#: mailbox/errors:37
msgid "Failed to exec external locker"
msgstr "Falló la ejecución del bloqueador externo"
-#: mailbox/errors:37
+#: mailbox/errors:38
msgid "External locker failed"
msgstr "Falló el bloqueador externo"
-#: mailbox/errors:38
+#: mailbox/errors:39
msgid "External locker killed"
msgstr "Murió el bloqueador externo"
-#: mailbox/errors:40
+#: mailbox/errors:41
msgid "No such user name"
msgstr "No hay tal nombre de usuario"
-#: mailbox/errors:42
+#: mailbox/errors:43
msgid "DNS name resolution failed"
msgstr "Falló la resolución de nombre DNS"
-#: mailbox/errors:43
+#: mailbox/errors:44
msgid "State busy must resume operation"
msgstr "El estado ocupado debe reiniciar la operación"
-#: mailbox/errors:44
+#: mailbox/errors:45
msgid "Not a valid mailer from address"
msgstr "No es una dirección de programa de correo de válida"
-#: mailbox/errors:45
+#: mailbox/errors:46
msgid "Not a valid mailer to address"
msgstr "No es una dirección de programa de corre para válida"
-#: mailbox/errors:46
+#: mailbox/errors:47
msgid "No receipt addresses found"
msgstr "No se encontraron dirección de receptores"
-#: mailbox/errors:47
+#: mailbox/errors:48
msgid "Malformed or unsupported mailer URL"
msgstr "URL de programa de correo malformado o sin soporte"
-#: mailbox/errors:48
+#: mailbox/errors:49
msgid "SMTP rcpt to command failed"
msgstr "Falló la orden SMTP rcpt to"
-#: mailbox/errors:49
+#: mailbox/errors:50
msgid "Tcp connections need a host"
msgstr "Las conexiones TCP necesitan un anfitrión"
-#: mailbox/errors:50
+#: mailbox/errors:51
msgid "Tcp connections need a postive port"
msgstr "Las conexiones TCP necesitan un puerto positivo"
-#: mailbox/errors:52
+#: mailbox/errors:53
msgid "Input string is not RFC 2047 encoded"
msgstr "La cadena de salida no está codificada según RFC 2047"
#: mailbox/errors:54
+msgid "Not a valid RFC 2047 encoding"
+msgstr ""
+
+#: mailbox/errors:56
msgid "User name is not supplied"
msgstr "No se proporcionó el nombre del usuario"
-#: mailbox/errors:55
+#: mailbox/errors:57
msgid "User password is not supplied"
msgstr "No se proporcionó la contraseña del usuario"
-#: mailbox/errors:57
+#: mailbox/errors:59
msgid "Unsafe file permissions. Set 0600"
msgstr "Permisos de fichero inseguros. Establezca a 0600"
-#: mailbox/errors:58
+#: mailbox/errors:60
msgid "Unsupported authentication scheme"
msgstr "Esquema de autenticación sin soporte"
-#: mailbox/errors:59
+#: mailbox/errors:61
msgid "Authentication failed"
msgstr "Falló la autenticación"
-#: mailbox/errors:61
+#: mailbox/errors:63
msgid "Cannot execute"
msgstr "No se puede ejecutar"
-#: mailbox/errors:62
+#: mailbox/errors:64
msgid "Process exited with a non-zero status"
msgstr "El proceso terminó con un estado diferente a cero"
-#: mailbox/errors:63
+#: mailbox/errors:65
msgid "Process exited on signal"
msgstr "El proceso terminó con la señal"
-#: mailbox/errors:64
+#: mailbox/errors:66
msgid "Unknown failure while executing subprocess"
msgstr "Fallo desconocido al ejecutar el subproceso"
-#: mailbox/errors:65
+#: mailbox/errors:67
msgid "Connection closed by remote host"
msgstr "Conexión cerrada por el anfitrión remoto"
-#: mailbox/errors:66
+#: mailbox/errors:68
msgid "Parse error"
msgstr "Error de decodificación"
-#: mailbox/errors:67
+#: mailbox/errors:69
msgid "Requested item not found"
msgstr "No se encontró el elemento requerido"
-#: mailbox/errors:68
+#: mailbox/errors:70
msgid "Not enough buffer space"
msgstr "No hay suficiente espacio de memoria temporal"
-#: mailbox/errors:70
+#: mailbox/errors:72
msgid "SQL error"
msgstr "Error de SQL"
-#: mailbox/errors:71
+#: mailbox/errors:73
msgid "Already connected to the database"
msgstr "Ya hay una conexión a la base de datos"
-#: mailbox/errors:72
+#: mailbox/errors:74
msgid "Not connected to the database"
msgstr "No hay conexión a la base de datos"
-#: mailbox/errors:73
+#: mailbox/errors:75
msgid "Result of the previous query is not released"
msgstr "No se liberó el resultado de la petición anterior"
-#: mailbox/errors:74
+#: mailbox/errors:76
msgid "No query was yet executed"
msgstr "Aún no se ejecutó ninguna petición"
-#: mailbox/errors:75
+#: mailbox/errors:77
msgid "Bad column address"
msgstr "Dirección errónea de columna"
-#: mailbox/errors:76
+#: mailbox/errors:78
msgid "No result from the previous query available"
msgstr "No está disponible el resultado de la petición anterior"
-#: mailbox/errors:77
+#: mailbox/errors:79
msgid "No such interface"
msgstr "No hay tal interfaz"
-#: mailbox/mutil.c:581
+#: mailbox/errors:81
+msgid "Badly formed file or directory name"
+msgstr ""
+
+#: mailbox/errors:82
+#, fuzzy
+msgid "Read error"
+msgstr "Error de expresión regular"
+
+#: mailbox/mutil.c:590
#, c-format
msgid "Cannot open temporary file: %s"
msgstr "No se puede abrir el fichero temporal: %s"
@@ -2832,7 +2947,7 @@ msgstr "No se puede abrir el fichero temporal: %s"
#.
#. msgstr "yYbB";
#.
-#: mailbox/mutil.c:1166
+#: mailbox/mutil.c:1175
msgid "yY"
msgstr "yYsS"
@@ -2842,7 +2957,7 @@ msgstr "yYsS"
#.
#. msgstr "nNeE";
#.
-#: mailbox/mutil.c:1175
+#: mailbox/mutil.c:1184
msgid "nN"
msgstr "nN"
@@ -2886,7 +3001,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH anno Las opciones marcadas con `*' aún no están implementadas.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH."
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH."
#: mh/anno.c:29
msgid "[msg [msg...]]"
@@ -2896,7 +3012,7 @@ msgstr "[msg [msg...]]"
#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
#: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
-#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:44
+#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
msgid "FOLDER"
msgstr "CARPETA"
@@ -2942,7 +3058,9 @@ msgstr "Nombre del componente: "
#. in this message
#: mh/fmtcheck.c:26
msgid "GNU MH fmtcheck Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH fmtcheck Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH fmtcheck Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
#: mh/scan.c:45
@@ -2977,13 +3095,15 @@ msgstr "Cadena de formato errónea"
#. in this message
#: mh/folder.c:39
msgid "GNU MH folder Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH folder Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH folder Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/folder.c:41
msgid "[action] [msg]"
msgstr "[acción] [msg]"
-#: mh/folder.c:44 pop3d/popauth.c:69
+#: mh/folder.c:44 pop3d/popauth.c:68
msgid "Actions are:"
msgstr "Las acciones son:"
@@ -2996,14 +3116,22 @@ msgid "List the contents of the folder stack"
msgstr "Enlista los contenidos de la pila de carpetas"
#: mh/folder.c:50
-msgid "Push the folder on the folder stack. If FOLDER is specified, it is pushed. Otherwise, if a folder is given in the command line (via + or --folder), it is pushed on stack. Otherwise, the current folder and the top of the folder stack are exchanged"
-msgstr "Agrega la carpeta a la pila de carpeta. Si se especifica la CARPETA, se agrega. De otra forma, si se da una carpeta en la línea de órdenes (a través de + ó --folder), se agrega a la pila. De otra forma, se intercambian la carpeta actual y la carpeta del tope de la pila"
+msgid ""
+"Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
+"Otherwise, if a folder is given in the command line (via + or --folder), it "
+"is pushed on stack. Otherwise, the current folder and the top of the folder "
+"stack are exchanged"
+msgstr ""
+"Agrega la carpeta a la pila de carpeta. Si se especifica la CARPETA, se "
+"agrega. De otra forma, si se da una carpeta en la línea de órdenes (a través "
+"de + ó --folder), se agrega a la pila. De otra forma, se intercambian la "
+"carpeta actual y la carpeta del tope de la pila"
#: mh/folder.c:55
msgid "Pop the folder off the folder stack"
msgstr "Saca la carpeta de la pila de carpetas"
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:81
+#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
msgid "Options are:"
msgstr "Las opciones son:"
@@ -3053,23 +3181,27 @@ msgstr " no tiene mensajes"
msgid "(others)"
msgstr "(otros)"
-#: mh/folder.c:449
+#: mh/folder.c:450
#, c-format
-msgid "Folder # of messages ( range ) cur msg (other files)\n"
-msgstr "Carpeta # de mensajes ( rango ) msg act (otros fich)\n"
+msgid ""
+"Folder # of messages ( range ) cur msg (other "
+"files)\n"
+msgstr ""
+"Carpeta # de mensajes ( rango ) msg act (otros "
+"fich)\n"
-#: mh/folder.c:455
+#: mh/folder.c:456
msgid "TOTAL"
msgstr "TOTAL"
-#: mh/folder.c:456
+#: mh/folder.c:457
#, c-format
msgid "%4lu message "
msgid_plural "%4lu messages "
msgstr[0] "%4lu mensaje "
msgstr[1] "%4lu mensajes "
-#: mh/folder.c:459
+#: mh/folder.c:460
#, c-format
msgid "in %4lu folder"
msgid_plural "in %4lu folders"
@@ -3084,7 +3216,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH forw Las opciones marcadas con `*' aún no están implementadas.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH."
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH."
#: mh/forw.c:34 mh/repl.c:37
msgid "* Add Replied: header to the message being replied to"
@@ -3153,7 +3286,9 @@ msgstr "* Establece el reemplazo para el programa whatnow"
#: mh/forw.c:69
msgid "* Ignore whatnowproc variable. Use standard `whatnow' shell instead"
-msgstr "* Ignora la variable whatnowproc. Utilice `whatnow' estándar de shell en su lugar"
+msgstr ""
+"* Ignora la variable whatnowproc. Utilice `whatnow' estándar de shell en su "
+"lugar"
#: mh/forw.c:71 mh/repl.c:70
msgid "Use draft file preserved after the last session"
@@ -3192,7 +3327,9 @@ msgstr "Final de los Mensajes reenviados"
#. in this message
#: mh/inc.c:26
msgid "GNU MH inc Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH inc Utilice la opción -help para obtener la lista de las opciones tradicionales de MH."
+msgstr ""
+"GNU MH inc Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH."
#: mh/inc.c:28 mh/rmf.c:37
msgid "[+folder]"
@@ -3253,8 +3390,11 @@ msgstr "%d: error al agregar el mensaje: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mh/install-mh.c:24
-msgid "GNU MH install-mh Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH install-mh Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgid ""
+"GNU MH install-mh Use -help to obtain the list of traditional MH options."
+msgstr ""
+"GNU MH install-mh Utilice la opción -help para obtener la lista de las "
+"opciones tradicionales de MH. "
#: mh/install-mh.c:30
msgid "Do not ask for anything"
@@ -3264,7 +3404,9 @@ msgstr "No preguntar por nada"
#. in this message
#: mh/mark.c:24
msgid "GNU MH mark Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mark Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH mark Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/mark.c:33
msgid "Specify sequence name to operate upon"
@@ -3449,12 +3591,12 @@ msgstr "Error de escritura en `%s': %s"
msgid "Cannot stat file %s: %s"
msgstr "No se puede hacer stat sobre el fichero %s: %s"
-#: mh/mh_init.c:585 mh/mhn.c:2231
+#: mh/mh_init.c:585 mh/mhn.c:2267
#, c-format
msgid "Cannot create input stream (file %s): %s"
msgstr "No se puede crear el flujo de entrada (fichero %s): %s"
-#: mh/mh_init.c:592 mh/mhn.c:2238
+#: mh/mh_init.c:592 mh/mhn.c:2274
#, c-format
msgid "Cannot open input stream (file %s): %s"
msgstr "no se puede abrir el flujo de entrada (fichero %s): %s"
@@ -3512,7 +3654,8 @@ msgid ""
"You already have file %s which is not a regular file or a symbolic link.\n"
"Please remove it and try again"
msgstr ""
-"Ya tiene el fichero %s el cual no es un fichero regular o un enlace simbólico.\n"
+"Ya tiene el fichero %s el cual no es un fichero regular o un enlace "
+"simbólico.\n"
"Por favor bórrelo e intente de nuevo"
#: mh/mh_list.c:139
@@ -3614,11 +3757,18 @@ msgstr "se dejó el borrador en \"%s\".\n"
#: mh/mh_whatnow.c:392
msgid "List the message being distributed/replied-to on the terminal."
-msgstr "Muestra la lista que se está distribuyendo/respondiendo a en la terminal."
+msgstr ""
+"Muestra la lista que se está distribuyendo/respondiendo a en la terminal."
#: mh/mh_whatnow.c:394
-msgid "Edit the message. If EDITOR is omitted use the one that was used on the preceeding round unless the profile entry \"LASTEDITOR-next\" names an alternate editor."
-msgstr "Edita el mensaje. Si se omite EDITOR se usa el que se utilizó en la sesión anterior, a menos que la entrada del perfil \"LASTEDITOR-next\" nombre un editor alternativo"
+msgid ""
+"Edit the message. If EDITOR is omitted use the one that was used on the "
+"preceeding round unless the profile entry \"LASTEDITOR-next\" names an "
+"alternate editor."
+msgstr ""
+"Edita el mensaje. Si se omite EDITOR se usa el que se utilizó en la sesión "
+"anterior, a menos que la entrada del perfil \"LASTEDITOR-next\" nombre un "
+"editor alternativo"
#: mh/mh_whatnow.c:398 mh/mh_whatnow.c:428 mh/mh_whatnow.c:518
msgid "List the draft on the terminal."
@@ -3629,20 +3779,30 @@ msgid "Send the message in the background."
msgstr "Envía el mensaje en el fondo."
#: mh/mh_whatnow.c:402
-msgid "Terminate the session. Preserve the draft, unless -delete flag is given."
-msgstr "Termina la sesión. Conserva el borrador, a menos que se de la opción -delete."
+msgid ""
+"Terminate the session. Preserve the draft, unless -delete flag is given."
+msgstr ""
+"Termina la sesión. Conserva el borrador, a menos que se de la opción -delete."
#: mh/mh_whatnow.c:404 mh/mh_whatnow.c:429
msgid "Refile the draft into the given FOLDER."
msgstr "Conserva el borrador en la CARPETA dada."
#: mh/mh_whatnow.c:406
-msgid "Send the message. The -watch flag causes the delivery process to be monitored. SWITCHES are passed to send program verbatim."
-msgstr "Envía el mensaje. La opción -watch causa que el proceso de entrega sea monitorizado. Las OPCIONES se pasan al programa de envío textualmente."
+msgid ""
+"Send the message. The -watch flag causes the delivery process to be "
+"monitored. SWITCHES are passed to send program verbatim."
+msgstr ""
+"Envía el mensaje. La opción -watch causa que el proceso de entrega sea "
+"monitorizado. Las OPCIONES se pasan al programa de envío textualmente."
#: mh/mh_whatnow.c:409
-msgid "List the addresses and verify that they are acceptable to the transport service."
-msgstr "Muestra las direcciones y verifica que sean aceptables para el servicio de transporte."
+msgid ""
+"List the addresses and verify that they are acceptable to the transport "
+"service."
+msgstr ""
+"Muestra las direcciones y verifica que sean aceptables para el servicio de "
+"transporte."
#: mh/mh_whatnow.c:425
msgid "Terminate the session. Preserve the draft."
@@ -3712,7 +3872,9 @@ msgstr "No hay destinatarios"
#. in this message
#: mh/mhl.c:28
msgid "GNU MH mhl Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mhl Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH mhl Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/mhl.c:30
msgid "[files]"
@@ -3775,7 +3937,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH mhn Las opciones marcadas con `*' aún no están implementadas.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH."
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH."
#: mh/mhn.c:40
msgid "Specify file to operate upon"
@@ -3925,12 +4088,12 @@ msgstr "guardando el mensaje %lu parte %s como el fichero %s\n"
msgid "File %s already exists. Rewrite"
msgstr "El fichero %s ya existe. Reescribir"
-#: mh/mhn.c:1680 mh/mhn.c:2497
+#: mh/mhn.c:1680 mh/mhn.c:2547
#, c-format
msgid "Cannot create output stream (file %s): %s"
msgstr "No se puede crear el flujo de salida (fichero %s): %s"
-#: mh/mhn.c:1688 mh/mhn.c:2505
+#: mh/mhn.c:1688 mh/mhn.c:2555
#, c-format
msgid "Cannot open output stream (file %s): %s"
msgstr "No se puede abrir el flujo de salida (fichero %s): %s"
@@ -3945,17 +4108,17 @@ msgstr "%s:%lu: falta %c"
msgid "%s:%lu: comment redefined"
msgstr "%s:%lu: comentario redefinido"
-#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2115
+#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2151
#, c-format
msgid "%s:%lu: syntax error"
msgstr "%s:%lu: error sintáctico"
-#: mh/mhn.c:1858 mh/mhn.c:2082
+#: mh/mhn.c:1858 mh/mhn.c:2118
#, c-format
msgid "%s:%lu: description redefined"
msgstr "%s:%lu: descripción redefinida"
-#: mh/mhn.c:1870 mh/mhn.c:2094
+#: mh/mhn.c:1870 mh/mhn.c:2130
#, c-format
msgid "%s:%lu: content id redefined"
msgstr "%s:%lu: id de contenido redefinido"
@@ -3965,27 +4128,27 @@ msgstr "%s:%lu: id de contenido redefinido"
msgid "%s:%lu: missing subtype"
msgstr "%s:%lu: falta el subtipo"
-#: mh/mhn.c:2129
+#: mh/mhn.c:2165
#, c-format
msgid "%s:%lu: no such message: %lu"
msgstr "%s:%lu: no existe ese mensaje: %lu"
-#: mh/mhn.c:2220
+#: mh/mhn.c:2256
#, c-format
msgid "%s:%lu: missing filename"
msgstr "%s:%lu: falta el nombre de fichero"
-#: mh/mhn.c:2276
+#: mh/mhn.c:2312
#, c-format
msgid "Cannot open filter stream: %s"
msgstr "No se puede abrir el filtro del flujo: %s"
-#: mh/mhn.c:2397
+#: mh/mhn.c:2445
#, c-format
msgid "%s:%lu: unmatched #end"
msgstr "%s:%lu: #end desemparejado"
-#: mh/mhn.c:2551 mh/mhn.c:2562
+#: mh/mhn.c:2601 mh/mhn.c:2612
msgid "extra arguments"
msgstr "argumentos extra"
@@ -3993,7 +4156,9 @@ msgstr "argumentos extra"
#. in this message
#: mh/mhpath.c:26
msgid "GNU MH mhpath Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH mhpath Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH mhpath Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
msgid "[+folder] [msgs]"
@@ -4007,7 +4172,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH pick Las opciones marcadas con `*' no se han implementado aún.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH. "
#: mh/pick.c:35
msgid "[messages]"
@@ -4026,8 +4192,19 @@ msgid "A pattern to look for"
msgstr "Un patrón a buscar"
#: mh/pick.c:49
-msgid "Flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias)."
-msgstr "Las opciones que controlan el tipo de las expresiones regulares. La CADENA debe consistir de una o más de las siguientes letras: B=básico E=extendido I=ignorar mayúsculas/minúsculas C=diferenciar mayúsculas/minúsculas. Por defecto es \"EI\". Las opciones permanecen hasta la siguente aparición de la opción --cflags. La opción debe estar justo antes de la opción --pattern ó --component (o sus sinónimos)."
+msgid ""
+"Flags controlling the type of regular expressions. STRING must consist of "
+"one or more of the following letters: B=basic, E=extended, I=ignore case, "
+"C=case sensitive. Default is \"EI\". The flags remain in effect until the "
+"next occurrence of --cflags option. The option must occur right before --"
+"pattern or --component option (or its alias)."
+msgstr ""
+"Las opciones que controlan el tipo de las expresiones regulares. La CADENA "
+"debe consistir de una o más de las siguientes letras: B=básico E=extendido "
+"I=ignorar mayúsculas/minúsculas C=diferenciar mayúsculas/minúsculas. Por "
+"defecto es \"EI\". Las opciones permanecen hasta la siguente aparición de la "
+"opción --cflags. La opción debe estar justo antes de la opción --pattern ó --"
+"component (o sus sinónimos)."
#: mh/pick.c:51
msgid "Same as --component cc --pattern STRING"
@@ -4055,7 +4232,8 @@ msgstr "Opciones de restricción de fecha:"
#: mh/pick.c:63
msgid "Search in the named date header field (default is `Date:')"
-msgstr "Busca en el campo de encabezado de fecha nombrado (por defecto es `Date:')"
+msgstr ""
+"Busca en el campo de encabezado de fecha nombrado (por defecto es `Date:')"
#: mh/pick.c:64 mh/pick.c:66
msgid "DATE"
@@ -4118,7 +4296,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH refile Las opciones marcadas con `*' no se han implementado aún.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH. "
#: mh/refile.c:34
msgid "messages folder [folder...]"
@@ -4137,8 +4316,12 @@ msgid "* Try to preserve message sequence numbers"
msgstr "* Intenta preservar la secuencia de números de mensajes"
#: mh/refile.c:48
-msgid "Specify source folder. FOLDER will become the current folder after the program exits"
-msgstr "Especifica la carpeta fuente. La CARPETA será la carpeta actual después de que el programa termine"
+msgid ""
+"Specify source folder. FOLDER will become the current folder after the "
+"program exits"
+msgstr ""
+"Especifica la carpeta fuente. La CARPETA será la carpeta actual después de "
+"que el programa termine"
#: mh/refile.c:50
msgid "Use FILE as the source message"
@@ -4173,7 +4356,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH repl Las opciones marcadas con `*' no se han implementado aún.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH. "
#: mh/repl.c:31
msgid "[+folder] [msg]"
@@ -4205,11 +4389,19 @@ msgstr "FILTRO-MHL"
#: mh/repl.c:57
msgid "Set the mhl filter to preprocess the body of the message being replied"
-msgstr "Establece el filtro mhl para preprocesar el cuerpo del mensaje que se está respondiendo"
+msgstr ""
+"Establece el filtro mhl para preprocesar el cuerpo del mensaje que se está "
+"respondiendo"
#: mh/repl.c:60
-msgid "Include a copy of the message being replied. The message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option"
-msgstr "Incluye una copia del mensaje que se está contestando. El mensaje se procesará usando el filtro por defecto \"mhl.reply\", o el filtro especificado por la opción --filter"
+msgid ""
+"Include a copy of the message being replied. The message will be processed "
+"using either the default filter \"mhl.reply\", or the filter specified by --"
+"filter option"
+msgstr ""
+"Incluye una copia del mensaje que se está contestando. El mensaje se "
+"procesará usando el filtro por defecto \"mhl.reply\", o el filtro "
+"especificado por la opción --filter"
#: mh/repl.c:64
msgid "Query for addresses to place in To: and Cc: lists"
@@ -4217,7 +4409,9 @@ msgstr "Pregunta por direcciones a colocar en las listas Para: y Cc:"
#: mh/repl.c:69
msgid "* Ignore whatnowproc variable. Use standard `whatnow' shell instead."
-msgstr "* Ignora la variable whatnowproc. Utilice `whatnow' estándar de shell en su lugar."
+msgstr ""
+"* Ignora la variable whatnowproc. Utilice `whatnow' estándar de shell en su "
+"lugar."
#: mh/repl.c:131
#, c-format
@@ -4231,7 +4425,7 @@ msgid_plural "Draft \"%s\" exists (%lu bytes).\n"
msgstr[0] "El borrador \"%s\" existe (%lu byte).\n"
msgstr[1] "El borrador \"%s\" existe (%lu bytes).\n"
-#: mh/repl.c:298 movemail/movemail.c:214
+#: mh/repl.c:298
#, c-format
msgid "Cannot read message %lu: %s"
msgstr "No se puede leer el mensaje %lu: %s"
@@ -4254,7 +4448,9 @@ msgstr "¡Sólo un mensaje a la vez!"
#. in this message
#: mh/rmf.c:35
msgid "GNU MH rmf Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH rmf Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH rmf Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/rmf.c:42
msgid "Specify the folder to delete"
@@ -4282,13 +4478,17 @@ msgstr "No se puede borrar %s: %s"
#. in this message
#: mh/rmm.c:26
msgid "GNU MH rmm Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH rmm Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH rmm Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mh/scan.c:33
msgid "GNU MH scan Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH scan Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH scan Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/scan.c:40
msgid "Specify folder to scan"
@@ -4328,7 +4528,8 @@ msgid ""
"Use -help to obtain the list of traditional MH options."
msgstr ""
"GNU MH send Las opciones marcadas con `*' aún no están implementadas.\n"
-"Utilice la opción -help para obtener la lista de las opciones tradicionales de MH."
+"Utilice la opción -help para obtener la lista de las opciones tradicionales "
+"de MH."
#: mh/send.c:33
msgid "file [file...]"
@@ -4344,7 +4545,8 @@ msgstr "Utiliza el borrador preparado"
#: mh/send.c:45 mh/whom.c:37
msgid "Treat the arguments as a list of messages from the draftfolder"
-msgstr "Trata los argumentos como una lista de mensajes de la carpeta de borradores"
+msgstr ""
+"Trata los argumentos como una lista de mensajes de la carpeta de borradores"
#: mh/send.c:49
msgid "* Use filter FILE to preprocess the body of the message"
@@ -4360,8 +4562,12 @@ msgid "* Reformat To: and Cc: addresses"
msgstr "* Reformatea las direcciones To: y Cc:"
#: mh/send.c:56
-msgid "* In case of failure forward the draft along with the failure notice to the sender"
-msgstr "* En caso de fallo reenvía el borrador junto con la notificación de fallo al remitente"
+msgid ""
+"* In case of failure forward the draft along with the failure notice to the "
+"sender"
+msgstr ""
+"* En caso de fallo reenvía el borrador junto con la notificación de fallo al "
+"remitente"
#: mh/send.c:59
msgid "* Use MIME encapsulation"
@@ -4377,8 +4583,12 @@ msgstr "Ejecuta en el fondo."
# continuar aqui
#: mh/send.c:68
-msgid "* Split the draft into several partial messages and send them with SECONDS interval"
-msgstr "* Divide el borrador en varios mensajes parciales y los envía en intervalos de SEGUNDOS"
+msgid ""
+"* Split the draft into several partial messages and send them with SECONDS "
+"interval"
+msgstr ""
+"* Divide el borrador en varios mensajes parciales y los envía en intervalos "
+"de SEGUNDOS"
#: mh/send.c:70
msgid "Print the transcript of interactions with the transport system"
@@ -4390,9 +4600,10 @@ msgstr "Monitoriza la entrega de correo"
#: mh/send.c:76
msgid "* Make header fields no longer than NUMBER columns"
-msgstr "* Hace que los campos de encabezados no sean más largos que NÚMERO columnas"
+msgstr ""
+"* Hace que los campos de encabezados no sean más largos que NÚMERO columnas"
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
msgid "Invalid number"
msgstr "Número inválido"
@@ -4447,7 +4658,7 @@ msgstr "Destruyendo el programa de correo"
msgid "Cannot switch to background: %s"
msgstr "No se puede cambiar a trabajar en el fondo: %s"
-#: mh/send.c:559
+#: mh/send.c:560
#, c-format
msgid "cannot stat %s: %s"
msgstr "no se puede hacer stat a %s: %s"
@@ -4464,7 +4675,9 @@ msgstr "Establece el prompt"
#. in this message
#: mh/whom.c:24
msgid "GNU MH whom Use -help to obtain the list of traditional MH options."
-msgstr "GNU MH whom Utilice la opción -help para obtener la lista de las opciones tradicionales de MH. "
+msgstr ""
+"GNU MH whom Utilice la opción -help para obtener la lista de las opciones "
+"tradicionales de MH. "
#: mh/whom.c:41
msgid "Check if addresses are deliverable"
@@ -4524,9 +4737,14 @@ msgstr "falló authority_set_ticket"
msgid "Cannot open"
msgstr "No se puede abrir"
+#: movemail/movemail.c:214
+#, fuzzy, c-format
+msgid "Cannot read message %lu: %s\n"
+msgstr "No se puede leer el mensaje %lu: %s"
+
#: movemail/movemail.c:220
-#, c-format
-msgid "Cannot append message %lu: %s"
+#, fuzzy, c-format
+msgid "Cannot append message %lu: %s\n"
msgstr "No se puede agregar el mensaje %lu: %s"
#: movemail/movemail.c:251
@@ -4614,60 +4832,60 @@ msgstr "fin-de-fichero inesperado en la entrada"
msgid "Locking mailbox `%s' failed: %s"
msgstr "Falló al bloquear el buzón `%s': %s"
-#: pop3d/pop3d.c:65
+#: pop3d/pop3d.c:64
msgid "GNU pop3d -- the POP3 daemon"
msgstr "GNU pop3d -- el demonio POP3"
-#: pop3d/pop3d.c:75
+#: pop3d/pop3d.c:74
msgid "Undelete all messages on startup"
msgstr "Recupera todos los mensajes borrados al inicio"
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:77
msgid "Allowed delay between the two successive logins"
msgstr "Pausa permitida entre dos accesos sucesivos"
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:78
msgid "FILENAME"
msgstr "NOMBREFICHERO"
-#: pop3d/pop3d.c:80
+#: pop3d/pop3d.c:79
msgid "Name of login statistics file"
msgstr "Nombre del fichero de estadísticas de accesos"
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:81
msgid "DAYS"
msgstr "DÍAS"
-#: pop3d/pop3d.c:83
+#: pop3d/pop3d.c:82
msgid "Expire read messages after the given number of days"
msgstr "Expira los mensajes leídos después del número de días dado"
-#: pop3d/pop3d.c:85
+#: pop3d/pop3d.c:84
msgid "Delete expired messages upon closing the mailbox"
msgstr "Borra mensajes expirados al cerrar el buzón"
-#: pop3d/pop3d.c:88
+#: pop3d/pop3d.c:87
msgid "Always require STLS before entering authentication phase"
msgstr "Siempre requiere STLS antes de entrar a la fase de autenticación"
-#: pop3d/pop3d.c:278
+#: pop3d/pop3d.c:277
msgid "Failed to become a daemon:"
msgstr "Falló al convertirse en demonio:"
-#: pop3d/pop3d.c:314
+#: pop3d/pop3d.c:313
#, c-format
msgid "connect from %s"
msgstr "conectado desde %s"
-#: pop3d/pop3d.c:438
+#: pop3d/pop3d.c:437
msgid "Session terminated"
msgstr "Sesión terminada"
-#: pop3d/pop3d.c:524
+#: pop3d/pop3d.c:523
msgid "GNU pop3d started"
msgstr "GNU pop3d iniciado"
-#: pop3d/pop3d.c:531
+#: pop3d/pop3d.c:530
#, c-format
msgid "too many children (%lu)"
msgstr "demasiados hijos (%lu)"
@@ -4676,27 +4894,27 @@ msgstr "demasiados hijos (%lu)"
msgid "GNU popauth -- manage pop3 authentication database"
msgstr "GNU popauth -- administra la base de datos de autenticación pop3"
-#: pop3d/popauth.c:70
+#: pop3d/popauth.c:69
msgid "Add user"
msgstr "Agrega usuario"
-#: pop3d/popauth.c:71
+#: pop3d/popauth.c:70
msgid "Modify user's record (change password)"
msgstr "Modifica registro del usuario (cambiar contraseña)"
-#: pop3d/popauth.c:72
+#: pop3d/popauth.c:71
msgid "Delete user's record"
msgstr "Borra registro del usuario"
-#: pop3d/popauth.c:73
+#: pop3d/popauth.c:72
msgid "List the contents of DBM file"
msgstr "Muestra el contenido del fichero DBM"
-#: pop3d/popauth.c:74
+#: pop3d/popauth.c:73
msgid "Create the DBM from a plaintext file"
msgstr "Crea el DBM a partir de un fichero de texto"
-#: pop3d/popauth.c:77
+#: pop3d/popauth.c:76
msgid ""
"Default action is:\n"
" For the file owner: --list\n"
@@ -4706,119 +4924,119 @@ msgstr ""
" Para el propietario del fichero: --list\n"
" Para un usuario: --modify --username <nombreusuario>\n"
-#: pop3d/popauth.c:82
+#: pop3d/popauth.c:81
msgid "Read input from FILE (default stdin)"
msgstr "Lee la entrada del FICHERO (entrada estándar por defecto)"
-#: pop3d/popauth.c:83
+#: pop3d/popauth.c:82
msgid "Direct output to file"
msgstr "Dirige la salida a un fichero"
-#: pop3d/popauth.c:84
+#: pop3d/popauth.c:83
msgid "Specify user's password"
msgstr "Especifica la contraseña del usuario"
-#: pop3d/popauth.c:85
+#: pop3d/popauth.c:84
msgid "USERNAME"
msgstr "NOMBREUSUARIO"
-#: pop3d/popauth.c:85
+#: pop3d/popauth.c:84
msgid "Specify user name"
msgstr "Especifica el nombre del usuario"
-#: pop3d/popauth.c:86
+#: pop3d/popauth.c:85
msgid "PERM"
msgstr "PERM"
-#: pop3d/popauth.c:86
+#: pop3d/popauth.c:85
msgid "Force given permissions on the database"
msgstr "Fuerza los permisos dados en la base de datos"
-#: pop3d/popauth.c:116
+#: pop3d/popauth.c:115
#, c-format
msgid "Invalid octal number: %s"
msgstr "Número octal inválido: %s"
-#: pop3d/popauth.c:216
+#: pop3d/popauth.c:215
msgid "You may not specify more than one `-aldp' option"
msgstr "No puede especificar más de una opción `-aldp'"
-#: pop3d/popauth.c:238 pop3d/popauth.c:294 pop3d/popauth.c:370
+#: pop3d/popauth.c:237 pop3d/popauth.c:293 pop3d/popauth.c:369
#, c-format
msgid "Cannot create %s: %s"
msgstr "No se puede crear %s: %s"
-#: pop3d/popauth.c:258
+#: pop3d/popauth.c:257
msgid "Only the file owner can use --username"
msgstr "Sólo el propietario del fichero puede utilizar --username"
-#: pop3d/popauth.c:264
+#: pop3d/popauth.c:263
msgid "Operation not allowed"
msgstr "Operación no permitida"
-#: pop3d/popauth.c:400
+#: pop3d/popauth.c:399
#, c-format
msgid "%s:%d: malformed line"
msgstr "%s:%d: línea malformada"
-#: pop3d/popauth.c:413
+#: pop3d/popauth.c:412
#, c-format
msgid "%s:%d: cannot store datum"
msgstr "%s:%d: no se puede almacenar el dato"
-#: pop3d/popauth.c:446
+#: pop3d/popauth.c:445
msgid "Password:"
msgstr "Contraseña:"
#. TRANSLATORS: Please try to format this string so that it has
#. the same length as the translation of 'Password:' above
-#: pop3d/popauth.c:452
+#: pop3d/popauth.c:451
msgid "Confirm :"
msgstr "Confirmar :"
-#: pop3d/popauth.c:455
+#: pop3d/popauth.c:454
msgid "Passwords differ. Please retry."
msgstr "Las contraseñas difieren. Por favor reintente."
-#: pop3d/popauth.c:470
+#: pop3d/popauth.c:469
msgid "Missing username to add"
msgstr "Falta el nombre de usuario para agregar"
-#: pop3d/popauth.c:488
+#: pop3d/popauth.c:487
msgid "Cannot store datum"
msgstr "No se pueden almacenar el dato"
-#: pop3d/popauth.c:503
+#: pop3d/popauth.c:502
msgid "Missing username to delete"
msgstr "Falta el nombre de usuario para borrar"
-#: pop3d/popauth.c:515
+#: pop3d/popauth.c:514
#, c-format
msgid "Cannot remove record for %s"
msgstr "No se puede eliminar el registro para %s"
-#: pop3d/popauth.c:535
+#: pop3d/popauth.c:534
msgid "Missing username"
msgstr "Falta el nombre de usuario"
-#: pop3d/popauth.c:557
+#: pop3d/popauth.c:556
msgid "Old Password:"
msgstr "Contraseña anterior:"
-#: pop3d/popauth.c:562
+#: pop3d/popauth.c:561
msgid "Sorry"
msgstr "Perdón"
-#: pop3d/popauth.c:573
+#: pop3d/popauth.c:572
msgid "Cannot replace datum"
msgstr "No se puede reemplazar el dato"
-#: pop3d/popauth.c:592
+#: pop3d/popauth.c:591
#, c-format
msgid "Database format: %s\n"
msgstr "Formato de la base de datos: %s\n"
-#: pop3d/popauth.c:593
+#: pop3d/popauth.c:592
#, c-format
msgid "Database location: %s\n"
msgstr "Ubicación de la base de datos: %s\n"
@@ -4863,49 +5081,51 @@ msgstr[1] "El usuario `%s' se conectó con el buzón `%s' (%d mensajes)"
msgid "GNU readmsg -- print messages"
msgstr "GNU readmsg -- muestra mensajes"
-#: readmsg/readmsg.c:40
+#: readmsg/readmsg.c:39
msgid "Display debugging information"
msgstr "Muestra la información de depuración"
-#: readmsg/readmsg.c:41
+#: readmsg/readmsg.c:40
msgid "Display entire header"
msgstr "Muestra el encabezado completo"
-#: readmsg/readmsg.c:42
+#: readmsg/readmsg.c:41
msgid "LIST"
msgstr "LISTA"
-#: readmsg/readmsg.c:43
+#: readmsg/readmsg.c:42
msgid "List of header names separated by whitespace or commas"
-msgstr "Lista de nombres de encabezados separados por espacios en blanco o comas"
+msgstr ""
+"Lista de nombres de encabezados separados por espacios en blanco o comas"
-#: readmsg/readmsg.c:44
+#: readmsg/readmsg.c:43
msgid "Folder to use"
msgstr "Carpeta a utilizar"
-#: readmsg/readmsg.c:45
+#: readmsg/readmsg.c:44
msgid "Exclude all headers"
msgstr "Excluye todos los encabezados"
-#: readmsg/readmsg.c:46
+#: readmsg/readmsg.c:45
msgid "Output formfeeds between messages"
msgstr "Caracteres 'formfeed' de salida entre mensajes"
-#: readmsg/readmsg.c:48
+#: readmsg/readmsg.c:47
msgid "Print all messages matching pattern, not just the first"
-msgstr "Muestra todos los mensajes que coincidan con el patrón, no sólo el primero"
+msgstr ""
+"Muestra todos los mensajes que coincidan con el patrón, no sólo el primero"
-#: readmsg/readmsg.c:250
+#: readmsg/readmsg.c:249
#, c-format
msgid "Could not create mailbox `%s': %s\n"
msgstr "No se puede crear el buzón `%s': %s\n"
-#: readmsg/readmsg.c:254
+#: readmsg/readmsg.c:253
#, c-format
msgid "Could not create default mailbox: %s\n"
msgstr "No se puede crear el buzón por defecto: %s\n"
-#: readmsg/readmsg.c:273
+#: readmsg/readmsg.c:272
#, c-format
msgid "Could not open mailbox `%s': %s\n"
msgstr "No se puede abrir el buzón `%s': %s\n"
@@ -4944,7 +5164,8 @@ msgstr "Compilar el guión y terminar"
#: sieve/sieve.c:78
msgid "Compile script, dump disassembled sieve code to terminal and exit"
-msgstr "Compilar el guión, volcar el código sieve desensamblado a la terminal y salir"
+msgstr ""
+"Compilar el guión, volcar el código sieve desensamblado a la terminal y salir"
#: sieve/sieve.c:80
msgid "MBOX"
@@ -4976,7 +5197,8 @@ msgstr "Registrar todas las acciones"
#: sieve/sieve.c:93
msgid "Print source location along with action logs (default)"
-msgstr "Mostrar la ubicación fuente junto con los registros de acciones (por defecto)"
+msgstr ""
+"Mostrar la ubicación fuente junto con los registros de acciones (por defecto)"
#: sieve/sieve.c:96
msgid "Override user email address"
@@ -5081,8 +5303,12 @@ msgstr "Falló al vaciar el buzón por defecto: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
#: mimeview/mimeview.c:31
-msgid "GNU mimeview -- display files, using mailcap mechanism. Default mime.types file is "
-msgstr "GNU mimeview -- muestra ficheros, usando el mecanismo mailcap. El fichero mime.types por defecto es "
+msgid ""
+"GNU mimeview -- display files, using mailcap mechanism. Default mime.types "
+"file is "
+msgstr ""
+"GNU mimeview -- muestra ficheros, usando el mecanismo mailcap. El fichero "
+"mime.types por defecto es "
#: mimeview/mimeview.c:33
msgid ""
@@ -5105,8 +5331,14 @@ msgid "TYPE-LIST"
msgstr "LISTA-TIPOS"
#: mimeview/mimeview.c:42
-msgid "Do not ask for confirmation before displaying files. If TYPE-LIST is given, do not ask for confirmation before displaying such files whose MIME type matches one of the patterns from TYPE-LIST"
-msgstr "No solicitar confirmación antes de mostrar ficheros. Si se da la LISTA-TIPOS, no solicitar confirmación antes de mostrar aquellos archivos cuyo tipo MIME coincida con uno de los patrones de LISTA-TIPOS"
+msgid ""
+"Do not ask for confirmation before displaying files. If TYPE-LIST is given, "
+"do not ask for confirmation before displaying such files whose MIME type "
+"matches one of the patterns from TYPE-LIST"
+msgstr ""
+"No solicitar confirmación antes de mostrar ficheros. Si se da la LISTA-"
+"TIPOS, no solicitar confirmación antes de mostrar aquellos archivos cuyo "
+"tipo MIME coincida con uno de los patrones de LISTA-TIPOS"
#: mimeview/mimeview.c:44
msgid "Disable interactive mode"
@@ -5152,6 +5384,18 @@ msgstr "%s: función desconocida"
msgid "argument %d has wrong type in call to `%s'"
msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
+#~ msgid "Cannot create mailbox %s"
+#~ msgstr "No se puede crear el buzón %s"
+
+#~ msgid "Cannot open save file %s: %s"
+#~ msgstr "No se puede abrir el fichero para guardar %s: %s"
+
+#~ msgid "Not enough memory for creating save file"
+#~ msgstr "No hay suficiente memoria para crear el fichero para guardar"
+
+#~ msgid "Badly formed mailspool path: %s"
+#~ msgstr "Ruta de cola de correo malformada: %s"
+
#~ msgid "out of memory"
#~ msgstr "memoria agotada"
@@ -5265,7 +5509,9 @@ msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
#~ msgstr "no se puede abrir %s: %s\n"
#~ msgid "Set name pattern for user-defined mail filters"
-#~ msgstr "Establece el nombre del patrón para los filtros de correo definidos por el usuario"
+#~ msgstr ""
+#~ "Establece el nombre del patrón para los filtros de correo definidos por "
+#~ "el usuario"
#~ msgid "temporary file write error: %s"
#~ msgstr "error al escribir al fichero temporal: %s"
@@ -5342,8 +5588,12 @@ msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
#~ msgstr[0] "la petición devolvió %d campo: %s"
#~ msgstr[1] "la petición devolvió %d campos: %s"
-#~ msgid "Maximum retention period for messages in the maildrop, default -1 means NEVER"
-#~ msgstr "Periodo máximo de retención para los mensajes en el buzón de entrada, el valor por defecto -1 significa NUNCA"
+#~ msgid ""
+#~ "Maximum retention period for messages in the maildrop, default -1 means "
+#~ "NEVER"
+#~ msgstr ""
+#~ "Periodo máximo de retención para los mensajes en el buzón de entrada, el "
+#~ "valor por defecto -1 significa NUNCA"
#~ msgid "%s %s failed: %s\n"
#~ msgstr "Falló el %s de %s: %s\n"
@@ -5356,7 +5606,9 @@ msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
# No hay opción de traducción para [n]ew, [r]ead, y [u]nread. cfuga
#~ msgid "Select message with the specific attribute: [n]ew, [r]ead, [u]nread."
-#~ msgstr "Selecciona los mensajes con los atributos específicos: [n]uevo, [r]evisado, [u](sin revisar)."
+#~ msgstr ""
+#~ "Selecciona los mensajes con los atributos específicos: [n]uevo, [r]"
+#~ "evisado, [u](sin revisar)."
#~ msgid "You have %d message.\n"
#~ msgid_plural "You have %d messages.\n"
@@ -5384,39 +5636,48 @@ msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
#~ "with a line such as:\n"
#~ " :mailer --mailer=smtp://mail.example.com\n"
#~ "\n"
-#~ "If not explicitly specified, the default from address is derived from the\n"
+#~ "If not explicitly specified, the default from address is derived from "
+#~ "the\n"
#~ "\"From:\" field in the message, if present, or the default user's email\n"
#~ "address if not present.\n"
#~ "\n"
-#~ "If not explicitly specified, the default to addresses are derived from the\n"
+#~ "If not explicitly specified, the default to addresses are derived from "
+#~ "the\n"
#~ "\"To:\", \"Cc:\", and \"Bcc:\" fields in the message.\n"
#~ "\n"
#~ "If --debug is specified, the envelope commands in the SMTP protocol\n"
#~ "transaction will be printed to stdout. If specified more than once,\n"
-#~ "the data part of the protocol transaction will also be printed to stdout.\n"
+#~ "the data part of the protocol transaction will also be printed to "
+#~ "stdout.\n"
#~ msgstr ""
#~ "GNU mail.remote -- interfaz de pseudo-sendmail para entrega de correo\n"
#~ " \n"
#~ "Se lee un mensaje con formato RFC2822 de entrada estándar y se entrega\n"
-#~ "utilizando el programa de correo. Esta utilidad se puede utilizar como un\n"
-#~ "reemplazo automático para /bin/sendmail para reenviar el correo directamente\n"
+#~ "utilizando el programa de correo. Esta utilidad se puede utilizar como "
+#~ "un\n"
+#~ "reemplazo automático para /bin/sendmail para reenviar el correo "
+#~ "directamente\n"
#~ "a una compuerta SMTP.\n"
#~ "\n"
#~ "El programa de correo por defecto es \"sendmail:\", el cual no está\n"
#~ "soportado por esta utilidad (está pensada para usarse cuando no se tiene\n"
#~ "un sendmail funcional). Debe especificar su compuerta SMTP especificando\n"
-#~ "un --mailer con algo como \"smtp://correo.ejemplo.com\". Esto normalmente\n"
+#~ "un --mailer con algo como \"smtp://correo.ejemplo.com\". Esto "
+#~ "normalmente\n"
#~ "se agrega al fichero de configuración específico del usuario,\n"
#~ " ~/.mailutils/mailutils,\n"
#~ "o al fichero de configuración global,\n"
#~ " /etc/mailutils.rc,\n"
#~ "con una línea como: :mailer --mailer=smtp://correo.ejemplo.com\n"
#~ "\n"
-#~ "Si no se especifica explícitamente, la dirección de por defecto se deriva\n"
-#~ "del campo \"From:\" del mensaje, si está presente, o la dirección de correo\n"
+#~ "Si no se especifica explícitamente, la dirección de por defecto se "
+#~ "deriva\n"
+#~ "del campo \"From:\" del mensaje, si está presente, o la dirección de "
+#~ "correo\n"
#~ "electrónico por defecto del usuario si no está presente.\n"
#~ "\n"
-#~ "Si no se especifica explícitamente, la dirección para por defecto se deriva\n"
+#~ "Si no se especifica explícitamente, la dirección para por defecto se "
+#~ "deriva\n"
#~ "de los campos \"To:\", \"Cc:\", y \"Bcc:\" del mensaje.\n"
#~ "\n"
#~ "Si se especifica --debug, los comandos del sobre de la transacción\n"
@@ -5430,21 +5691,39 @@ msgstr "el argumentos %d es de tipo incorrecto en la llamada a `%s'"
#~ msgid "could not create mailbox: %s"
#~ msgstr "no se puede crear el buzón: %s"
-#~ msgid "Note: Argument to --file (-f) option is optional. If it is present, it must follow the short option immediately, without any intervening whitespace. If it is used with the long option, it must be separated from it by an equal sign, with no intervening whitespace."
-#~ msgstr "Nota: El argumento para --file (-f) es opcional. Si está presente, debe estar a continuación de la opción corta inmediatamente, sin ningún espacio intermedio. Si se utiliza con la opción larga, debe estar separado de ella por un signoigual, sin ningún espacio intermedio."
+#~ msgid ""
+#~ "Note: Argument to --file (-f) option is optional. If it is present, it "
+#~ "must follow the short option immediately, without any intervening "
+#~ "whitespace. If it is used with the long option, it must be separated from "
+#~ "it by an equal sign, with no intervening whitespace."
+#~ msgstr ""
+#~ "Nota: El argumento para --file (-f) es opcional. Si está presente, debe "
+#~ "estar a continuación de la opción corta inmediatamente, sin ningún "
+#~ "espacio intermedio. Si se utiliza con la opción larga, debe estar "
+#~ "separado de ella por un signoigual, sin ningún espacio intermedio."
#~ msgid ""
-#~ "Usage error: --file takes an optional argument, it must follow the option\n"
+#~ "Usage error: --file takes an optional argument, it must follow the "
+#~ "option\n"
#~ "without any intervening whitespace."
#~ msgstr ""
-#~ "Error de modo de empleo: --file toma un argumento opcional, debe seguir a la\n"
+#~ "Error de modo de empleo: --file toma un argumento opcional, debe seguir a "
+#~ "la\n"
#~ "opción sin ningún espacio intermedio."
#~ msgid "Run mail --help for more info."
#~ msgstr "Ejecute mail --help para más información."
-#~ msgid "print libraries to link with. Up to two args can be given. Arguments are: auth, to display libraries needed for linking against libmuauth, and guile, to display libraries needed for linking against libmu_scm. Both can be given simultaneously"
-#~ msgstr "muestra las bibliotecas para enlazar. Se pueden dar hasta dos argumentos. Los argumentos son: auth, para mostrar las bibliotecas necesarias para enlazar con libmuauth, y guile, para mostrar las bibliotecas necesarias para enlazar con libmu_scm. Se pueden dar ambas simultáneamente"
+#~ msgid ""
+#~ "print libraries to link with. Up to two args can be given. Arguments are: "
+#~ "auth, to display libraries needed for linking against libmuauth, and "
+#~ "guile, to display libraries needed for linking against libmu_scm. Both "
+#~ "can be given simultaneously"
+#~ msgstr ""
+#~ "muestra las bibliotecas para enlazar. Se pueden dar hasta dos argumentos. "
+#~ "Los argumentos son: auth, para mostrar las bibliotecas necesarias para "
+#~ "enlazar con libmuauth, y guile, para mostrar las bibliotecas necesarias "
+#~ "para enlazar con libmu_scm. Se pueden dar ambas simultáneamente"
#~ msgid "waiting for debug"
#~ msgstr "esperando la depuración"
diff --git a/po/fr.po b/po/fr.po
index 0ed6d6b..8eae937 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU mailutils 0.6.1\n"
"Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-05-17 15:23+0300\n"
+"POT-Creation-Date: 2005-08-16 13:23+0300\n"
"PO-Revision-Date: 2005-04-05 08:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -55,14 +55,14 @@ msgstr ""
"statut de fin d'exécution à zéro si toutes les options spécifiées ont été "
"définies. Autrement le statut de fin d'exécution vaut 1."
-#: config/mailutils-config.c:126 frm/from.c:129 mh/folder.c:568
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
msgid "Too many arguments"
msgstr "Trop d'arguments"
-#: auth/pam.c:153 auth/sql.c:196 auth/sql.c:198 auth/sql.c:202
+#: auth/pam.c:153 auth/sql.c:197 auth/sql.c:199 auth/sql.c:203
#: mail.local/main.c:87 mail.local/main.c:92 mh/anno.c:43 mh/pick.c:45
#: mh/pick.c:48 mh/pick.c:50 mh/pick.c:52 mh/pick.c:54 mh/pick.c:56
-#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:84
+#: mh/pick.c:58 mh/pick.c:62 mh/whatnow.c:37 pop3d/popauth.c:83
msgid "STRING"
msgstr "CHAÎNE"
@@ -70,66 +70,66 @@ msgstr "CHAÎNE"
msgid "Use STRING as PAM service name"
msgstr "Utiliser la CHAÎNE comme nom de service PAM"
-#: auth/sql.c:184 auth/sql.c:194 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
+#: auth/sql.c:185 auth/sql.c:195 frm/frm.c:137 guimb/main.c:71 guimb/main.c:72
#: mh/mark.c:32 mh/pick.c:87
msgid "NAME"
msgstr "NOM"
-#: auth/sql.c:185
+#: auth/sql.c:186
msgid "Type of SQL interface to use"
msgstr "Type d'interface SQL à utiliser"
-#: auth/sql.c:186 auth/sql.c:188 auth/sql.c:190
+#: auth/sql.c:187 auth/sql.c:189 auth/sql.c:191
msgid "QUERY"
msgstr "QUERY"
-#: auth/sql.c:187
+#: auth/sql.c:188
msgid "SQL query to retrieve a passwd entry based on username"
msgstr ""
"requête SQL pour retrouver une entrée de mot de passe basé sur le nom "
"d'usager"
-#: auth/sql.c:189
+#: auth/sql.c:190
msgid "SQL query to retrieve a passwd entry based on UID"
msgstr "requête SQL pour retrouver une entrée de mot de passe basé sur le UID"
-#: auth/sql.c:191
+#: auth/sql.c:192
msgid "SQL query to retrieve a password from the database"
msgstr ""
"requête SQL pour retrouver une entrée de mot de passe basé à partir de la "
"base de données"
-#: auth/sql.c:192
+#: auth/sql.c:193
msgid "HOSTNAME"
msgstr "NOM DE L'HÔTE"
-#: auth/sql.c:193
+#: auth/sql.c:194
msgid "Name or IP of MySQL server to connect to"
msgstr "Nom ou adresse IP du serveur MySQL pour la connexion cible"
-#: auth/sql.c:195
+#: auth/sql.c:196
msgid "SQL user name"
msgstr "nom d'usager SQL"
-#: auth/sql.c:197
+#: auth/sql.c:198
msgid "SQL connection password"
msgstr "mot de passe de connexion SQL"
-#: auth/sql.c:199
+#: auth/sql.c:200
msgid "Name of the database to connect to"
msgstr "Nom de la base de données de connexion"
-#: auth/sql.c:200 mailbox/mu_argp.c:79 mailbox/mu_argp.c:114
-#: mailbox/mu_argp.c:120 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
+#: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
msgid "NUMBER"
msgstr "NOMBRE"
-#: auth/sql.c:201
+#: auth/sql.c:202
msgid "Port to use"
msgstr "Port à utiliser"
-#: auth/sql.c:203
+#: auth/sql.c:204
msgid ""
"Type of password returned by --sql-getpass query. STRING is one of: plain, "
"hash, scrambled"
@@ -137,27 +137,27 @@ msgstr ""
"Type de mot de passe retourné par la requête --sql-getpass. La CHAÎNE peut "
"prendre l'une des valeurs: plain, hash, scrambled"
-#: auth/sql.c:215
+#: auth/sql.c:216
#, c-format
msgid "Unknown SQL interface `%s'"
msgstr "Interface SQL inconnue `%s'"
-#: auth/sql.c:258
+#: auth/sql.c:259
#, c-format
msgid "Unknown password type `%s'"
msgstr "Type de mot de passe inconnue `%s'"
-#: auth/sql.c:324 auth/sql.c:456 auth/sql.c:577 mail.local/mailquota.c:191
+#: auth/sql.c:325 auth/sql.c:455 auth/sql.c:574 mail.local/mailquota.c:191
#, c-format
msgid "SQL Query failed: %s"
msgstr "Echec de la requête SQL: %s"
-#: auth/sql.c:335 auth/sql.c:467 auth/sql.c:588 mail.local/mailquota.c:202
+#: auth/sql.c:336 auth/sql.c:466 auth/sql.c:585 mail.local/mailquota.c:202
#, c-format
msgid "Cannot store SQL result: %s"
msgstr "ne peut stocker le résultat SQL: %s"
-#: auth/sql.c:598
+#: auth/sql.c:595
#, c-format
msgid "Cannot get password from SQL: %s"
msgstr "ne peut obtenir le mot de passe à partir de SQL: %s"
@@ -168,10 +168,10 @@ msgstr "Option d'encryption"
#: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
#: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
-#: mailbox/mu_argp.c:124 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
+#: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
-#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:82 pop3d/popauth.c:83
+#: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
#: mimeview/mimeview.c:48 mimeview/mimeview.c:52
msgid "FILE"
msgstr "FICHIER"
@@ -325,90 +325,91 @@ msgid "Cannot restart: program must be invoked using absolute pathname"
msgstr ""
"Ne peut redémarrer: le programme doit être invoqué avec un chemin absolu"
-#: comsat/comsat.c:220
+#: comsat/comsat.c:216
msgid "Failed to become a daemon"
msgstr "Échec pour devenir un daemon"
-#: comsat/comsat.c:264
+#: comsat/comsat.c:260
msgid "GNU comsat started"
msgstr "GNU comsat démarré"
-#: comsat/comsat.c:292
+#: comsat/comsat.c:288
#, c-format
msgid "Too many requests: pausing for %u second"
msgid_plural "Too many requests: pausing for %u seconds"
msgstr[0] "Trop de requêtes: pause de %u seconde"
msgstr[1] "Trop de requêtes: pause de %u secondes"
-#: comsat/comsat.c:347
+#: comsat/comsat.c:343
#, c-format
msgid "DENIED attempt to connect from %s"
msgstr "Tentative de connexion à partir de %s a été refusée"
-#: comsat/comsat.c:353
+#: comsat/comsat.c:349
#, c-format
msgid "Received %d byte from %s"
msgid_plural "Received %d bytes from %s"
msgstr[0] "Reçu %d octet à partir de %s"
msgstr[1] "Reçu %d octets à partir de %s"
-#: comsat/comsat.c:363
+#: comsat/comsat.c:359
#, c-format
msgid "Malformed input: %s"
msgstr "Entrée mal composée: %s"
-#: comsat/comsat.c:378
+#: comsat/comsat.c:374
#, c-format
msgid "Malformed input: %s@%s (near %s)"
msgstr "Entrée mal composée: %s@%s (près de %s)"
-#: comsat/comsat.c:444
+#: comsat/comsat.c:440
#, c-format
msgid "Cannot open device %s: %m"
msgstr "Ne peut ouvrir le périphérique %s: %m"
-#: comsat/comsat.c:460 mail/file.c:92 mail/mail.c:438 mail.local/main.c:690
-#: mail.local/main.c:709 mh/inc.c:218 mh/mh_init.c:379 pop3d/apop.c:240
+#: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
+#: mh/mh_init.c:379 pop3d/apop.c:240
#, c-format
msgid "Cannot open mailbox %s: %s"
msgstr "Ne peut ouvrir la boîte aux lettres pour %s: %s"
-#: comsat/comsat.c:467 mail.local/main.c:728
+#: comsat/comsat.c:463 mail.local/main.c:724
#, c-format
msgid "Cannot get stream for mailbox %s: %s"
msgstr "Ne peut obtenir un flot pour la boîte aux lettre %s: %s"
-#: comsat/comsat.c:474 mail.local/main.c:736
+#: comsat/comsat.c:470 mail.local/main.c:732
#, c-format
msgid "Cannot get stream size (mailbox %s): %s"
msgstr "Ne peut obtenir un flot de la taille voulue (boîte aux lettres %s): %s"
-#: comsat/comsat.c:491 pop3d/apop.c:230
+#: comsat/comsat.c:487 pop3d/apop.c:230
#, c-format
msgid "Cannot create temporary mailbox: %s"
msgstr "Ne peut créer une boîte aux lettres temporaire: %s"
-#: comsat/comsat.c:498
+#: comsat/comsat.c:494
#, c-format
msgid "Cannot create temporary stream: %s"
msgstr "Ne peut créer un flot temporaire: %s"
-#: comsat/comsat.c:545
+#: comsat/comsat.c:541
#, c-format
msgid "Bad line name in utmp record: %s"
msgstr "Nom de ligne erroné dans l'enregistrement utmp: %s"
-#: comsat/comsat.c:553
+#: comsat/comsat.c:549
#, c-format
msgid "Not a character device: %s"
msgstr "N'est pas un périphérique de caractères: %s"
-#: comsat/comsat.c:586 pop3d/popauth.c:309 pop3d/popauth.c:546
+#: comsat/comsat.c:582 pop3d/popauth.c:308 pop3d/popauth.c:545
#, c-format
msgid "No such user: %s"
msgstr "Pas un tel usager: %s"
-#: comsat/comsat.c:606
+#: comsat/comsat.c:602
#, c-format
msgid "User nonexistent: %s"
msgstr "Usager inexistant: %s"
@@ -652,11 +653,11 @@ msgstr "Lire le courriel à partir du FICHIER"
msgid "[OPTIONS] [USER]"
msgstr "[OPTIONS] [USER]"
-#: frm/from.c:136
+#: frm/from.c:135
msgid "Both --from option and user name are specified"
msgstr "Les deux options --from et le nom de l'usager ont été spécifiées"
-#: frm/from.c:151
+#: frm/from.c:150
#, c-format
msgid "There is %lu message in your incoming mailbox.\n"
msgid_plural "There are %lu messages in your incoming mailbox.\n"
@@ -668,7 +669,7 @@ msgstr[1] "Il y a %lu messages dans votre boîte aux lettres de réception.\n"
msgid "fribidi failed to recognize charset `%s'"
msgstr "fribidi a échoué à reconnaître le jeu de caractères `%s'"
-#: frm/common.c:374 mail/util.c:1398
+#: frm/common.c:374 mail/util.c:1453
#, c-format
msgid "Cannot decode line `%s': %s"
msgstr "Ne peut décoder la ligne `%s': %s"
@@ -700,37 +701,42 @@ msgstr "Ne peut ouvrir la boîte aux lettres `%s': %s"
msgid "Could not scan mailbox `%s': %s."
msgstr "Ne peut scruter la boîte aux lettres `%s': %s."
-#: guimb/collect.c:35 guimb/main.c:45 imap4d/auth_gss.c:267
-#: libsieve/sieve.l:131 libsieve/sieve.l:602 libsieve/sieve.l:666
-#: libsieve/sieve.l:720 mail/folders.c:38 mail/if.c:56 mail/util.c:761
-#: mh/mh_init.c:111 mh/mh_init.c:316 mh/mh_msgset.c:606
-msgid "Not enough memory"
-msgstr "Pas assez de mémoire"
+#: guimb/collect.c:35
+#, fuzzy, c-format
+msgid "Cannot construct default mailbox URL: %s"
+msgstr "Ne peut ouvrir la boîte aux lettres par défaut %s: %s"
-#: guimb/collect.c:42
+#: guimb/collect.c:43
#, c-format
msgid "Cannot open default mailbox %s: %s"
msgstr "Ne peut ouvrir la boîte aux lettres par défaut %s: %s"
-#: guimb/collect.c:86
+#: guimb/collect.c:87
#, c-format
msgid "Cannot open input file %s: %s"
msgstr "Ne peut ouvrir le fichier d'entrée %s: %s"
-#: guimb/collect.c:114
+#: guimb/collect.c:115
#, c-format
msgid "Cannot create temp mailbox %s: %s"
msgstr "Ne peut créer une boîte aux lettres temporaire %s: %s"
-#: guimb/collect.c:125
+#: guimb/collect.c:126
msgid "Input format not recognized"
msgstr "Format d'entrée non reconnu"
-#: guimb/collect.c:150
+#: guimb/collect.c:151
#, c-format
msgid "Cannot open output mailbox %s: %s\n"
msgstr "Ne peut ouvrir la boîte aux lettres de sortie %s: %s\n"
+#: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
+#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
+#: mh/mh_init.c:316 mh/mh_msgset.c:606
+msgid "Not enough memory"
+msgstr "Pas assez de mémoire"
+
#. TRANSLATORS: (command-line) is the name of Guile function. Do not
#. translate it.
#.
@@ -804,7 +810,7 @@ msgstr ""
"Au moins une des option de -fecs doit être fournie. Essayez guimb --help "
"pour plus de détails."
-#: guimb/util.c:51 guimb/util.c:58 mail/util.c:687 mail/util.c:694
+#: guimb/util.c:51 guimb/util.c:58 mail/util.c:799 mail/util.c:806
#, c-format
msgid "Cannot determine sender name (msg %d)"
msgstr "Ne peut déterminer le nom de l'expéditeur (msg %d)"
@@ -867,19 +873,19 @@ msgid "Always require STARTTLS before entering authentication phase"
msgstr ""
"Toujours demander STARTTLS avant d'entrer dans la phase d'authentification"
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:202
+#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
msgid "Error getting mail group"
msgstr "Erreur lors de l'obtention du groupe de courriel"
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:208
+#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
msgid "Error setting mail group"
msgstr "Erreur lors de l'initialisation du groupe de courriel"
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:299
+#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
msgid "Incoming connection opened"
msgstr "Connexion entrante ouverte"
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:311
+#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
#, c-format
msgid "Cannot obtain IP address of client: %s"
msgstr "Ne peut obtenir l'adresse IP du client: %s"
@@ -889,7 +895,7 @@ msgstr "Ne peut obtenir l'adresse IP du client: %s"
msgid "Connect from %s"
msgstr "Connexion à partir de %s"
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:304
+#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
msgid "Started in debugging mode"
msgstr "Démarré en mode de mise au point"
@@ -942,7 +948,7 @@ msgid "Quitting (numeric reason %d)"
msgstr "Fin d'exécution (raison numérotée %d)"
#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
-#: mh/rmf.c:147 pop3d/popauth.c:247
+#: mh/rmf.c:147 pop3d/popauth.c:246
#, c-format
msgid "Cannot stat %s: %s"
msgstr "Ne peut évaluer par stat() %s: %s"
@@ -971,70 +977,70 @@ msgstr "signal obtenu %s"
msgid "MASTER: exiting on signal"
msgstr "MAÎTRE: abandon sur réception de signal"
-#: imap4d/util.c:485
+#: imap4d/util.c:509
msgid "Unexpected eof on input"
msgstr "fin de fichier inattendue sur l'entrée"
-#: imap4d/util.c:494
+#: imap4d/util.c:518
#, c-format
msgid "Error reading from input file: %s"
msgstr "erreur de lecture à partir du fichier d'entrée: %s"
-#: imap4d/util.c:981
+#: imap4d/util.c:1005
msgid "Cannot find out my own hostname"
msgstr "Ne peut repérer mon propre hôte"
-#: imap4d/util.c:1128
+#: imap4d/util.c:1152
#, c-format
msgid "Cannot poll input stream: %s"
msgstr "ne peut interroger le flot d'entrée: %s"
-#: imap4d/util.c:1162
+#: imap4d/util.c:1186
#, c-format
msgid "Cannot open TLS stream: %s"
msgstr "ne peut ouvrir le flot TLS: %s"
-#: lib/mailcap.c:331
+#: lib/mailcap.c:337
#, c-format
msgid "Run `%s'?"
msgstr "Exécuter `%s'?"
-#: lib/mailcap.c:367
+#: lib/mailcap.c:373
#, c-format
msgid "cannot retrieve field %lu: %s"
msgstr "Ne peut récupérer le champ %lu: %s"
-#: lib/mailcap.c:439
+#: lib/mailcap.c:445
#, c-format
msgid "Cannot execute `%s': %s"
msgstr "Ne peut exécuter %s: %s"
-#: lib/mailcap.c:456
+#: lib/mailcap.c:462
#, c-format
msgid "Command exited with status %d\n"
msgstr "La commande s'est terminée avec l'état de fin d'exécution %d\n"
-#: lib/mailcap.c:458
+#: lib/mailcap.c:464
#, c-format
msgid "Command terminated on signal %d\n"
msgstr "La commande s'est terminée sur réception de signal %d\n"
-#: lib/mailcap.c:460
+#: lib/mailcap.c:466
#, c-format
msgid "Command terminated\n"
msgstr "Commande terminée\n"
-#: lib/mailcap.c:544 mimeview/mimeview.c:201
+#: lib/mailcap.c:550 mimeview/mimeview.c:201
#, c-format
msgid "Executing %s...\n"
msgstr "Exécution en cours de %s...\n"
-#: lib/mailcap.c:587
+#: lib/mailcap.c:593
#, c-format
msgid "Trying %s...\n"
msgstr "Tentative %s...\n"
-#: lib/mailcap.c:629
+#: lib/mailcap.c:635
#, c-format
msgid "Found in %s\n"
msgstr "Répéré dans %s\n"
@@ -1057,56 +1063,56 @@ msgstr "livraison en cours dans %s"
msgid "cannot save to mailbox: %s"
msgstr "ne peut sauvegarder dans la boîte aux lettres: %s"
-#: libsieve/actions.c:243
+#: libsieve/actions.c:252
msgid "reject: cannot get text!"
msgstr "reject: ne peut obtenir le textuel!"
-#: libsieve/actions.c:259 libsieve/extensions/vacation.c:445
+#: libsieve/actions.c:268 libsieve/extensions/vacation.c:443
#, c-format
msgid "%d: cannot create recipient address <%s>: %s"
msgstr "%d: ne peut créer l'adresse du destinataire <%s>: %s"
-#: libsieve/actions.c:271 libsieve/actions.c:400
+#: libsieve/actions.c:280 libsieve/actions.c:409
#, c-format
msgid "%d: cannot create sender address <%s>: %s"
msgstr "%d: ne peut créer l'adresse de l'expéditeur <%s>: %s"
-#: libsieve/actions.c:285 libsieve/actions.c:440
-#: libsieve/extensions/vacation.c:480
+#: libsieve/actions.c:294 libsieve/actions.c:449
+#: libsieve/extensions/vacation.c:478
#, c-format
msgid "%d: cannot open mailer %s: %s"
msgstr "%d: ne peut ouvrir le postier %s: %s"
-#: libsieve/actions.c:360
+#: libsieve/actions.c:369
msgid "cannot get address!"
msgstr "ne peut obtenir l'adresse!"
-#: libsieve/actions.c:368
+#: libsieve/actions.c:377
#, c-format
msgid "%d: parsing recipient address `%s' failed: %s"
msgstr "%d: analyse de l'adresses du destinataire `%s' a échoué: %s"
-#: libsieve/actions.c:374
+#: libsieve/actions.c:383
#, c-format
msgid "to %s"
msgstr "vers %s"
-#: libsieve/actions.c:381
+#: libsieve/actions.c:390
#, c-format
msgid "%d: Redirection loop detected"
msgstr "%d: boucle de redirection détectée"
-#: libsieve/actions.c:390
+#: libsieve/actions.c:399
#, c-format
msgid "%d: cannot get envelope sender: %s"
msgstr "%d: ne peut obtenir l'enveloppe de l'expéditeur: %s"
-#: libsieve/actions.c:413
+#: libsieve/actions.c:422
#, c-format
msgid "%d: cannot copy message: %s"
msgstr "%d: ne peut copier le message: %s"
-#: libsieve/actions.c:428
+#: libsieve/actions.c:437
#, c-format
msgid "%d: cannot get my email address"
msgstr "%d: ne peut obtenir mon adresse de courriel"
@@ -1230,35 +1236,35 @@ msgstr "sous-dépilage de la pile"
msgid "mailbox_scan: %s"
msgstr "mailbox_scan: %s"
-#: libsieve/sieve.l:233
+#: libsieve/sieve.l:234
#, c-format
msgid "cannot stat `%s': %s"
msgstr "ne peut évaluer par stat() `%s': %s"
-#: libsieve/sieve.l:239 libsieve/sieve.l:244
+#: libsieve/sieve.l:240 libsieve/sieve.l:245
msgid "recursive inclusion"
msgstr "inclusion récursive"
-#: libsieve/sieve.l:247
+#: libsieve/sieve.l:248
#, c-format
msgid "`%s' already included here"
msgstr "« %s » est déjà inclus ici"
-#: libsieve/sieve.l:251
+#: libsieve/sieve.l:252
#, c-format
msgid "`%s' already included at top level"
msgstr "« %s » est déjà inclus au niveau supérieur"
-#: libsieve/sieve.l:260
+#: libsieve/sieve.l:261
#, c-format
msgid "cannot open `%s': %s"
msgstr "ne peut ouvrir « %s »: %s"
-#: libsieve/sieve.l:438
+#: libsieve/sieve.l:439
msgid "preprocessor syntax"
msgstr "syntaxe du préprocesseur"
-#: libsieve/sieve.l:447
+#: libsieve/sieve.l:448
msgid "missing closing quote in preprocessor statement"
msgstr "guillemet de fermeture manquant dans la déclaration de pré-traitement"
@@ -1291,30 +1297,30 @@ msgstr "type de donnée invalide"
msgid "cannot retrieve argument %d"
msgstr "ne peut récupérer l'argument: %d"
-#: libsieve/extensions/vacation.c:257
+#: libsieve/extensions/vacation.c:255
#, c-format
msgid "%d: cannot build db file name"
msgstr "%d: ne peut construire le nom du fichier de base de données"
-#: libsieve/extensions/vacation.c:268
+#: libsieve/extensions/vacation.c:266
#, c-format
msgid "%d: cannot open `%s': %s"
msgstr "%d: ne peut ouvrir `%s': %s"
#. TRANSLATORS: 'vacation' and ':days' are Sieve keywords.
#. Do not translate them!
-#: libsieve/extensions/vacation.c:311
+#: libsieve/extensions/vacation.c:309
#, c-format
msgid "%d: vacation compiled without DBM support. Ignoring :days tag"
msgstr ""
"%d: vacation a été compilé sans support DBM. Les étiquettes days sont "
"ignorées."
-#: libsieve/extensions/vacation.c:507
+#: libsieve/extensions/vacation.c:505
msgid "cannot get text!"
msgstr "ne peut obtenir le textuel!"
-#: libsieve/extensions/vacation.c:524
+#: libsieve/extensions/vacation.c:522
#, c-format
msgid "%d: cannot get sender address"
msgstr "%d: ne peut obtenir l'adresse de l'expéditeur"
@@ -1324,6 +1330,10 @@ msgstr "%d: ne peut obtenir l'adresse de l'expéditeur"
msgid "cannot parse date specification (%s)"
msgstr "ne peut analyser la spécification de la date (%s)"
+#: mail/alias.c:100
+msgid "alias hash table full"
+msgstr ""
+
#: mail/alias.c:195
#, c-format
msgid "\"%s\": not a group"
@@ -1338,12 +1348,18 @@ msgstr "Ne peut déterminer mon nom d'usager"
msgid "Cannot determine my email address: %s"
msgstr "Ne peut déterminer mon adresse de courriel: %s"
-#: mail/copy.c:69 mail/quit.c:113 mail/send.c:542
+#: mail/cd.c:40
+#, fuzzy, c-format
+msgid "cannot change to '%s': %s"
+msgstr "ne peut évaluer par stat() `%s': %s"
+
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
+#: mh/mh_init.c:369
#, c-format
-msgid "Cannot create mailbox %s"
-msgstr "Ne peut créer la boîte aux lettres %s"
+msgid "Cannot create mailbox %s: %s"
+msgstr "Ne peut créer la boîte aux lettres %s: %s"
-#: mail/copy.c:84 mail/quit.c:120 mail/send.c:535
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
#, c-format
msgid "Cannot append message: %s"
msgstr "Ne peut accoller le message: %s"
@@ -1363,7 +1379,7 @@ msgstr "| Type=%s\n"
msgid "| Encoding=%s\n"
msgstr "| Encodage=%s\n"
-#: mail/decode.c:267 mail/print.c:97
+#: mail/decode.c:267 mail/print.c:96
msgid ""
"\n"
"Interrupt"
@@ -1371,19 +1387,103 @@ msgstr ""
"\n"
"Interruption"
-#: mail/file.c:40
+#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#, c-format
+msgid "Cannot create header: %s"
+msgstr "Ne peut créer l'en-tête: %s"
+
+#: mail/escape.c:95 mail/escape.c:121
+#, c-format
+msgid "%d: not a header line"
+msgstr "%d: n'est pas une ligne d'en-tête"
+
+#: mail/escape.c:142
+msgid "Edit again?"
+msgstr "Éditer à nouveau?"
+
+#: mail/escape.c:157
+#, c-format
+msgid "(continue)\n"
+msgstr "(continuer)\n"
+
+#: mail/escape.c:167
+#, c-format
+msgid "%c%s requires an argument"
+msgstr "%c%s requiert un argument"
+
+#: mail/escape.c:200 mail/util.c:115
+#, c-format
+msgid "Unknown command: %s"
+msgstr "commande inconnue: %s"
+
+#: mail/escape.c:205
+msgid "Command not allowed in an escape sequence\n"
+msgstr "Commande n'est pas peermise dans une séquence d'échappement\n"
+
+#: mail/escape.c:248 mail/escape.c:547 mail/escape.c:602 pop3d/popauth.c:284
+#: pop3d/popauth.c:355 pop3d/popauth.c:429
+#, fuzzy, c-format
+msgid "Cannot open %s: %s"
+msgstr "ne peut ouvrir %s: %s"
+
+#: mail/escape.c:252
+#, c-format
+msgid "Reading %s\n"
+msgstr "Lecture de %s\n"
+
+#: mail/escape.c:451
+#, c-format
+msgid "Interpolating: %d\n"
+msgstr "Interpolation: %d\n"
+
+#: mail/escape.c:519
+#, c-format
+msgid "Message contains:\n"
+msgstr "Message contenant:\n"
+
+#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
+#: mail/escape.c:633
+msgid "pipe: no command specified"
+msgstr "pipe: aucune commande n'a été spécifiée"
+
+#: mail/escape.c:677
+#, fuzzy, c-format
+msgid "Cannot exec process `%s': %s"
+msgstr "ne peut exécuter le processus « %s »: %s"
+
+#: mail/escape.c:710
+#, fuzzy, c-format
+msgid "Child terminated abnormally: %d"
+msgstr "fin anormal du processus enfant: %d"
+
+#: mail/escape.c:717
+#, fuzzy, c-format
+msgid "Cannot stat output file: %s"
+msgstr "ne peut évaluer par stat() le ficheir de sortie: %s"
+
+#: mail/escape.c:727
+#, c-format
+msgid "no lines out\n"
+msgstr "pas de ligne en sortie\n"
+
+#: mail/file.c:41
msgid "No previous file"
msgstr "Pas de fichier précédent"
-#: mail/file.c:48
+#: mail/file.c:51
msgid "MBOX environment variable not set"
msgstr "MBOX variable d'environnement n,est pas initialisée"
-#: mail/file.c:126
+#: mail/file.c:130
#, c-format
msgid "%s takes only one argument"
msgstr "%s prend un seul argument"
+#: mail/followup.c:44 mail/next.c:40 mail/next.c:63 mail/next.c:80
+#: mail/previous.c:49 mail/previous.c:66
+msgid "No applicable message"
+msgstr "Pas de message applicable"
+
#: mail/if.c:67
msgid "Internal error: condition stack underflow"
msgstr "Erreur interne: condition de sous-dépilage de la pile"
@@ -1429,7 +1529,7 @@ msgstr "[adresse...]"
msgid "Return true if mail exists"
msgstr "Retourner `true' si le courriel existe"
-#: mail/mail.c:37 mailbox/mu_argp.c:73
+#: mail/mail.c:37 mailbox/mu_argp.c:74
msgid "URL"
msgstr "URL"
@@ -1511,11 +1611,6 @@ msgstr "Utiliser \"quit\" pour quitter."
msgid "Cannot create mailbox for %s: %s"
msgstr "Ne peut créer une boîte aux lettres pour %s: %s"
-#: mail/mail.c:421 mh/inc.c:209 mh/mh_init.c:369
-#, c-format
-msgid "Cannot create mailbox %s: %s"
-msgstr "Ne peut créer la boîte aux lettres %s: %s"
-
#: mail/mail.c:452
#, c-format
msgid "Cannot read mailbox %s: %s"
@@ -1531,7 +1626,7 @@ msgstr "%s: 0 messages\n"
msgid "No mail for %s\n"
msgstr "Pas ed courrier pour %s\n"
-#: mail/mail.c:537
+#: mail/mail.c:539
msgid ""
"GNU Mailutils -- a suite of utilities for electronic mail\n"
"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software "
@@ -1543,7 +1638,7 @@ msgstr ""
"Foundation, Inc.\n"
"\n"
-#: mail/mail.c:541 mailbox/mu_argp.c:254 mh/mh_argp.c:188
+#: mail/mail.c:543 mailbox/mu_argp.c:255 mh/mh_argp.c:188
#, fuzzy, c-format
msgid ""
" GNU Mailutils is free software; you can redistribute it and/or modify\n"
@@ -1576,39 +1671,34 @@ msgstr ""
"avec ce programme; sinon, écrire à la Free Software Foundation, Inc.,\n"
"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-#: mail/mailline.c:402 mail/mailline.c:430 mail/mailline.c:477
-#: mail/mailline.c:513
+#: mail/mailline.c:694 mail/mailline.c:722 mail/mailline.c:769
+#: mail/mailline.c:805
msgid "Not enough memory to edit the line"
msgstr "Pas assez de mémoire pour éditer la ligne"
-#: mail/msgset.y:163
+#: mail/msgset.y:164
msgid "unknown message type"
msgstr "type de message inconnu"
-#: mail/msgset.y:248 mail/msgset.y:253
+#: mail/msgset.y:249 mail/msgset.y:254
#, c-format
msgid " near end"
msgstr " près de la fin"
-#: mail/msgset.y:255 mail/msgset.y:258
+#: mail/msgset.y:256 mail/msgset.y:259
#, c-format
msgid " near %s"
msgstr " près de %s"
-#: mail/msgset.y:473
+#: mail/msgset.y:474
msgid "range error"
msgstr "erreur d'étendue"
-#: mail/msgset.y:736 mail/util.c:213
+#: mail/msgset.y:737 mail/util.c:185
#, c-format
msgid "%lu: Inappropriate message (has been deleted)"
msgstr "%lu: message inapproprié (a été détruit)"
-#: mail/next.c:40 mail/next.c:63 mail/next.c:80 mail/previous.c:46
-#: mail/previous.c:63
-msgid "No applicable message"
-msgstr "Pas de message applicable"
-
#: mail/quit.c:51
#, c-format
msgid "Held %d message in %s\n"
@@ -1616,7 +1706,7 @@ msgid_plural "Held %d messages in %s\n"
msgstr[0] "%d message retenu dans %s\n"
msgstr[1] "%d messages retenus dans %s\n"
-#: mail/quit.c:141
+#: mail/quit.c:147
#, c-format
msgid "Saved %d message in %s\n"
msgid_plural "Saved %d messages in %s\n"
@@ -1650,11 +1740,6 @@ msgstr "Ne peut créer l'en-tête de liste: %s"
msgid "Invalid header: %s"
msgstr "En-tête invalide: %s"
-#: mail/send.c:225 mail/var.c:59 mh/mhn.c:2023 mimeview/mimeview.c:217
-#, c-format
-msgid "Cannot create header: %s"
-msgstr "Ne peut créer l'en-tête: %s"
-
#: mail/send.c:308
msgid "Cannot open temporary file"
msgstr "Ne peut ouvrir un fichier temporaire"
@@ -1675,25 +1760,25 @@ msgstr "Utilisez \".\" pour terminer le courriel."
msgid "Use \"~.\" to terminate letter."
msgstr "Utilisez \"~.\" pour terminer le courriel."
-#: mail/send.c:392
+#: mail/send.c:391
#, c-format
msgid "Unknown escape %s"
msgstr "Échappement inconnu %s"
-#: mail/send.c:395
+#: mail/send.c:394
msgid "Unfinished escape"
msgstr "Échappement non complété"
-#: mail/send.c:399
+#: mail/send.c:398
msgid "Cannot parse escape sequence"
msgstr "ne peut analyser la séquence d'échappement"
-#: mail/send.c:424 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
#, c-format
msgid "Cannot open file %s: %s"
msgstr "ne peut ouvrir le fichier %s: %s"
-#: mail/send.c:485
+#: mail/send.c:484
msgid "Null message body; hope that's ok\n"
msgstr "Corps du message vide; en espérant que cela soit correct\n"
@@ -1751,160 +1836,92 @@ msgstr[1] "%d détruits"
msgid "unalias requires at least one argument"
msgstr "unalias requiert au moins un argument"
-#: mail/util.c:157 mail/var.c:200
-#, c-format
-msgid "Unknown command: %s"
-msgstr "commande inconnue: %s"
-
-#: mail/util.c:159
+#: mail/util.c:117
msgid "Invalid command"
msgstr "Commande invalide"
-#: mail/util.c:389
+#: mail/util.c:272
+#, c-format
+msgid "Unknown command: %s\n"
+msgstr "Commande inconnue: %s\n"
+
+#: mail/util.c:439
#, c-format
msgid "No value set for \"%s\""
msgstr "Pas de valeur fournie pour \"%s\""
-#: mail/util.c:487
+#: mail/util.c:594
#, c-format
msgid "oops?"
msgstr "oups?"
-#: mail/util.c:567
+#: mail/util.c:684
msgid "Incorrect value for decode-fallback"
msgstr "Valeur incorrecte pour le decode-fallback"
-#: mail/util.c:625
+#: mail/util.c:735
msgid "Cannot get homedir"
msgstr "Ne peut obtenir le répertoire de l'usager (home directory)"
-#: mail/util.c:937
-#, c-format
-msgid "Cannot open save file %s: %s"
-msgstr "Ne peut ouvrir le fichier pour sauvegarde %s: %s"
-
-#: mail/util.c:954
-msgid "Not enough memory for creating save file"
-msgstr "Pas assez de mémoire pour créer un fichier de sauvegarde"
+#: mail/util.c:1050
+#, fuzzy, c-format
+msgid "Cannot create output mailbox `%s': %s"
+msgstr "Ne peut créer une boîte aux lettres temporaire %s: %s"
-#: mail/util.c:1039
-#, c-format
-msgid "Unknown command: %s\n"
-msgstr "Commande inconnue: %s\n"
+#: mail/util.c:1058
+#, fuzzy, c-format
+msgid "Cannot open output mailbox `%s': %s"
+msgstr "Ne peut ouvrir la boîte aux lettres de sortie %s: %s\n"
#: mail/util.c:1064
+#, fuzzy, c-format
+msgid "Cannot append message to `%s': %s"
+msgstr "Ne peut accoller le message %lu: %s"
+
+#: mail/util.c:1119
#, fuzzy
msgid "Cannot unencapsulate message/part"
msgstr "ne peut désencapsuler le message/ la partie"
-#: mail/util.c:1073
+#: mail/util.c:1128
#, fuzzy, c-format
msgid "No such (sub)part in the message: %d"
msgstr "pas de (sous-)partie dans le message: %d"
-#: mail/util.c:1080
+#: mail/util.c:1135
#, fuzzy, c-format
msgid "Cannot get (sub)part from the message: %d"
msgstr "ne peut repérer la (sous-)partie à partir du message: %d"
-#: mail/util.c:1204
+#: mail/util.c:1259
#, fuzzy, c-format
msgid "Cannot create temporary header: %s"
msgstr "ne peut créer une en-tête temporaire: %s"
-#: mail/util.c:1245
+#: mail/util.c:1300
#, fuzzy, c-format
msgid "Cannot parse address `%s' (while expanding `%s'): %s"
msgstr "ne peut analyser l'adresse « %s » (lors de l'expansion de « %s »): %s"
-#: mail/util.c:1248
+#: mail/util.c:1303
#, fuzzy, c-format
msgid "Cannot parse address `%s': %s"
msgstr "ne peut analyser l'adresse « %s »: %s"
-#: mail/util.c:1301
+#: mail/util.c:1356
#, fuzzy, c-format
msgid "Cannot get message %lu: %s"
msgstr "Ne peut lire le message %lu: %s"
-#: mail/util.c:1312
+#: mail/util.c:1367
#, c-format
msgid "%d: invalid message number"
msgstr "%d: numéro de message invalide"
-#: mail/util.c:1319
+#: mail/util.c:1374
msgid "No applicable messages"
msgstr "Aucun message applicable"
-#: mail/var.c:95 mail/var.c:121
-#, c-format
-msgid "%d: not a header line"
-msgstr "%d: n'est pas une ligne d'en-tête"
-
-#: mail/var.c:142
-msgid "Edit again?"
-msgstr "Éditer à nouveau?"
-
-#: mail/var.c:157
-#, c-format
-msgid "(continue)\n"
-msgstr "(continuer)\n"
-
-#: mail/var.c:167
-#, c-format
-msgid "%c%s requires an argument"
-msgstr "%c%s requiert un argument"
-
-#: mail/var.c:205
-msgid "Command not allowed in an escape sequence\n"
-msgstr "Commande n'est pas peermise dans une séquence d'échappement\n"
-
-#: mail/var.c:252 mail/var.c:551 mail/var.c:606 pop3d/popauth.c:285
-#: pop3d/popauth.c:356 pop3d/popauth.c:430
-#, fuzzy, c-format
-msgid "Cannot open %s: %s"
-msgstr "ne peut ouvrir %s: %s"
-
-#: mail/var.c:256
-#, c-format
-msgid "Reading %s\n"
-msgstr "Lecture de %s\n"
-
-#: mail/var.c:455
-#, c-format
-msgid "Interpolating: %d\n"
-msgstr "Interpolation: %d\n"
-
-#: mail/var.c:523
-#, c-format
-msgid "Message contains:\n"
-msgstr "Message contenant:\n"
-
-#. TRANSLATORS: 'pipe' is a command name. Do not translate it!
-#: mail/var.c:637
-msgid "pipe: no command specified"
-msgstr "pipe: aucune commande n'a été spécifiée"
-
-#: mail/var.c:681
-#, fuzzy, c-format
-msgid "Cannot exec process `%s': %s"
-msgstr "ne peut exécuter le processus « %s »: %s"
-
-#: mail/var.c:714
-#, fuzzy, c-format
-msgid "Child terminated abnormally: %d"
-msgstr "fin anormal du processus enfant: %d"
-
-#: mail/var.c:721
-#, fuzzy, c-format
-msgid "Cannot stat output file: %s"
-msgstr "ne peut évaluer par stat() le ficheir de sortie: %s"
-
-#: mail/var.c:731
-#, c-format
-msgid "no lines out\n"
-msgstr "pas de ligne en sortie\n"
-
#: mail/z.c:65
msgid "Bad arguments for the scrolling command"
msgstr "Arguments erronée pour la commande de défilement"
@@ -1922,12 +1939,12 @@ msgstr "argument n'est pas applicable pour z."
msgid "Bad number of pages"
msgstr "Nombre erroné de pages"
-#: mail/z.c:128
+#: mail/z.c:124
#, c-format
msgid "On first screenful of messages\n"
msgstr "Sur le premier écran plein de message\n"
-#: mail/z.c:140 mail/z.c:151
+#: mail/z.c:132
#, c-format
msgid "On last screenful of messages\n"
msgstr "Sur le dernier écran plein de messages\n"
@@ -1971,7 +1988,7 @@ msgstr ""
"Retourner l'échec temporaire si le quota du disque ou de la boîtes aux "
"lettres a été dépassé"
-#: mail.local/main.c:79 mailbox/mu_argp.c:90
+#: mail.local/main.c:79 mailbox/mu_argp.c:91
msgid "EMAIL"
msgstr "EMAIL"
@@ -2012,7 +2029,7 @@ msgstr ""
"Initialiser le nom du patron pour les filtres sieve du courriel définis par "
"l'usager"
-#: mail.local/main.c:98 mailbox/mu_argp.c:75 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
#: mimeview/mimeview.c:46
msgid "FLAGS"
msgstr "OPTIONS"
@@ -2070,86 +2087,86 @@ msgstr "mu_debug_set_print a échoué: %s\n"
msgid "Missing arguments. Try --help for more info."
msgstr "Arguments manquants. Essayer --help pour plus d'informations."
-#: mail.local/main.c:423 mail.local/script.c:94
+#: mail.local/main.c:419 mail.local/script.c:94
#, fuzzy, c-format
msgid "Access to %s failed: %m"
msgstr "accès à %s a échoué: %m"
-#: mail.local/main.c:431 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:375
#, fuzzy, c-format
msgid "Cannot initialize sieve machine: %s"
msgstr "ne peut initialiser l'automate sieve: %s"
-#: mail.local/main.c:552
+#: mail.local/main.c:548
#, fuzzy, c-format
msgid "Unable to open temporary file: %s"
msgstr "incapable d'ouvrir le fichier temporaire: %s"
-#: mail.local/main.c:558
+#: mail.local/main.c:554
#, c-format
msgid "unable to open temporary file: %s"
msgstr "incapable d'ouvrir le fichier temporaire: %s"
-#: mail.local/main.c:589
+#: mail.local/main.c:585
#, fuzzy
msgid "Cannot determine sender address"
msgstr "Ne peut déterminer l'adresse de l'expéditeur"
-#: mail.local/main.c:607 mail.local/main.c:624
+#: mail.local/main.c:603 mail.local/main.c:620
#, fuzzy, c-format
msgid "Error writing temporary file: %s"
msgstr "erreur d'écriture dans la boîte aux lettres: %s"
-#: mail.local/main.c:634
+#: mail.local/main.c:630
#, fuzzy, c-format
msgid "Error opening temporary file: %s"
msgstr "Ne peut ouvrir le fichier temporaire: %s"
-#: mail.local/main.c:643
+#: mail.local/main.c:639
#, fuzzy, c-format
msgid "Error creating temporary message: %s"
msgstr "ne peut créer une en-tête temporaire: %s"
-#: mail.local/main.c:668
+#: mail.local/main.c:664
#, c-format
msgid "%s: no such user"
msgstr "%s: usager inconnu"
-#: mail.local/main.c:682
+#: mail.local/main.c:678
#, fuzzy, c-format
msgid "Cannot get input message stream: %s"
msgstr "ne peut obtenir le flot entrant de messages: %s"
-#: mail.local/main.c:720
+#: mail.local/main.c:716
#, fuzzy, c-format
msgid "Cannot lock mailbox `%s': %s"
msgstr "ne peut verrouiller la boîte aux lettres '%s': %s"
-#: mail.local/main.c:750
+#: mail.local/main.c:746
#, c-format
msgid "%s: mailbox quota exceeded for this recipient"
msgstr "%s: dépassement de quota de la boîte aux lettres du destinataire"
-#: mail.local/main.c:761
+#: mail.local/main.c:757
#, fuzzy, c-format
msgid "Cannot get stream size (input message): %s"
msgstr "ne peut obtenir la taille du flot (message d'entrée): %s"
-#: mail.local/main.c:768
+#: mail.local/main.c:764
#, c-format
msgid "%s: message would exceed maximum mailbox size for this recipient"
msgstr ""
"%s: message devrait exécder la taille maximale de la boîte aux lettre du "
"destinataire"
-#: mail.local/main.c:821
+#: mail.local/main.c:817
#, fuzzy, c-format
msgid "Error writing to mailbox: %s. Mailbox NOT truncated: %s"
msgstr ""
"erreur d'écriture dans la boîte aux lettres: %s. La boîte n'a pas été "
"tronquée: %s"
-#: mail.local/main.c:824
+#: mail.local/main.c:820
#, fuzzy, c-format
msgid "Error writing to mailbox: %s"
msgstr "erreur d'écriture dans la boîte aux lettres: %s"
@@ -2177,7 +2194,7 @@ msgstr "Ne peut créer une boîte aux lettres pour %s: %s"
#. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
#. in this message
-#: mail.remote/mail.remote.c:51
+#: mail.remote/mail.remote.c:52
msgid ""
"GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
" This is a simple drop-in replacement for sendmail to forward mail directly\n"
@@ -2228,19 +2245,19 @@ msgstr ""
"\n"
" mail.remote --mailer smtp://mail.example.com -t devnull@foo.bar\n"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "ADDR"
msgstr "ADR"
-#: mail.remote/mail.remote.c:75
+#: mail.remote/mail.remote.c:76
msgid "Override the default from address"
msgstr "Écraser l'adresse par défaut à partir de l'adresse"
-#: mail.remote/mail.remote.c:76
+#: mail.remote/mail.remote.c:77
msgid "Read message for recipients."
msgstr "Lire le message pour les destinataires."
-#: mail.remote/mail.remote.c:77
+#: mail.remote/mail.remote.c:78
msgid ""
"Print envelope commands in the SMTP protocol transaction. If specified more "
"than once, the data part of the protocol transaction will also be printed."
@@ -2249,56 +2266,56 @@ msgstr ""
"spécifié plus d'une fois, la partie donnée du protocole de transaction sera "
"aussi affichée"
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
msgid "OPT"
msgstr "OPT"
-#: mail.remote/mail.remote.c:78 mail.remote/mail.remote.c:79
-#: mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:79 mail.remote/mail.remote.c:80
+#: mail.remote/mail.remote.c:81
msgid "Ignored for sendmail compatibility"
msgstr "Ignorer la compatibilité pour sendmail"
-#: mail.remote/mail.remote.c:119
+#: mail.remote/mail.remote.c:120
msgid "[TO-ADDR]..."
msgstr "[VERS-ADR]..."
-#: mail.remote/mail.remote.c:176
+#: mail.remote/mail.remote.c:173
#, c-format
msgid "Parsing from addresses failed: %s"
msgstr "Analyse à partir des adresses sources a échoué: %s"
-#: mail.remote/mail.remote.c:186
+#: mail.remote/mail.remote.c:183
#, c-format
msgid "Parsing recipient addresses failed: %s"
msgstr "Analyse des adresses de destination a échoué: %s"
-#: mail.remote/mail.remote.c:194 mail.remote/mail.remote.c:206
-#: mail.remote/mail.remote.c:212
+#: mail.remote/mail.remote.c:191 mail.remote/mail.remote.c:203
+#: mail.remote/mail.remote.c:209
#, c-format
msgid "Failed: %s"
msgstr "Échec: %s"
-#: mail.remote/mail.remote.c:200
+#: mail.remote/mail.remote.c:197
#, c-format
msgid "Opening stdin failed: %s"
msgstr "ouverture de stdin a échoué: %s"
-#: mail.remote/mail.remote.c:220
+#: mail.remote/mail.remote.c:217
#, fuzzy, c-format
msgid "Creating mailer `%s' failed: %s"
msgstr "Création du postier '%s' a échoué: %s"
-#: mail.remote/mail.remote.c:247
+#: mail.remote/mail.remote.c:244
#, fuzzy, c-format
msgid "Opening mailer `%s' failed: %s"
msgstr "Ouverture du postier '%s' a échoué: %s"
-#: mail.remote/mail.remote.c:254
+#: mail.remote/mail.remote.c:251
#, c-format
msgid "Sending message failed: %s"
msgstr "Transmission du message a échoué: %s"
-#: mail.remote/mail.remote.c:260
+#: mail.remote/mail.remote.c:257
#, c-format
msgid "Closing mailer failed: %s"
msgstr "Fermeture du postier a échoué: %s"
@@ -2467,147 +2484,147 @@ msgstr "Erreur iconv(): %s"
msgid "Stream is closed"
msgstr "Flot est fermé"
-#: mailbox/message.c:1089
+#: mailbox/message.c:1092
#, c-format
msgid "mailbox_create_default (%s) failed: %s\n"
msgstr "mailbox_create_default (%s) a échoué: %s\n"
-#: mailbox/message.c:1120
+#: mailbox/message.c:1123
#, c-format
msgid "mailbox_open (%s) failed: %s\n"
msgstr "mailbox_open (%s) a échoué: %s\n"
-#: mailbox/message.c:1128
+#: mailbox/message.c:1131
#, c-format
msgid "mailbox_append_message (%s) failed: %s\n"
msgstr "mailbox_append_message (%s) a échoué: %s\n"
-#: mailbox/message.c:1140
+#: mailbox/message.c:1143
#, c-format
msgid "mailbox_close (%s) failed: %s\n"
msgstr "mailbox_close (%s) a échoué: %s\n"
-#: mailbox/mu_argp.c:59
+#: mailbox/mu_argp.c:60
msgid "Common options"
msgstr "Options communes"
-#: mailbox/mu_argp.c:61
+#: mailbox/mu_argp.c:62
msgid "Show compilation options"
msgstr "Afficher les options de compilation"
-#: mailbox/mu_argp.c:67
+#: mailbox/mu_argp.c:68
msgid "Print license and exit"
msgstr "Afficher la licence et quitter"
-#: mailbox/mu_argp.c:74
+#: mailbox/mu_argp.c:75
msgid "Use specified URL as a mailspool directory"
msgstr "Utiliser l'URL spécifié comme répertoire de traitement du courrier"
-#: mailbox/mu_argp.c:76
+#: mailbox/mu_argp.c:77
msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
msgstr ""
"Fanions de verrouillage par défaut (E=externe, R=nouvelle tentative, "
"T=temps, P=pid"
-#: mailbox/mu_argp.c:77 mailbox/mu_argp.c:81 mh/send.c:67 pop3d/pop3d.c:77
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
msgid "SECONDS"
msgstr "SECONDES"
-#: mailbox/mu_argp.c:78
+#: mailbox/mu_argp.c:79
msgid "Set timeout for acquiring the lockfile"
msgstr "Initialiser la minuterie pour prendre contrôle du fichier de verrou"
-#: mailbox/mu_argp.c:80
+#: mailbox/mu_argp.c:81
msgid "Set the maximum number of times to retry acquiring the lockfile"
msgstr ""
"Initialiser le nombre maximal de tentatives pour prendre contrôle du fichier "
"de verrou"
-#: mailbox/mu_argp.c:82
+#: mailbox/mu_argp.c:83
msgid "Number of seconds after which the lock expires"
msgstr "Nombre de secondes après lesquelles le verrou expire"
-#: mailbox/mu_argp.c:83
+#: mailbox/mu_argp.c:84
msgid "PATH"
msgstr "CHEMIN"
-#: mailbox/mu_argp.c:84
+#: mailbox/mu_argp.c:85
#, fuzzy
msgid "Set full path to the external locker program"
msgstr ""
"Initialiser le chemin complet vers les programme de verrouillage externe."
-#: mailbox/mu_argp.c:91
+#: mailbox/mu_argp.c:92
msgid "Set current user's email address (default is loginname@defaultdomain)"
msgstr ""
"Initialiser l'adresse courante de courrier de l'usager "
"(nom_de_compte@domaine_par_défaut par défaut)"
-#: mailbox/mu_argp.c:92
+#: mailbox/mu_argp.c:93
msgid "DOMAIN"
msgstr "DOMAINE"
-#: mailbox/mu_argp.c:93
+#: mailbox/mu_argp.c:94
msgid "Set domain for unqualified user names (default is this host)"
msgstr ""
"Initialiser le domaine pour les noms d'usager non qualifiés (par défaut "
"l'hôte)"
-#: mailbox/mu_argp.c:99
+#: mailbox/mu_argp.c:100
msgid "MAILER"
msgstr "POSTIER"
-#: mailbox/mu_argp.c:100
+#: mailbox/mu_argp.c:101
msgid "Use specified URL as the default mailer"
msgstr "Utiliser l'URL spécifié comme postier par défaut"
-#: mailbox/mu_argp.c:106
+#: mailbox/mu_argp.c:107
msgid "FACILITY"
msgstr "UTILITAIRE"
-#: mailbox/mu_argp.c:107
+#: mailbox/mu_argp.c:108
msgid "Output logs to syslog FACILITY"
msgstr "Produire les journaux sur un UTILITAIRE de type syslog"
-#: mailbox/mu_argp.c:115
+#: mailbox/mu_argp.c:116
msgid "Runs in daemon mode with a maximum of NUMBER children"
msgstr "Exécuter en mode daemon avec un NOMBRE maximal de processus enfants"
-#: mailbox/mu_argp.c:117
+#: mailbox/mu_argp.c:118
msgid "Run in inetd mode"
msgstr "Exécuter en mode inetd"
-#: mailbox/mu_argp.c:118
+#: mailbox/mu_argp.c:119
msgid "PORT"
msgstr "PORT"
-#: mailbox/mu_argp.c:119
+#: mailbox/mu_argp.c:120
msgid "Listen on specified port number"
msgstr "Faire l'écoute sur le numéro de port spécifié"
-#: mailbox/mu_argp.c:121
+#: mailbox/mu_argp.c:122
msgid "Set idle timeout value to NUMBER seconds"
msgstr "Initialiser la minuterie d'attente à NOMBRE de secondes"
-#: mailbox/mu_argp.c:123
+#: mailbox/mu_argp.c:124
#, fuzzy
msgid "Output session transcript via syslog"
msgstr "produire la transcription de session à l'aide de syslog"
-#: mailbox/mu_argp.c:125
+#: mailbox/mu_argp.c:126
msgid "Set PID file"
msgstr "Initialiser le fichier PID"
-#: mailbox/mu_argp.c:214
+#: mailbox/mu_argp.c:215
msgid "Daemon configuration options"
msgstr "Options de configuration daemon"
-#: mailbox/mu_argp.c:249
+#: mailbox/mu_argp.c:250
#, fuzzy, c-format
msgid "Unknown facility `%s'\n"
msgstr "utilitaire inconnu « %s »\n"
-#: mailbox/mu_argp.c:387
+#: mailbox/mu_argp.c:390
#, c-format
msgid ""
"License for %s:\n"
@@ -2616,31 +2633,31 @@ msgstr ""
"Licence pour %s:\n"
"\n"
-#: mailbox/mu_argp.c:424
+#: mailbox/mu_argp.c:402
+#, fuzzy, c-format
+msgid "Cannot set mail directory name: %s"
+msgstr "Ne peut créer le répertoire %s: %s"
+
+#: mailbox/mu_argp.c:430
#, fuzzy, c-format
msgid "Invalid lock flag `%c'"
msgstr "fanion de verrouillage invalide '%c'"
-#: mailbox/mu_argp.c:464
+#: mailbox/mu_argp.c:470
#, fuzzy, c-format
msgid "Invalid email address `%s': %s"
msgstr "adresse de courrier invalide '%s': %s"
-#: mailbox/mu_argp.c:472
+#: mailbox/mu_argp.c:478
#, fuzzy, c-format
msgid "Invalid email domain `%s': %s"
msgstr "domaine de courrier invalide '%s': %s"
-#: mailbox/mu_argp.c:481
+#: mailbox/mu_argp.c:487
#, fuzzy, c-format
msgid "Invalid mailer URL `%s': %s"
msgstr "URL invalide pour le postier '%s': %s"
-#: mailbox/mu_argp.c:495
-#, fuzzy, c-format
-msgid "Badly formed mailspool path: %s"
-msgstr "chemin du dépôt de courrier mal composé: %s"
-
#: mailbox/mu_argp.c:631 mailbox/mu_argp.c:670 mailbox/mu_argp.c:710
#: mailbox/mu_argp.c:753 mailbox/mu_argp.c:782
#, c-format
@@ -2673,202 +2690,215 @@ msgstr ""
msgid "Set list of modules to be used for authorization"
msgstr "Initialiser la liste des modules à utiliser pour "
-#: mailbox/errors:18
+#: mailbox/errors:19
msgid "Operation failed"
msgstr "L'opération a échoué"
-#: mailbox/errors:20
+#: mailbox/errors:21
msgid "No registered handler"
msgstr "Handler non enregistré"
-#: mailbox/errors:21
+#: mailbox/errors:22
msgid "Empty virtual function"
msgstr "Fonction virtuelle vide"
-#: mailbox/errors:23
+#: mailbox/errors:24
msgid "Pointer to output null"
msgstr "Pointeur vers une sortie nulle"
-#: mailbox/errors:24
+#: mailbox/errors:25
msgid "Pointer to output pointer null"
msgstr "Pointeur vers une sortie nulle"
-#: mailbox/errors:26
+#: mailbox/errors:27
msgid "Mailbox null"
msgstr "Boîte aux lettres nulle"
-#: mailbox/errors:28
+#: mailbox/errors:29
msgid "Format of RFC822 object is bad"
msgstr "Format de l'objet RFC822 est erroné"
-#: mailbox/errors:29
+#: mailbox/errors:30
msgid "Address contains no addr specs"
msgstr "Adresse ne contient aucune spécification d'adresse"
-#: mailbox/errors:31
+#: mailbox/errors:32
msgid "Locker null"
msgstr "»Verrou nul"
-#: mailbox/errors:32
+#: mailbox/errors:33
msgid "Conflict with previous locker"
msgstr "En conflit avec le verrou précédent"
-#: mailbox/errors:33
+#: mailbox/errors:34
msgid "Lock file check failed"
msgstr "La vérification du fichier verrou a échoué"
-#: mailbox/errors:34
+#: mailbox/errors:35
msgid "File check failed"
msgstr "La vérification du fichier a échoué"
-#: mailbox/errors:35
+#: mailbox/errors:36
msgid "Lock not held on file"
msgstr "Aucun verrou n'est pas maintenu sur le fichier"
-#: mailbox/errors:36
+#: mailbox/errors:37
msgid "Failed to exec external locker"
msgstr "Échec lors de l'exécution du processus de verrou externe"
-#: mailbox/errors:37
+#: mailbox/errors:38
msgid "External locker failed"
msgstr "Le processus de verrou externe a échoué"
-#: mailbox/errors:38
+#: mailbox/errors:39
msgid "External locker killed"
msgstr "Le processus de verrou externe a été stoppé"
-#: mailbox/errors:40
+#: mailbox/errors:41
msgid "No such user name"
msgstr "Nom d'usager inexistant"
-#: mailbox/errors:42
+#: mailbox/errors:43
msgid "DNS name resolution failed"
msgstr "Échec de la résolution de nom DNS"
-#: mailbox/errors:43
+#: mailbox/errors:44
#, fuzzy
msgid "State busy must resume operation"
msgstr "État occupé, doit compléter l'opération"
-#: mailbox/errors:44
+#: mailbox/errors:45
msgid "Not a valid mailer from address"
msgstr "N'est pas un postier valide selon l'adresse source"
-#: mailbox/errors:45
+#: mailbox/errors:46
msgid "Not a valid mailer to address"
msgstr "N'est pas un postier valide selon l'adresse de destination"
-#: mailbox/errors:46
+#: mailbox/errors:47
msgid "No receipt addresses found"
msgstr "Aucune adresse du récipiendaire n'a été repérée"
-#: mailbox/errors:47
+#: mailbox/errors:48
msgid "Malformed or unsupported mailer URL"
msgstr "URL du postier mal composé ou non supporté"
-#: mailbox/errors:48
+#: mailbox/errors:49
msgid "SMTP rcpt to command failed"
msgstr "Échec de la commande rcpt SMTP"
-#: mailbox/errors:49
+#: mailbox/errors:50
msgid "Tcp connections need a host"
msgstr "Connexion TCP nécessite un hôte"
-#: mailbox/errors:50
+#: mailbox/errors:51
msgid "Tcp connections need a postive port"
msgstr "Connexion TCP nécessite un numéro positif de port"
-#: mailbox/errors:52
+#: mailbox/errors:53
msgid "Input string is not RFC 2047 encoded"
msgstr "Chaîne d'entrée n'est pas encodée RFC 2047"
#: mailbox/errors:54
+msgid "Not a valid RFC 2047 encoding"
+msgstr ""
+
+#: mailbox/errors:56
msgid "User name is not supplied"
msgstr "Nom d'usager n,a pas été fourni"
-#: mailbox/errors:55
+#: mailbox/errors:57
msgid "User password is not supplied"
msgstr "Mot de passe de l'usager n'a pas été fourni"
-#: mailbox/errors:57
+#: mailbox/errors:59
#, fuzzy
msgid "Unsafe file permissions. Set 0600"
msgstr "Permissions du fichier non sécuritaires; initialisées à O600."
-#: mailbox/errors:58
+#: mailbox/errors:60
msgid "Unsupported authentication scheme"
msgstr "Schème d'authentification non supporté"
-#: mailbox/errors:59
+#: mailbox/errors:61
msgid "Authentication failed"
msgstr "L'authentication a échoué"
-#: mailbox/errors:61
+#: mailbox/errors:63
msgid "Cannot execute"
msgstr "Ne peut exécuter"
-#: mailbox/errors:62
+#: mailbox/errors:64
msgid "Process exited with a non-zero status"
msgstr "Processus a terminé avec un état non à zéro"
-#: mailbox/errors:63
+#: mailbox/errors:65
msgid "Process exited on signal"
msgstr "Processus a terminé sur réception de signal"
-#: mailbox/errors:64
+#: mailbox/errors:66
msgid "Unknown failure while executing subprocess"
msgstr "Échec inconnu lors de l'exécution d'un sous-processus"
-#: mailbox/errors:65
+#: mailbox/errors:67
msgid "Connection closed by remote host"
msgstr "Connexion fermée par l'hôte distant"
-#: mailbox/errors:66
+#: mailbox/errors:68
msgid "Parse error"
msgstr "Erreur d'analyse syntaxique"
-#: mailbox/errors:67
+#: mailbox/errors:69
msgid "Requested item not found"
msgstr "Item requis n'a pas été retrouvé"
-#: mailbox/errors:68
+#: mailbox/errors:70
msgid "Not enough buffer space"
msgstr "Pas assez d'espace tampon"
-#: mailbox/errors:70
+#: mailbox/errors:72
msgid "SQL error"
msgstr "Erreur SQL"
-#: mailbox/errors:71
+#: mailbox/errors:73
msgid "Already connected to the database"
msgstr "Déjà connecté à la base de données"
-#: mailbox/errors:72
+#: mailbox/errors:74
msgid "Not connected to the database"
msgstr "Non connecté à la base de données"
-#: mailbox/errors:73
+#: mailbox/errors:75
msgid "Result of the previous query is not released"
msgstr "Résultat de la requêtre précédent n'a pas été relâché"
-#: mailbox/errors:74
+#: mailbox/errors:76
#, fuzzy
msgid "No query was yet executed"
msgstr "Aucune requête n'a été exécutée"
-#: mailbox/errors:75
+#: mailbox/errors:77
msgid "Bad column address"
msgstr "Muvaise adresse de la colonne"
-#: mailbox/errors:76
+#: mailbox/errors:78
msgid "No result from the previous query available"
msgstr "Aucun résultat de la précédente requête n'est disponible"
-#: mailbox/errors:77
+#: mailbox/errors:79
msgid "No such interface"
msgstr "Aucune telle interface"
-#: mailbox/mutil.c:581
+#: mailbox/errors:81
+msgid "Badly formed file or directory name"
+msgstr ""
+
+#: mailbox/errors:82
+#, fuzzy
+msgid "Read error"
+msgstr "Erreur regex"
+
+#: mailbox/mutil.c:590
#, c-format
msgid "Cannot open temporary file: %s"
msgstr "Ne peut ouvrir le fichier temporaire: %s"
@@ -2879,7 +2909,7 @@ msgstr "Ne peut ouvrir le fichier temporaire: %s"
#.
#. msgstr "yYbB";
#.
-#: mailbox/mutil.c:1166
+#: mailbox/mutil.c:1175
msgid "yY"
msgstr "yY (pour oui)"
@@ -2889,7 +2919,7 @@ msgstr "yY (pour oui)"
#.
#. msgstr "nNeE";
#.
-#: mailbox/mutil.c:1175
+#: mailbox/mutil.c:1184
msgid "nN"
msgstr "nN (pour non)"
@@ -2944,7 +2974,7 @@ msgstr "[msg [msg...]]"
#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
#: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
-#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:44
+#: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
msgid "FOLDER"
msgstr "RÉPERTOIRE"
@@ -3036,7 +3066,7 @@ msgstr ""
msgid "[action] [msg]"
msgstr "[action] [message]"
-#: mh/folder.c:44 pop3d/popauth.c:69
+#: mh/folder.c:44 pop3d/popauth.c:68
msgid "Actions are:"
msgstr "Les actions sont:"
@@ -3064,7 +3094,7 @@ msgstr ""
msgid "Pop the folder off the folder stack"
msgstr "Dépiler le répertoire du répertoire de pile"
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:81
+#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
msgid "Options are:"
msgstr "Les options sont:"
@@ -3114,7 +3144,7 @@ msgstr " n'a pas de message"
msgid "(others)"
msgstr "(autres)"
-#: mh/folder.c:449
+#: mh/folder.c:450
#, c-format
msgid ""
"Folder # of messages ( range ) cur msg (other "
@@ -3123,18 +3153,18 @@ msgstr ""
"Répertoire # de messages ( étendue ) cour msg (autres "
"fichiers)\n"
-#: mh/folder.c:455
+#: mh/folder.c:456
msgid "TOTAL"
msgstr "TOTAL"
-#: mh/folder.c:456
+#: mh/folder.c:457
#, c-format
msgid "%4lu message "
msgid_plural "%4lu messages "
msgstr[0] "%4lu message "
msgstr[1] "%4lu messages "
-#: mh/folder.c:459
+#: mh/folder.c:460
#, c-format
msgid "in %4lu folder"
msgid_plural "in %4lu folders"
@@ -3530,12 +3560,12 @@ msgstr "erreur d'écriture sur \"%s\": %s"
msgid "Cannot stat file %s: %s"
msgstr "ne peut évaluer par stat() le fichier %s: %s"
-#: mh/mh_init.c:585 mh/mhn.c:2231
+#: mh/mh_init.c:585 mh/mhn.c:2267
#, fuzzy, c-format
msgid "Cannot create input stream (file %s): %s"
msgstr "ne peut créer un flot d'entrée (fichier %s): %s"
-#: mh/mh_init.c:592 mh/mhn.c:2238
+#: mh/mh_init.c:592 mh/mhn.c:2274
#, fuzzy, c-format
msgid "Cannot open input stream (file %s): %s"
msgstr "ne peut ouvrir le flot d'entre (fichier %s): %s"
@@ -4033,12 +4063,12 @@ msgstr "stockage en cours du message %lu partie %s dans le fichier %s\n"
msgid "File %s already exists. Rewrite"
msgstr "Fichier %s existe déjà. Réécrire"
-#: mh/mhn.c:1680 mh/mhn.c:2497
+#: mh/mhn.c:1680 mh/mhn.c:2547
#, fuzzy, c-format
msgid "Cannot create output stream (file %s): %s"
msgstr "ne peut créer un flot de sortie (fichier %s): %s"
-#: mh/mhn.c:1688 mh/mhn.c:2505
+#: mh/mhn.c:1688 mh/mhn.c:2555
#, fuzzy, c-format
msgid "Cannot open output stream (file %s): %s"
msgstr "ne peut créer un flot de sortie (fichier %s): %s"
@@ -4053,17 +4083,17 @@ msgstr "%s:%lu: %c manquant"
msgid "%s:%lu: comment redefined"
msgstr "%s:%lu: commentaire redéfini"
-#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2115
+#: mh/mhn.c:1849 mh/mhn.c:1889 mh/mhn.c:2151
#, c-format
msgid "%s:%lu: syntax error"
msgstr "%s:%lu: erreur de syntaxe"
-#: mh/mhn.c:1858 mh/mhn.c:2082
+#: mh/mhn.c:1858 mh/mhn.c:2118
#, c-format
msgid "%s:%lu: description redefined"
msgstr "%s:%lu: description redéfinie"
-#: mh/mhn.c:1870 mh/mhn.c:2094
+#: mh/mhn.c:1870 mh/mhn.c:2130
#, c-format
msgid "%s:%lu: content id redefined"
msgstr "%s:%lu: identificateur de contenu redéfini"
@@ -4073,27 +4103,27 @@ msgstr "%s:%lu: identificateur de contenu redéfini"
msgid "%s:%lu: missing subtype"
msgstr "%s:%lu: sous-type manquant"
-#: mh/mhn.c:2129
+#: mh/mhn.c:2165
#, c-format
msgid "%s:%lu: no such message: %lu"
msgstr "%s:%lu: pas de tel message: %lu"
-#: mh/mhn.c:2220
+#: mh/mhn.c:2256
#, c-format
msgid "%s:%lu: missing filename"
msgstr "%s:%lu: nom de fichier manquant"
-#: mh/mhn.c:2276
+#: mh/mhn.c:2312
#, fuzzy, c-format
msgid "Cannot open filter stream: %s"
msgstr "ne peut ouvrir un filtre de flot: %s"
-#: mh/mhn.c:2397
+#: mh/mhn.c:2445
#, c-format
msgid "%s:%lu: unmatched #end"
msgstr "%s:%lu: #end non pairé"
-#: mh/mhn.c:2551 mh/mhn.c:2562
+#: mh/mhn.c:2601 mh/mhn.c:2612
msgid "extra arguments"
msgstr "arguments superflus"
@@ -4378,7 +4408,7 @@ msgid_plural "Draft \"%s\" exists (%lu bytes).\n"
msgstr[0] "Brouillon \"%s\" existe (%lu octet).\n"
msgstr[1] "Brouillon \"%s\" existe (%lu octets).\n"
-#: mh/repl.c:298 movemail/movemail.c:214
+#: mh/repl.c:298
#, c-format
msgid "Cannot read message %lu: %s"
msgstr "Ne peut lire le message %lu: %s"
@@ -4555,7 +4585,7 @@ msgstr "Monitorer la livraison du courrier"
msgid "* Make header fields no longer than NUMBER columns"
msgstr "* Rendre les champs d'en-tête pas plus long que le NOMBRE de colonnes"
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
msgid "Invalid number"
msgstr "Numéro invalide"
@@ -4611,7 +4641,7 @@ msgstr "Destruction du postier"
msgid "Cannot switch to background: %s"
msgstr "ne peut basculer à l'arrière plan: %s"
-#: mh/send.c:559
+#: mh/send.c:560
#, c-format
msgid "cannot stat %s: %s"
msgstr "ne peut évaluer par stat() %s: %s"
@@ -4691,9 +4721,14 @@ msgstr "authority_set_ticket a échoué"
msgid "Cannot open"
msgstr "ne peut ouvrir"
+#: movemail/movemail.c:214
+#, fuzzy, c-format
+msgid "Cannot read message %lu: %s\n"
+msgstr "Ne peut lire le message %lu: %s"
+
#: movemail/movemail.c:220
-#, c-format
-msgid "Cannot append message %lu: %s"
+#, fuzzy, c-format
+msgid "Cannot append message %lu: %s\n"
msgstr "Ne peut accoller le message %lu: %s"
#: movemail/movemail.c:251
@@ -4781,61 +4816,61 @@ msgstr "fin de fichier inattendue sur l'entrée"
msgid "Locking mailbox `%s' failed: %s"
msgstr "Ouverture du postier '%s' a échoué: %s"
-#: pop3d/pop3d.c:65
+#: pop3d/pop3d.c:64
msgid "GNU pop3d -- the POP3 daemon"
msgstr "GNU pop3d -- le daemon POP3"
-#: pop3d/pop3d.c:75
+#: pop3d/pop3d.c:74
msgid "Undelete all messages on startup"
msgstr "Ne pas détruire tous les messages lors du démarrage"
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:77
msgid "Allowed delay between the two successive logins"
msgstr "Permettre un délai entre deux logins successifs"
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d