[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated
|
From: |
David Levine |
|
Subject: |
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 62780d8a7c214bbb3301402fee5a5eb980b3069d |
|
Date: |
Fri, 09 Mar 2012 03:30:37 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".
The branch, master has been updated
via 62780d8a7c214bbb3301402fee5a5eb980b3069d (commit)
via 2b907b9a1126fe5b47204b2f778f8689af593476 (commit)
via e39c2471b6e2166d2e8a4cb515b4493936cf5203 (commit)
from 8a87f7b5fd5622dcde0fc4b48d93157616b496f0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=62780d8a7c214bbb3301402fee5a5eb980b3069d
commit 62780d8a7c214bbb3301402fee5a5eb980b3069d
Author: David Levine <address@hidden>
Date: Thu Mar 8 21:29:28 2012 -0600
Enabled all groff warnings, with -ww, in manpages test. Fixed a bunch
of minor problems that it revealed.
diff --git a/man/ap.man b/man/ap.man
index 0363639..33628e2 100644
--- a/man/ap.man
+++ b/man/ap.man
@@ -55,7 +55,7 @@ also recognizes the following additional escape:
.RS 5
.nf
.ta \w'Escape 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
error string A diagnostic if the parse failed
.RE
.fi
diff --git a/man/comp.man b/man/comp.man
index 0fddc26..c07b211 100644
--- a/man/comp.man
+++ b/man/comp.man
@@ -138,7 +138,7 @@ escapes are either new or have an alternate meaning:
.RS 5
.nf
.ta \w'Escape 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
fcc string Any folders specified with `\-fcc\ folder'
from string Any addresses specified with `\-from\ address'
to string Any addresses specified with `\-to\ address'
@@ -164,7 +164,7 @@ overridden by using the
.B \-from
.I address
switch. The default mailbox in the \*(lqFcc:\*(rq field is
-.IR \+outbox .
+.IR +outbox .
This can be overridden by the
.B \-fcc
switch.
diff --git a/man/dist.man b/man/dist.man
index cbb8bda..63292c0 100644
--- a/man/dist.man
+++ b/man/dist.man
@@ -80,7 +80,7 @@ escapes are also supported:
.RS 5
.nf
.ta \w'Escape 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
fcc string Any folders specified with `\-fcc\ folder'
nmh\-from string Addresses specified with `\-from\ address'
nmh\-to string Addresses specified with `\-to\ address'
diff --git a/man/forw.man b/man/forw.man
index e6fa01a..0223207 100644
--- a/man/forw.man
+++ b/man/forw.man
@@ -111,7 +111,7 @@ escapes are also supported:
.RS 5
.nf
.ta \w'nmh\-subject 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
fcc string Any folders specified with `\-fcc\ folder'
nmh\-from string Addresses specified with `\-from\ address'
nmh\-to string Addresses specified with `\-to\ address'
@@ -137,7 +137,7 @@ by using the
.B \-from
.I address
switch. The default mailbox in the \*(lqFcc:\*(rq field is
-.IR \+outbox .
+.IR +outbox .
This can be overridden by the
.B \-fcc
switch.
@@ -382,7 +382,7 @@ Specifying these switches enables and/or overloads the
following escapes:
.RS 5
.nf
.ta \w'Component 'u +\w'Escape 'u +\w'Returns 'u
-.I Type Escape Returns Description
+.I "Type Escape Returns Description"
component digest string Argument to `\-digest'
function cur integer Argument to `\-volume'
function msg integer Argument to `\-issue'
diff --git a/man/mh-format.man b/man/mh-format.man
index 2d1c69e..0ecb791 100644
--- a/man/mh-format.man
+++ b/man/mh-format.man
@@ -153,7 +153,7 @@ these include:
.RS 5
.nf
.ta +\w'Argument 'u +\w'An optional component, 'u
-.I Argument Description Example Syntax
+.I "Argument Description Example Syntax"
literal A literal number %(\fIfunc\fR 1234)
or string %(\fIfunc\fR text string)
comp Any component %(\fIfunc\fR\^{\fIin-reply-to\fR\^})
@@ -251,7 +251,7 @@ The function escapes may be roughly grouped into a few
categories.
.RS 5
.nf
.ta \w'Fformataddr 'u +\w'Aboolean 'u +\w'Rboolean 'u
-.I Function Argument Result Description
+.I "Function Argument Result Description"
msg integer message number
cur integer message is current (0 or 1)
unseen integer message is unseen (0 or 1)
@@ -341,7 +341,7 @@ The following functions require a date component as an
argument:
.RS 5
.nf
.ta \w'Fformataddr 'u +\w'Aboolean 'u +\w'Rboolean 'u
-.I Function Argument Return Description
+.I "Function Argument Return Description"
sec date integer seconds of the minute
min date integer minutes of the hour
hour date integer hours of the day (0-23)
@@ -377,7 +377,7 @@ the first address present in the header component.
.RS 5
.nf
.ta \w'Fformataddr 'u +\w'Aboolean 'u +\w'Rboolean 'u
-.I Function Argument Return Description
+.I "Function Argument Return Description"
proper addr string official 822 rendering
friendly addr string user-friendly rendering
addr addr string address@hidden or host!mbox rendering*
diff --git a/man/mh-sequence.man b/man/mh-sequence.man
index 12fdb1c..68941eb 100644
--- a/man/mh-sequence.man
+++ b/man/mh-sequence.man
@@ -27,7 +27,7 @@ or one of these \*(lqreserved\*(rq message names:
.RS 5
.nf
.ta +\w'\fIName\fP 'u
-.I Name Description
+.I "Name Description"
first the first message in the folder
last the last message in the folder
cur the most recently accessed message
diff --git a/man/mhl.man b/man/mhl.man
index a5dc12e..cc5254d 100644
--- a/man/mhl.man
+++ b/man/mhl.man
@@ -207,7 +207,7 @@ bell, clearscreen, width, length).
.RS 5
.nf
.ta \w'noclearscreen 'u +\w'integer/G 'u
-.I variable type semantics
+.I "variable type semantics"
width integer screen width or component width
length integer screen length or component length
offset integer positions to indent \*(lqcomponent: \*(rq
diff --git a/man/rcvdist.man b/man/rcvdist.man
index f24ea8e..b82ae53 100644
--- a/man/rcvdist.man
+++ b/man/rcvdist.man
@@ -50,7 +50,7 @@ escape:
.RS 5
.nf
.ta \w'Dtimenow 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
addresses string the addresses to distribute to
.fi
.RE
diff --git a/man/repl.man b/man/repl.man
index 112cca9..4c04887 100644
--- a/man/repl.man
+++ b/man/repl.man
@@ -394,7 +394,7 @@ escape:
.RS 5
.nf
.ta \w'Escape 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
fcc string Any folders specified with `\-fcc\ folder'
.fi
.RE
diff --git a/man/scan.man b/man/scan.man
index d9d5271..0d0b762 100644
--- a/man/scan.man
+++ b/man/scan.man
@@ -37,7 +37,7 @@ and, if room allows, some of the body of the message. For
example:
.nf
.ta \w'15+- 'u +\w'07/\|05x 'u +\w'Dcrocker 'u
15+ 10/\|05 crocker nned\0\0<<Last week I asked some of
-16\- 10/\|05 crocker message id format\0\0\<<I recommend
+16\- 10/\|05 crocker message id format\0\0<<I recommend
18 10/\|06 brien Re: Exit status from mkdir
19 10/\|07*brien \*(lqscan\*(rq listing format in nmh
.fi
@@ -172,7 +172,7 @@ escapes:
.RS 5
.nf
.ta \w'Dtimenow 'u +\w'Returns 'u
-.I Escape Returns Description
+.I "Escape Returns Description"
body string the (compressed) first part of the body
dtimenow date the current date
folder string the name of the current folder
diff --git a/man/slocal.man b/man/slocal.man
index da1e576..d7a4502 100644
--- a/man/slocal.man
+++ b/man/slocal.man
@@ -129,7 +129,6 @@ You should include the line
.PP
.ce
\*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
-.RE
.PP
in your \&.forward file in your home directory. This will cause
your MTA to invoke
@@ -153,7 +152,7 @@ The format of each line in the
file is:
.PP
.RS 5
-.B header pattern action result string
+.B "header pattern action result string"
.RE
.PP
.BR header :
diff --git a/test/manpages/test-manpages b/test/manpages/test-manpages
index 4865985..ce7d443 100755
--- a/test/manpages/test-manpages
+++ b/test/manpages/test-manpages
@@ -32,7 +32,7 @@ rm -f "$expected" "$actual"
touch "$expected" "$actual"
for manpage in man?/*.?; do
- groff -Tutf8 -mandoc -wmac "$manpage" > /dev/null 2>>"$actual"
+ groff -Tutf8 -mandoc -ww "$manpage" > /dev/null 2>>"$actual"
done
check "$expected" "$actual"
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=2b907b9a1126fe5b47204b2f778f8689af593476
commit 2b907b9a1126fe5b47204b2f778f8689af593476
Author: David Levine <address@hidden>
Date: Thu Mar 8 21:09:59 2012 -0600
Fixed mhlist -verbose to work with all content types [Bug #35219].
diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 111cb2f..70377cd 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -41,3 +41,5 @@ Things to add to the release notes for the next full release:
or the local mailbox.
- burst(1) now supports any valid message delimiter according to RFC 934.
- A problem with the MD5 digest calculator on 64-bit systems has been fixed.
+- Fixed mhbuild -check to properly insert Content-MD5 header.
+- Fixed mhlist -verbose to work with all content types [Bug #35219].
diff --git a/test/mhlist/test-mhlist b/test/mhlist/test-mhlist
index 91748b1..c1bac06 100755
--- a/test/mhlist/test-mhlist
+++ b/test/mhlist/test-mhlist
@@ -102,7 +102,7 @@ Content-Transfer-Encoding: quoted-printable
This is the second text/plain part.
------- =_aaaaaaaaaa0
-Content-Type: text/plain; charset="iso-8859-1"
+Content-Type: text/plain; charset="iso-8859-1"; name="test3"
Content-Disposition: attachment; filename="test3"
This is the third text/plain part.
@@ -119,19 +119,19 @@ EOF
# check -part
run_test 'mhlist last -part 3 -noheader' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
3 text/plain 35'
# check -part of a subpart
run_test 'mhlist last -part 1.1 -noheader' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
1.1 text/plain 49'
# check -type
run_test 'mhlist last -type text/plain -noheader' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
1.1 text/plain 49
2 text/plain 36
@@ -140,19 +140,19 @@ run_test 'mhlist last -type text/plain -noheader' \
# check -norealsize
run_test 'mhlist last -part 4 -noheader -norealsize' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
4 text/plain 49'
# check -realsize, the default
run_test 'mhlist last -part 4 -noheader -norealsize -realsize' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
4 text/plain 36'
# check -check
run_test 'mhlist last -part 2 -noheader -check' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
2 text/plain 36'
@@ -160,7 +160,7 @@ run_test 'mhlist last -part 2 -noheader -check' \
sed 's/\(Content-MD5: \)kq+Hnc/\1BADBAD/' $msgfile > $MH_TEST_DIR/$$.tmp
mv -f $MH_TEST_DIR/$$.tmp $msgfile
run_test 'mhlist last -part 2 -noheader -check' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
2 text/plain 36
mhlist: content integrity suspect (digest mismatch) -- continuing
@@ -168,8 +168,26 @@ mhlist: content integrity suspect (digest mismatch) --
continuing
# check -nocheck, the default
run_test 'mhlist last -part 2 -noheader -check -nocheck' \
-' 11 multipart/mixed 922
+' 11 multipart/mixed 936
1 multipart/related 180
2 text/plain 36'
+# check -verbose
+run_test 'mhlist 11 -verbose -noheader' \
+' 11 multipart/mixed 936
+ boundary="----- =_aaaaaaaaaa0"
+ 1 multipart/related 180
+ type="multipart/alternative"
+ boundary="subpart__1.1"
+ 1.1 text/plain 49
+ charset="iso-8859-1"
+ 2 text/plain 36
+ charset="iso-8859-1"
+ 3 text/plain 35
+ charset="iso-8859-1"
+ name="test3"
+ 4 text/plain 36
+ charset="iso-8859-1"'
+
+
exit $failed
diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 1aac74a..a4e831a 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -206,18 +206,26 @@ list_content (CT ct, int toplevel, int realsize, int
verbose, int debug)
printf ("\n");
- /*
- * If verbose, print any RFC-822 comments in the
- * Content-Type line.
- */
- if (verbose && ci->ci_comment) {
- char *dp;
+ if (verbose) {
+ char **ap, **ep;
+ CI ci = &ct->c_ctinfo;
- dp = trimcpy (cp = add (ci->ci_comment, NULL));
- free (cp);
- snprintf (buffer, sizeof(buffer), "(%s)", dp);
- free (dp);
- printf (LSTFMT2d2, buffer);
+ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
+ printf ("\t %s=\"%s\"\n", *ap, *ep);
+
+ /*
+ * If verbose, print any RFC-822 comments in the
+ * Content-Type line.
+ */
+ if (ci->ci_comment) {
+ char *dp;
+
+ dp = trimcpy (cp = add (ci->ci_comment, NULL));
+ free (cp);
+ snprintf (buffer, sizeof(buffer), "(%s)", dp);
+ free (dp);
+ printf (LSTFMT2d2, buffer);
+ }
}
if (debug)
@@ -394,19 +402,15 @@ list_external (CT ct, int toplevel, int realsize, int
verbose, int debug)
/*
* list content information for type "application"
+ * This no longer needs to be a separate function. It used to
+ * produce some output with verbose enabled, but that has been
+ * moved to list_content ().
*/
static int
list_application (CT ct, int toplevel, int realsize, int verbose, int debug)
{
list_content (ct, toplevel, realsize, verbose, debug);
- if (verbose) {
- char **ap, **ep;
- CI ci = &ct->c_ctinfo;
-
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
- printf ("\t %s=\"%s\"\n", *ap, *ep);
- }
return OK;
}
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=e39c2471b6e2166d2e8a4cb515b4493936cf5203
commit e39c2471b6e2166d2e8a4cb515b4493936cf5203
Author: David Levine <address@hidden>
Date: Thu Mar 8 20:19:53 2012 -0600
1) Removed -noverbose from defaults of mhshow man page. While it
accepts -verbose/-noverbose, it ignores them.
2) Added -verbose/-noverbose to mhlist synopsis.
diff --git a/man/mh-chart.man b/man/mh-chart.man
index 785628d..bf127ae 100644
--- a/man/mh-chart.man
+++ b/man/mh-chart.man
@@ -339,6 +339,7 @@ is equivalent to
.RB [ \-wcache
.IR policy ]
.RB [ \-check " | " \-nocheck ]
+.RB [ \-verbose " | " \-noverbose ]
.RB [ \-version ]
.RB [ \-help ]
diff --git a/man/mhlist.man b/man/mhlist.man
index 3db222e..73cf63d 100644
--- a/man/mhlist.man
+++ b/man/mhlist.man
@@ -25,6 +25,7 @@ mhlist \- list information about MIME messages
.RB [ \-wcache
.IR policy ]
.RB [ \-check " | " \-nocheck ]
+.RB [ \-verbose " | " \-noverbose ]
.RB [ \-version ]
.RB [ \-help ]
.ad
diff --git a/man/mhshow.man b/man/mhshow.man
index a3117df..fc9e9e8 100644
--- a/man/mhshow.man
+++ b/man/mhshow.man
@@ -596,7 +596,6 @@ mhbuild(1), mhl(1), mhlist(1), mhstore(1), sendfiles(1)
.RB ` \-rcache\ ask '
.RB ` \-realsize '
.RB ` \-noserialonly '
-.RB ` \-noverbose '
.RB ` \-wcache\ ask '
.fi
-----------------------------------------------------------------------
Summary of changes:
docs/pending-release-notes | 2 ++
man/ap.man | 2 +-
man/comp.man | 4 ++--
man/dist.man | 2 +-
man/forw.man | 6 +++---
man/mh-chart.man | 1 +
man/mh-format.man | 8 ++++----
man/mh-sequence.man | 2 +-
man/mhl.man | 2 +-
man/mhlist.man | 1 +
man/mhshow.man | 1 -
man/rcvdist.man | 2 +-
man/repl.man | 2 +-
man/scan.man | 4 ++--
man/slocal.man | 3 +--
test/manpages/test-manpages | 2 +-
test/mhlist/test-mhlist | 36 +++++++++++++++++++++++++++---------
uip/mhlistsbr.c | 40 ++++++++++++++++++++++------------------
18 files changed, 72 insertions(+), 48 deletions(-)
hooks/post-receive
--
The nmh Mail Handling System
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 62780d8a7c214bbb3301402fee5a5eb980b3069d,
David Levine <=