Changed -header-field to -headerfield. And refer to its argument

as name:value instead of name:body, to avoid the obvious confusion.

diff --git a/man/mhmail.man b/man/mhmail.man
index 4f1635a414874158d29901b17d1f4aa0b8dfbd56..a374b3d3fb1bc46178ab987095580ffc45894992 100644 (file)
--- a/man/mhmail.man
+++ b/man/mhmail.man
@@ -19,8 +19,8 @@ mhmail \- send or read mail
 \&...]
 .RB [ \-from
 .IR addr ]
 \&...]
 .RB [ \-from
 .IR addr ]

-.RB [ \-header\-field
-.IR name:body ]
+.RB [ \-headerfield
+.IR name:value ]

 .RB [ \-subject
 .IR subject ]
 .RB [ \-resent ]
 .RB [ \-subject
 .IR subject ]
 .RB [ \-resent ]


@@ -130,22 +130,27 @@ will fill\-in the \*(lqSender:\*(rq
 header correctly.
 .PP
 The
 header correctly.
 .PP
 The

-.B \-header\-field
-.I name:body
-switch adds a header field with the specified name and body to the
-message.  There need not be a space after the colon that separates the
-name and body in the argument to this switch.  It is usually best to
+.B \-headerfield
+.I name:value
+switch adds a header field with the specified name and value to the
+message.  (The
+.I value
+is called the
+.I field body
+in RFC 2822, but that's too easily confused with the message body.)
+There need not be a space after the colon that separates the
+name and value in the argument to this switch.  It is usually best to

 enclose the argument in quotes to protect it from the shell.  The
 enclose the argument in quotes to protect it from the shell.  The

-.B \-header\-field
+.B \-headerfield

 switch may be given multiple times to add multiple header fields,
 for example,
 .PP
 .RS 5
 .nf
 mhmail -from sender@example.com \\
 switch may be given multiple times to add multiple header fields,
 for example,
 .PP
 .RS 5
 .nf
 mhmail -from sender@example.com \\

--header\-field 'MIME-Version:1.0' \\
--header\-field 'Content-Type:text/plain; charset=utf-8' \\
--header\-field 'Content-Transfer-Encoding:8bit' \\
+-headerfield 'MIME-Version:1.0' \\
+-headerfield 'Content-Type:text/plain; charset=utf-8' \\
+-headerfield 'Content-Transfer-Encoding:8bit' \\

 recipient@example.com
 .fi
 .RE
 recipient@example.com
 .fi
 .RE

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index e8fbac8ae3018bb1f335182617757eda7c234435..0877d06ef16fc7f41c6f95fdb6f6b25fda5a7960 100755 (executable)
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -79,7 +79,7 @@ Usage: mhmail [addrs ... [switches]]
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr

-  -hea(der-field) name:field [-hea(der-field) name:field] ...
+  -hea(derfield) name:value [-hea(derfield) name:value] ...

   -su(bject) text
   -r(esent)
   -pr(ofile)
   -su(bject) text
   -r(esent)
   -pr(ofile)


@@ -690,7 +690,7 @@ please resend this message, 3'
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}
 
 
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}
 
 

-# check -header-field.
+# check -headerfield.

 # Not supported by compiled mhmail.
 cat > "$expected" <<EOF
 EHLO nosuchhost.example.com
 # Not supported by compiled mhmail.
 cat > "$expected" <<EOF
 EHLO nosuchhost.example.com


@@ -708,13 +708,13 @@ QUIT
 EOF
 
 test_mhmail "$expected" \
 EOF
 
 test_mhmail "$expected" \

-  '-from sender@example.com -header-field User-Agent:nmh' \
+  '-from sender@example.com -headerfield User-Agent:nmh' \

   -b 'with added header field'
 
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}
 
 
   -b 'with added header field'
 
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}
 
 

-# check multiple -header-fields.
+# check multiple -headerfields.

 # Not supported by compiled mhmail.
 cat > "$expected" <<EOF
 EHLO nosuchhost.example.com
 # Not supported by compiled mhmail.
 cat > "$expected" <<EOF
 EHLO nosuchhost.example.com


@@ -734,9 +734,9 @@ QUIT
 EOF
 
 test_mhmail "$expected" \
 EOF
 
 test_mhmail "$expected" \

-  "-from sender@example.com -header-field MIME-Version:1.0 \
--header-field Content-Type:text/plain;charset=utf-8 \
--header-field Content-Transfer-Encoding:8bit" \
+  "-from sender@example.com -headerfield MIME-Version:1.0 \
+-headerfield Content-Type:text/plain;charset=utf-8 \
+-headerfield Content-Transfer-Encoding:8bit" \

   -b 'with added header fields'
 
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}
   -b 'with added header fields'
 
 [ ${failed:-0} -eq 0 ] || exit ${failed:-0}

diff --git a/uip/mhmail b/uip/mhmail
index bcb9bd3caf50d26d410f9ba6589f7cca4ef0d58b..f5cebb6d6f28b2fc93541d48e572d7ef2ff155a9 100755 (executable)
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -7,7 +7,7 @@
 # complete copyright information.
 #
 # Emulation of compiled mhmail(1), with these differences:
 # complete copyright information.
 #
 # Emulation of compiled mhmail(1), with these differences:

-# * Adds -send/-nosend, -header-field, and -attach options.
+# * Adds -send/-nosend, -headerfield, and -attach options.

 # * Supports all post(8) (by default, without -profile) or send(1)
 #   (with -profile) options.
 # * Optionally (with -profile) obeys the users profile, including
 # * Supports all post(8) (by default, without -profile) or send(1)
 #   (with -profile) options.
 # * Optionally (with -profile) obeys the users profile, including


@@ -23,7 +23,7 @@ usage='Usage: mhmail [addrs ... [switches]]
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr

-  -hea(der-field) name:field [-hea(der-field) name:field] ...
+  -hea(derfield) name:value [-hea(derfield) name:value] ...

   -su(bject) text
   -r(esent)
   -pr(ofile)
   -su(bject) text
   -r(esent)
   -pr(ofile)


@@ -84,7 +84,7 @@ else
       -b|-bo|-bod|-body) bodyarg=1 ;;
       -c|-cc) ccarg=1 ;;
       -f|-fr|-fro|-from) fromarg=1 ;;
       -b|-bo|-bod|-body) bodyarg=1 ;;
       -c|-cc) ccarg=1 ;;
       -f|-fr|-fro|-from) fromarg=1 ;;

-      -hea|-head|-heade|-header|-header-|-header-f|-header-fi|-header-fie|-header-fiel|-header-field) headerfieldarg=1 ;;
+      -hea|-head|-heade|-header|-headerf|-headerfi|-headerfie|-headerfiel|-headerfield) headerfieldarg=1 ;;

       -hel|-help) printf "%s\n" "${usage}"; exit ;;
       -nose|-nosen|-nosend) sendsw=0 ;;
       -p|-pr|-pro|-prof|-profi|-profil|-profile) use_send=1 ;;
       -hel|-help) printf "%s\n" "${usage}"; exit ;;
       -nose|-nosen|-nosend) sendsw=0 ;;
       -p|-pr|-pro|-prof|-profi|-profil|-profile) use_send=1 ;;