Browse Source

Plan 9 from Bell Labs 2007-05-14

David du Colombier 14 years ago
parent
commit
ccb3af65a8
5 changed files with 268 additions and 263 deletions
  1. 4 3
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 38 42
      sys/man/1/marshal
  5. 218 214
      sys/src/cmd/upas/marshal/marshal.c

+ 4 - 3
dist/replica/_plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1176581009 402158
+386/9loaddebug - 775 sys sys 1179086411 417004
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1176581010 202587
 386/9pc - 775 sys sys 1161230890 1924142
@@ -7395,7 +7395,7 @@ sys/man/1/lp - 664 sys sys 1113743326 3329
 sys/man/1/ls - 664 sys sys 1113743327 2890
 sys/man/1/mail - 664 sys sys 1050078464 2158
 sys/man/1/man - 664 sys sys 1165622295 2006
-sys/man/1/marshal - 664 sys sys 1165622300 3149
+sys/man/1/marshal - 664 sys sys 1179087317 3176
 sys/man/1/mc - 664 sys sys 1113743326 552
 sys/man/1/mk - 664 sys sys 1113743328 13198
 sys/man/1/mkdir - 664 sys sys 1082593141 717
@@ -14168,7 +14168,7 @@ sys/src/cmd/upas/fs/rfc2047-test - 664 sys sys 1143946985 1146
 sys/src/cmd/upas/fs/strtotm.c - 664 sys sys 1041137528 1904
 sys/src/cmd/upas/fs/tester.c - 664 sys sys 985037420 1418
 sys/src/cmd/upas/marshal - 20000000775 sys sys 1057272769 0
-sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1151596511 33817
+sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1179087968 34023
 sys/src/cmd/upas/marshal/mkfile - 664 sys sys 1047490298 235
 sys/src/cmd/upas/misc - 20000000775 sys sys 1039727596 0
 sys/src/cmd/upas/misc/gone.fishing - 664 sys sys 944961318 313
@@ -15831,3 +15831,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/upas/marshal - 775 sys sys 1179113026 132974

+ 4 - 4
dist/replica/plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1176581009 402158
+386/9loaddebug - 775 sys sys 1179086411 417004
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1176581010 202587
 386/9pc - 775 sys sys 1161230890 1924142
@@ -458,7 +458,7 @@
 386/bin/upas/fs - 775 sys sys 1178568311 331725
 386/bin/upas/isspam - 775 sys sys 1064598349 38
 386/bin/upas/list - 775 sys sys 1176520506 83035
-386/bin/upas/marshal - 775 sys sys 1178568311 133072
+386/bin/upas/marshal - 775 sys sys 1179113026 132974
 386/bin/upas/ml - 775 sys sys 1178568312 122913
 386/bin/upas/mlmgr - 775 sys sys 1178568312 103536
 386/bin/upas/mlowner - 775 sys sys 1177617496 92263
@@ -7395,7 +7395,7 @@ sys/man/1/lp - 664 sys sys 1113743326 3329
 sys/man/1/ls - 664 sys sys 1113743327 2890
 sys/man/1/mail - 664 sys sys 1050078464 2158
 sys/man/1/man - 664 sys sys 1165622295 2006
-sys/man/1/marshal - 664 sys sys 1165622300 3149
+sys/man/1/marshal - 664 sys sys 1179087317 3176
 sys/man/1/mc - 664 sys sys 1113743326 552
 sys/man/1/mk - 664 sys sys 1113743328 13198
 sys/man/1/mkdir - 664 sys sys 1082593141 717
@@ -14168,7 +14168,7 @@ sys/src/cmd/upas/fs/rfc2047-test - 664 sys sys 1143946985 1146
 sys/src/cmd/upas/fs/strtotm.c - 664 sys sys 1041137528 1904
 sys/src/cmd/upas/fs/tester.c - 664 sys sys 985037420 1418
 sys/src/cmd/upas/marshal - 20000000775 sys sys 1057272769 0
-sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1151596511 33817
+sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1179087968 34023
 sys/src/cmd/upas/marshal/mkfile - 664 sys sys 1047490298 235
 sys/src/cmd/upas/misc - 20000000775 sys sys 1039727596 0
 sys/src/cmd/upas/misc/gone.fishing - 664 sys sys 944961318 313

+ 4 - 0
dist/replica/plan9.log

@@ -48863,3 +48863,7 @@
 1178940604 11 c 386/bin/aux/ms2 - 775 sys sys 1178939751 88464
 1178940604 12 c 386/bin/tprof - 775 sys sys 1178939755 300947
 1178940604 13 c 386/lib/libmach.a - 664 sys sys 1178939757 807390
+1179086406 0 c 386/9loaddebug - 775 sys sys 1179086411 417004
+1179088207 0 c sys/man/1/marshal - 664 sys sys 1179087317 3176
+1179088207 1 c sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1179087968 34023
+1179113406 0 c 386/bin/upas/marshal - 775 sys sys 1179113026 132974

+ 38 - 42
sys/man/1/marshal

@@ -2,36 +2,31 @@
 .SH NAME
 marshal \- formatting and sending mail
 .SH SYNOPSIS
-.PP
 .B upas/marshal
 [
-.B -t
-.I mime-type
-]
-[
 .B -[aA]
 .I attachment
-]
-[
-.B -s
-.I subject
-]
-[
+] [
 .B -C
 .I copyaddr
-]
-[
+] [
+.B -nrx#
+] [
 .B -R
 .I reply-msg
-[
-.B -nrx#
-]
-[
+] [
+.B -s
+.I subject
+] [
+.B -t
+.I mime-type
+] [
 .I mailaddr ...
 ]
 .SH DESCRIPTION
 .I Marshal
-builds a mail message from standard input and passes it
+builds a mail message from standard input and passes it,
+if the body is non-empty,
 for transmission or delivery to
 .BI /mail/box/ username /pipefrom
 if it exists, otherwise to
@@ -86,20 +81,6 @@ but the message disposition is marked as
 directing any mail reader to display the attachment
 (if it can) when the mail message is read.
 .TP
-.BI -t type
-sets the content type for the attachments from
-all subsequent
-.B -a
-and
-.B -A
-options.
-.TP
-.BI -s subject
-adds a
-.B Subject:
-header line to the message if one does not
-already exist.
-.TP
 .BI -C copyaddr
 adds a
 .B Cc:
@@ -109,6 +90,16 @@ and also adds
 .I copyaddr
 as a recipient.
 .TP
+.BI -n
+intentionally no standard input
+.TP
+.B -#xr
+are all passed as command line options to the
+.I send
+that
+.I marshal
+invokes.
+.TP
 .BI -R replymsg
 tells marshal what message this one is in reply to.
 .I Replymsg
@@ -127,15 +118,19 @@ environment variable.  Thus,
 can alter the message to somehow match
 the reply to the message it is replying to.
 .TP
-.BI -n
-intentionally no standard input
+.BI -s subject
+adds a
+.B Subject:
+header line to the message if one does not
+already exist.
 .TP
-.B -#xr
-are all passed as command line options to the
-.I send
-that
-.I marshal
-invokes.
+.BI -t type
+sets the content type for the attachments from
+all subsequent
+.B -a
+and
+.B -A
+options.
 .PD
 .PP
 .I Marshal
@@ -152,7 +147,9 @@ can be overriden using the environment variable
 Its value will become both the envelope
 and
 .B From:
-mailbox name.  For example:
+mailbox name.
+For example:
+.IP
 .EX
 upasname=natasha@kremvax.com upas/mail boris@squirrel.com
 .EE
@@ -174,4 +171,3 @@ upasname=natasha@kremvax.com upas/mail boris@squirrel.com
 .IR send (8),
 .IR smtp (8),
 .IR upasfs (4)
-

File diff suppressed because it is too large
+ 218 - 214
sys/src/cmd/upas/marshal/marshal.c


Some files were not shown because too many files changed in this diff