summaryrefslogtreecommitdiff
path: root/frm
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-03-06 14:29:25 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-03-06 14:29:25 +0000
commit9228442de1e8cfa7bb819d8d4a85b1c05975a200 (patch)
treed0ee4e977d2c42cc758f9ed5402a93d269cb9550 /frm
parent6223b874ac531c041625acc49b9daff69607188e (diff)
downloadmailutils-9228442de1e8cfa7bb819d8d4a85b1c05975a200.tar.gz
mailutils-9228442de1e8cfa7bb819d8d4a85b1c05975a200.tar.bz2
Use a uniform way of filename quoting in diagnostic messages.
Diffstat (limited to 'frm')
-rw-r--r--frm/common.c17
-rw-r--r--frm/from.c2
2 files changed, 11 insertions, 8 deletions
diff --git a/frm/common.c b/frm/common.c
index bc6ad1a3a..444053a82 100644
--- a/frm/common.c
+++ b/frm/common.c
@@ -510,13 +510,13 @@ frm_abort (mailbox_t *mbox)
int status;
if ((status = mailbox_close (*mbox)) != 0)
{
url_t url;
- mu_error (_("Could not close <%s>: %s."),
+ mu_error (_("Could not close mailbox `%s': %s"),
url_to_string (url), mu_strerror (status));
exit (3);
}
mailbox_destroy (mbox);
exit (3);
@@ -537,15 +537,18 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total)
int status;
url_t url;
status = mailbox_create_default (&mbox, mailbox_name);
if (status != 0)
{
- mu_error (_("Could not create mailbox <%s>: %s."),
- mailbox_name ? mailbox_name : _("default"),
- mu_strerror (status));
+ if (mailbox_name)
+ mu_error (_("Could not create mailbox `%s': %s"),
+ mailbox_name, mu_strerror (status));
+ else
+ mu_error (_("Could not create default mailbox: %s"),
+ mu_strerror (status));
exit (3);
}
if (frm_debug)
{
mu_debug_t debug;
@@ -557,13 +560,13 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total)
status = mailbox_open (mbox, MU_STREAM_READ);
if (status == ENOENT)
*total = 0;
else if (status != 0)
{
- mu_error (_("Could not open mailbox <%s>: %s."),
+ mu_error (_("Could not open mailbox `%s': %s"),
url_to_string (url), mu_strerror (status));
frm_abort (&mbox);
}
else
{
observer_t observer;
@@ -577,23 +580,23 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total)
mailbox_get_observable (mbox, &observable);
observable_attach (observable, MU_EVT_MESSAGE_ADD, observer);
status = mailbox_scan (mbox, 1, total);
if (status != 0)
{
- mu_error (_("Could not scan mailbox <%s>: %s."),
+ mu_error (_("Could not scan mailbox `%s': %s."),
url_to_string (url), mu_strerror (status));
frm_abort (&mbox);
}
observable_detach (observable, observer);
observer_destroy (&observer, mbox);
if ((status = mailbox_close (mbox)) != 0)
{
- mu_error (_("Could not close <%s>: %s."),
+ mu_error (_("Could not close mailbox `%s': %s"),
url_to_string (url), mu_strerror (status));
exit (3);
}
}
mailbox_destroy (&mbox);
}
diff --git a/frm/from.c b/frm/from.c
index e8a09553b..a188be38c 100644
--- a/frm/from.c
+++ b/frm/from.c
@@ -22,13 +22,13 @@ char *sender_option;
char *mailbox_name;
const char *program_version = "from (" PACKAGE_STRING ")";
static char doc[] = N_("GNU from -- display from and subject");
static struct argp_option options[] = {
- {"count", 'c', NULL, 0, N_("Just print a count of messages and exit.")},
+ {"count", 'c', NULL, 0, N_("Just print a count of messages and exit")},
{"sender", 's', N_("ADDRESS"), 0,
N_("Print only mail from addresses containing the supplied string") },
{"file", 'f', N_("FILE"), 0,
N_("Read mail from FILE") },
{"debug", 'd', NULL, 0, N_("Enable debugging output"), 0},
{0, 0, 0, 0}

Return to:

Send suggestions and report system problems to the System administrator.