diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-03-06 14:29:25 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-03-06 14:29:25 +0000 |
commit | 9228442de1e8cfa7bb819d8d4a85b1c05975a200 (patch) | |
tree | d0ee4e977d2c42cc758f9ed5402a93d269cb9550 /frm | |
parent | 6223b874ac531c041625acc49b9daff69607188e (diff) | |
download | mailutils-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.c | 17 | ||||
-rw-r--r-- | frm/from.c | 2 |
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 | |||
@@ -513,7 +513,7 @@ frm_abort (mailbox_t *mbox) | |||
513 | { | 513 | { |
514 | url_t url; | 514 | url_t url; |
515 | 515 | ||
516 | mu_error (_("Could not close <%s>: %s."), | 516 | mu_error (_("Could not close mailbox `%s': %s"), |
517 | url_to_string (url), mu_strerror (status)); | 517 | url_to_string (url), mu_strerror (status)); |
518 | exit (3); | 518 | exit (3); |
519 | } | 519 | } |
@@ -540,9 +540,12 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total) | |||
540 | status = mailbox_create_default (&mbox, mailbox_name); | 540 | status = mailbox_create_default (&mbox, mailbox_name); |
541 | if (status != 0) | 541 | if (status != 0) |
542 | { | 542 | { |
543 | mu_error (_("Could not create mailbox <%s>: %s."), | 543 | if (mailbox_name) |
544 | mailbox_name ? mailbox_name : _("default"), | 544 | mu_error (_("Could not create mailbox `%s': %s"), |
545 | mu_strerror (status)); | 545 | mailbox_name, mu_strerror (status)); |
546 | else | ||
547 | mu_error (_("Could not create default mailbox: %s"), | ||
548 | mu_strerror (status)); | ||
546 | exit (3); | 549 | exit (3); |
547 | } | 550 | } |
548 | 551 | ||
@@ -560,7 +563,7 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total) | |||
560 | *total = 0; | 563 | *total = 0; |
561 | else if (status != 0) | 564 | else if (status != 0) |
562 | { | 565 | { |
563 | mu_error (_("Could not open mailbox <%s>: %s."), | 566 | mu_error (_("Could not open mailbox `%s': %s"), |
564 | url_to_string (url), mu_strerror (status)); | 567 | url_to_string (url), mu_strerror (status)); |
565 | frm_abort (&mbox); | 568 | frm_abort (&mbox); |
566 | } | 569 | } |
@@ -580,7 +583,7 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total) | |||
580 | status = mailbox_scan (mbox, 1, total); | 583 | status = mailbox_scan (mbox, 1, total); |
581 | if (status != 0) | 584 | if (status != 0) |
582 | { | 585 | { |
583 | mu_error (_("Could not scan mailbox <%s>: %s."), | 586 | mu_error (_("Could not scan mailbox `%s': %s."), |
584 | url_to_string (url), mu_strerror (status)); | 587 | url_to_string (url), mu_strerror (status)); |
585 | frm_abort (&mbox); | 588 | frm_abort (&mbox); |
586 | } | 589 | } |
@@ -590,7 +593,7 @@ frm_scan (char *mailbox_name, frm_select_t fun, size_t *total) | |||
590 | 593 | ||
591 | if ((status = mailbox_close (mbox)) != 0) | 594 | if ((status = mailbox_close (mbox)) != 0) |
592 | { | 595 | { |
593 | mu_error (_("Could not close <%s>: %s."), | 596 | mu_error (_("Could not close mailbox `%s': %s"), |
594 | url_to_string (url), mu_strerror (status)); | 597 | url_to_string (url), mu_strerror (status)); |
595 | exit (3); | 598 | exit (3); |
596 | } | 599 | } |
diff --git a/frm/from.c b/frm/from.c index e8a09553b..a188be38c 100644 --- a/frm/from.c +++ b/frm/from.c | |||
@@ -25,7 +25,7 @@ const char *program_version = "from (" PACKAGE_STRING ")"; | |||
25 | static char doc[] = N_("GNU from -- display from and subject"); | 25 | static char doc[] = N_("GNU from -- display from and subject"); |
26 | 26 | ||
27 | static struct argp_option options[] = { | 27 | static struct argp_option options[] = { |
28 | {"count", 'c', NULL, 0, N_("Just print a count of messages and exit.")}, | 28 | {"count", 'c', NULL, 0, N_("Just print a count of messages and exit")}, |
29 | {"sender", 's', N_("ADDRESS"), 0, | 29 | {"sender", 's', N_("ADDRESS"), 0, |
30 | N_("Print only mail from addresses containing the supplied string") }, | 30 | N_("Print only mail from addresses containing the supplied string") }, |
31 | {"file", 'f', N_("FILE"), 0, | 31 | {"file", 'f', N_("FILE"), 0, |