summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2004-01-13 11:02:03 +0000
committerWojciech Polak <polak@gnu.org>2004-01-13 11:02:03 +0000
commit96435a4d7de61fdd5aff4971770089c8d08f48d6 (patch)
treee809bfb40d5752fc6749f35abe058ac9a7f6e512
parentfb6c2751c8e31256d0dbd5b954e065a37de36ad7 (diff)
downloadmailutils-96435a4d7de61fdd5aff4971770089c8d08f48d6.tar.gz
mailutils-96435a4d7de61fdd5aff4971770089c8d08f48d6.tar.bz2
Fixed
-rw-r--r--frm/frm.c14
-rw-r--r--from/from.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/frm/frm.c b/frm/frm.c
index efbb3d0b5..cc4c1d7aa 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -248,6 +248,7 @@ static int
action (observer_t o, size_t type)
{
static int counter;
+ int status;
switch (type)
{
@@ -296,7 +297,7 @@ action (observer_t o, size_t type)
if (show_field)
{
char hfield[256];
- int status = header_get_value_unfold (hdr, show_field, hfield,
+ status = header_get_value_unfold (hdr, show_field, hfield,
sizeof (hfield), NULL);
if (status == 0)
printf ("%s", hfield);
@@ -305,7 +306,8 @@ action (observer_t o, size_t type)
if (show_to)
{
char hto[16];
- int status = get_personal (hdr, MU_HEADER_TO, hto, sizeof (hto));
+ status = get_personal (hdr, MU_HEADER_TO, hto, sizeof (hto));
+
if (status == 0)
printf ("(%s) ", hto);
else
@@ -315,7 +317,7 @@ action (observer_t o, size_t type)
if (show_from)
{
char hfrom[32];
- int status = get_personal (hdr, MU_HEADER_FROM, hfrom,
+ status = get_personal (hdr, MU_HEADER_FROM, hfrom,
sizeof (hfrom));
if (status == 0)
printf ("%s\t", hfrom);
@@ -326,13 +328,15 @@ action (observer_t o, size_t type)
if (show_subject)
{
char hsubject[64];
- int status = header_get_value_unfold (hdr, MU_HEADER_SUBJECT,
+ status = header_get_value_unfold (hdr, MU_HEADER_SUBJECT,
hsubject,
sizeof (hsubject), NULL);
- frm_rfc2047_decode (hsubject, sizeof (hsubject));
if (status == 0)
+ {
+ frm_rfc2047_decode (hsubject, sizeof (hsubject));
printf ("%s", hsubject);
}
+ }
printf ("\n");
break;
}
diff --git a/from/from.c b/from/from.c
index 3579b3d58..bf5376e70 100644
--- a/from/from.c
+++ b/from/from.c
@@ -197,7 +197,7 @@ main (int argc, char **argv)
if ((status = mailbox_get_message (mbox, i, &msg)) != 0
|| (status = message_get_header (msg, &hdr)) != 0)
{
- mu_error (_("msg %d : %s\n"), i, mu_strerror (status));
+ mu_error (_("msg %d : %s"), i, mu_strerror (status));
exit (2);
}

Return to:

Send suggestions and report system problems to the System administrator.