Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 51f63c54 51f63c54af5ba99985cd5f9f160e8d724b5163d5 by Sam Roberts
Options

Tweaked header files to build without errors.

1 parent 5b4ca754
Inline Side-by-side
Showing 8 changed files with 78 additions and 77 deletions
1 test. abc <sascha@silbe.org>
1 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ; 2 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ;
2 a@b,z@y 3 a@b,z@y
3 ,a@b,z@y 4 ,a@b,z@y
......
1 test. abc <sascha@silbe.org>=> error MU_ERR_BAD_822_FORMAT
2
1 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ;=> error MU_ERR_BAD_822_FORMAT 3 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ;=> error MU_ERR_BAD_822_FORMAT
2 4
3 a@b,z@y=> pcount 2 5 a@b,z@y=> pcount 2
...@@ -54,116 +56,100 @@ a@b,=> pcount 1 ...@@ -54,116 +56,100 @@ a@b,=> pcount 1
54 56
55 ,,,=> error MU_ERR_EMPTY_ADDRESS 57 ,,,=> error MU_ERR_EMPTY_ADDRESS
56 58
57 a group: a@b,z@y ;=> pcount 3 59 a group: a@b,z@y ;=> pcount 2
58 1 group <a group> 60 1 email <a@b>
59 2 email <a@b>
60 local-part <a> domain <b> 61 local-part <a> domain <b>
61 3 email <z@y> 62 2 email <z@y>
62 local-part <z> domain <y> 63 local-part <z> domain <y>
63 64
64 a group: ,a@b,z@y ;=> pcount 3 65 a group: ,a@b,z@y ;=> pcount 2
65 1 group <a group> 66 1 email <a@b>
66 2 email <a@b>
67 local-part <a> domain <b> 67 local-part <a> domain <b>
68 3 email <z@y> 68 2 email <z@y>
69 local-part <z> domain <y> 69 local-part <z> domain <y>
70 70
71 a group: a@b,z@y, ;=> pcount 3 71 a group: a@b,z@y, ;=> pcount 2
72 1 group <a group> 72 1 email <a@b>
73 2 email <a@b>
74 local-part <a> domain <b> 73 local-part <a> domain <b>
75 3 email <z@y> 74 2 email <z@y>
76 local-part <z> domain <y> 75 local-part <z> domain <y>
77 76
78 a group: ,a@b,z@y, ;=> pcount 3 77 a group: ,a@b,z@y, ;=> pcount 2
79 1 group <a group> 78 1 email <a@b>
80 2 email <a@b>
81 local-part <a> domain <b> 79 local-part <a> domain <b>
82 3 email <z@y> 80 2 email <z@y>
83 local-part <z> domain <y> 81 local-part <z> domain <y>
84 82
85 a group: a@b,,z@y ;=> pcount 3 83 a group: a@b,,z@y ;=> pcount 2
86 1 group <a group> 84 1 email <a@b>
87 2 email <a@b>
88 local-part <a> domain <b> 85 local-part <a> domain <b>
89 3 email <z@y> 86 2 email <z@y>
90 local-part <z> domain <y> 87 local-part <z> domain <y>
91 88
92 a group: a@b,,,z@y ;=> pcount 3 89 a group: a@b,,,z@y ;=> pcount 2
93 1 group <a group> 90 1 email <a@b>
94 2 email <a@b>
95 local-part <a> domain <b> 91 local-part <a> domain <b>
96 3 email <z@y> 92 2 email <z@y>
97 local-part <z> domain <y> 93 local-part <z> domain <y>
98 94
99 a group: ,,,a@b,,, ;=> pcount 2 95 a group: ,,,a@b,,, ;=> pcount 1
100 1 group <a group> 96 1 email <a@b>
101 2 email <a@b>
102 local-part <a> domain <b> 97 local-part <a> domain <b>
103 98
104 a group: ,a@b ;=> pcount 2 99 a group: ,a@b ;=> pcount 1
105 1 group <a group> 100 1 email <a@b>
106 2 email <a@b>
107 local-part <a> domain <b> 101 local-part <a> domain <b>
108 102
109 a group: a@b, ;=> pcount 2 103 a group: a@b, ;=> pcount 1
110 1 group <a group> 104 1 email <a@b>
111 2 email <a@b>
112 local-part <a> domain <b> 105 local-part <a> domain <b>
113 106
114 a group: , ;=> pcount 1 107 a group: , ;=> error MU_ERR_EMPTY_ADDRESS
115 1 group <a group>
116 108
117 a group: ,, ;=> pcount 1 109 a group: ,, ;=> error MU_ERR_EMPTY_ADDRESS
118 1 group <a group>
119 110
120 a group: ,,, ;=> pcount 1 111 a group: ,,, ;=> error MU_ERR_EMPTY_ADDRESS
121 1 group <a group>
122 112
123 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ;=> error MU_ERR_BAD_822_FORMAT 113 Sam <@[matrix (smtp)], @[nexus: \[node 12\]]:sroberts@[10].[1]> ;=> error MU_ERR_BAD_822_FORMAT
124 114
125 Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];=> pcount 3 115 Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];=> pcount 2
126 1 group <Aliens> 116 1 email <sam@sam>
127 2 email <sam@sam>
128 personal <Sam> 117 personal <Sam>
129 local-part <sam> domain <sam> 118 local-part <sam> domain <sam>
130 route <@[matrix (smtp)]> 119 route <@[matrix (smtp)]>
131 3 email <sroberts@[10].[1]> 120 2 email <sroberts@[10].[1]>
132 local-part <sroberts> domain <[10].[1]> 121 local-part <sroberts> domain <[10].[1]>
133 122
134 lo@hi, Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];=> pcount 4 123 lo@hi, Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];=> pcount 3
135 1 email <lo@hi> 124 1 email <lo@hi>
136 local-part <lo> domain <hi> 125 local-part <lo> domain <hi>
137 2 group <Aliens> 126 2 email <sam@sam>
138 3 email <sam@sam>
139 personal <Sam> 127 personal <Sam>
140 local-part <sam> domain <sam> 128 local-part <sam> domain <sam>
141 route <@[matrix (smtp)]> 129 route <@[matrix (smtp)]>
142 4 email <sroberts@[10].[1]> 130 3 email <sroberts@[10].[1]>
143 local-part <sroberts> domain <[10].[1]> 131 local-part <sroberts> domain <[10].[1]>
144 132
145 Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];, hi@lo=> pcount 4 133 Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];, hi@lo=> pcount 3
146 1 group <Aliens> 134 1 email <sam@sam>
147 2 email <sam@sam>
148 personal <Sam> 135 personal <Sam>
149 local-part <sam> domain <sam> 136 local-part <sam> domain <sam>
150 route <@[matrix (smtp)]> 137 route <@[matrix (smtp)]>
151 3 email <sroberts@[10].[1]> 138 2 email <sroberts@[10].[1]>
152 local-part <sroberts> domain <[10].[1]> 139 local-part <sroberts> domain <[10].[1]>
153 4 email <hi@lo> 140 3 email <hi@lo>
154 local-part <hi> domain <lo> 141 local-part <hi> domain <lo>
155 142
156 lo@hi, Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];, hi@lo=> pcount 5 143 lo@hi, Aliens: Sam <@[matrix (smtp)]: sam@sam>, sroberts@[10].[1];, hi@lo=> pcount 4
157 1 email <lo@hi> 144 1 email <lo@hi>
158 local-part <lo> domain <hi> 145 local-part <lo> domain <hi>
159 2 group <Aliens> 146 2 email <sam@sam>
160 3 email <sam@sam>
161 personal <Sam> 147 personal <Sam>
162 local-part <sam> domain <sam> 148 local-part <sam> domain <sam>
163 route <@[matrix (smtp)]> 149 route <@[matrix (smtp)]>
164 4 email <sroberts@[10].[1]> 150 3 email <sroberts@[10].[1]>
165 local-part <sroberts> domain <[10].[1]> 151 local-part <sroberts> domain <[10].[1]>
166 5 email <hi@lo> 152 4 email <hi@lo>
167 local-part <hi> domain <lo> 153 local-part <hi> domain <lo>
168 154
169 Sam <@mail2.uniserve.com:sroberts@uniserve.com>=> pcount 1 155 Sam <@mail2.uniserve.com:sroberts@uniserve.com>=> pcount 1
...@@ -499,8 +485,7 @@ Catharine Shyong <shyong@t-iii.com>=> pcount 1 ...@@ -499,8 +485,7 @@ Catharine Shyong <shyong@t-iii.com>=> pcount 1
499 personal <Catharine Shyong> 485 personal <Catharine Shyong>
500 local-part <shyong> domain <t-iii.com> 486 local-part <shyong> domain <t-iii.com>
501 487
502 DRUMS-Last-Call:;=> pcount 1 488 DRUMS-Last-Call:;=> error MU_ERR_EMPTY_ADDRESS
503 1 group <DRUMS-Last-Call>
504 489
505 Detailed Revision/Update of Message Standards <drums@cs.utk.edu>=> pcount 1 490 Detailed Revision/Update of Message Standards <drums@cs.utk.edu>=> pcount 1
506 1 email <drums@cs.utk.edu> 491 1 email <drums@cs.utk.edu>
...@@ -522,12 +507,10 @@ IETF working group on revision of mail standards <drums@cs.utk.edu>=> pcount 1 ...@@ -522,12 +507,10 @@ IETF working group on revision of mail standards <drums@cs.utk.edu>=> pcount 1
522 personal <IETF working group on revision of mail standards> 507 personal <IETF working group on revision of mail standards>
523 local-part <drums> domain <cs.utk.edu> 508 local-part <drums> domain <cs.utk.edu>
524 509
525 IETF-Announce:;=> pcount 1 510 IETF-Announce:;=> error MU_ERR_EMPTY_ADDRESS
526 1 group <IETF-Announce>
527 511
528 IETF-Announce:;, drums@cs.utk.edu=> pcount 2 512 IETF-Announce:;, drums@cs.utk.edu=> pcount 1
529 1 group <IETF-Announce> 513 1 email <drums@cs.utk.edu>
530 2 email <drums@cs.utk.edu>
531 local-part <drums> domain <cs.utk.edu> 514 local-part <drums> domain <cs.utk.edu>
532 515
533 Jean-Baptiste Marchand <Jean-Baptiste.Marchand@epita.fr>=> pcount 1 516 Jean-Baptiste Marchand <Jean-Baptiste.Marchand@epita.fr>=> pcount 1
...@@ -559,7 +542,7 @@ OSULLIE@rte.ie, skidswam@hotmail.com, boot=> pcount 3 ...@@ -559,7 +542,7 @@ OSULLIE@rte.ie, skidswam@hotmail.com, boot=> pcount 3
559 local-part <OSULLIE> domain <rte.ie> 542 local-part <OSULLIE> domain <rte.ie>
560 2 email <skidswam@hotmail.com> 543 2 email <skidswam@hotmail.com>
561 local-part <skidswam> domain <hotmail.com> 544 local-part <skidswam> domain <hotmail.com>
562 3 email <> 545 3 email <boot@localhost>
563 local-part <boot> 546 local-part <boot>
564 547
565 Paul Hoffman / IMC <phoffman@imc.org>=> pcount 1 548 Paul Hoffman / IMC <phoffman@imc.org>=> pcount 1
...@@ -568,7 +551,7 @@ Paul Hoffman / IMC <phoffman@imc.org>=> pcount 1 ...@@ -568,7 +551,7 @@ Paul Hoffman / IMC <phoffman@imc.org>=> pcount 1
568 local-part <phoffman> domain <imc.org> 551 local-part <phoffman> domain <imc.org>
569 552
570 Sam=> pcount 1 553 Sam=> pcount 1
571 1 email <> 554 1 email <Sam@localhost>
572 local-part <Sam> 555 local-part <Sam>
573 556
574 Sam Roberts <sam@cogent.ca>=> pcount 1 557 Sam Roberts <sam@cogent.ca>=> pcount 1
...@@ -614,17 +597,16 @@ mcaustin@eudoramail.com, aposner@usaid.gov, Kieran.O'Leary@anpost.ie,=> pcount 3 ...@@ -614,17 +597,16 @@ mcaustin@eudoramail.com, aposner@usaid.gov, Kieran.O'Leary@anpost.ie,=> pcount 3
614 rfunk@wks.uts.ohio-state.eduofflinemailer-bounce@dikke.penguin.nl=> error MU_ERR_BAD_822_FORMAT 597 rfunk@wks.uts.ohio-state.eduofflinemailer-bounce@dikke.penguin.nl=> error MU_ERR_BAD_822_FORMAT
615 598
616 root=> pcount 1 599 root=> pcount 1
617 1 email <> 600 1 email <root@localhost>
618 local-part <root> 601 local-part <root>
619 602
620 srr <sam@localhost>=> error MU_ERR_BAD_822_FORMAT 603 srr <sam@localhost>=> error MU_ERR_BAD_822_FORMAT
621 604
622 whom it may concern: ;;whom.it.may.concern: ;=> error MU_ERR_BAD_822_FORMAT 605 whom it may concern: ;;whom.it.may.concern: ;=> error MU_ERR_BAD_822_FORMAT
623 606
624 whom it may concern: mutt-dev@mutt.org, mutt-users@mutt.org;=> pcount 3 607 whom it may concern: mutt-dev@mutt.org, mutt-users@mutt.org;=> pcount 2
625 1 group <whom it may concern> 608 1 email <mutt-dev@mutt.org>
626 2 email <mutt-dev@mutt.org>
627 local-part <mutt-dev> domain <mutt.org> 609 local-part <mutt-dev> domain <mutt.org>
628 3 email <mutt-users@mutt.org> 610 2 email <mutt-users@mutt.org>
629 local-part <mutt-users> domain <mutt.org> 611 local-part <mutt-users> domain <mutt.org>
630 612
......
1 # Makefile 1 # Makefile
2 2
3 CFLAGS = -g -I../include -Wall 3 CFLAGS = -g -I../include -Wall -I../lib
4 LDFLAGS = -g -static 4 LDFLAGS = -g -static
5 # On QNX 5 # On QNX
6 LDLIBS = -lsocket 6 LDLIBS = -lsocket
7 # On GNU/Linux (if compile with threads) 7 # On GNU/Linux (if compile with threads)
8 #LDLIBS = -lpthread 8 #LDLIBS = -lpthread
9 9
10 MULIBS = ../mailbox/.libs/libmailbox.a ../lib/.libs/libmailutils.a 10 MULIBS = ../lib/.libs/libmailutils.a ../mailbox/.libs/libmailbox.a ../lib/.libs/libmailutils.a
11 11
12 EXES = addr mbox-explode mbox-dates mbox-auth url-parse mbox-check mimetest msg-send 12 EXES = addr mbox-explode mbox-dates mbox-auth url-parse mbox-check mimetest msg-send muemail
13 13
14 default: $(EXES) 14 default: $(EXES)
15 15
...@@ -26,7 +26,7 @@ bad-dates: mbox-dates ...@@ -26,7 +26,7 @@ bad-dates: mbox-dates
26 addr.test: addr 26 addr.test: addr
27 ./addr < Addrs > Addrs.test 27 ./addr < Addrs > Addrs.test
28 @echo "---- There should be no differences! ----" 28 @echo "---- There should be no differences! ----"
29 diff -u Addrs.good Addrs.test 29 diff -C5 -u Addrs.good Addrs.test
30 30
31 # url example and test 31 # url example and test
32 32
......
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
11 #include <unistd.h> 11 #include <unistd.h>
12 12
13 #include <mailutils/address.h> 13 #include <mailutils/address.h>
14 #include <mailutils/debug.h>
14 #include <mailutils/errno.h> 15 #include <mailutils/errno.h>
15 #include <mailutils/mailbox.h> 16 #include <mailutils/mailbox.h>
16 #include <mailutils/parse822.h> 17 #include <mailutils/parse822.h>
17 #include <mailutils/registrar.h> 18 #include <mailutils/registrar.h>
19 #include <mailutils/stream.h>
18 20
19 int 21 int
20 main (int argc, char **argv) 22 main (int argc, char **argv)
......
...@@ -11,10 +11,14 @@ ...@@ -11,10 +11,14 @@
11 #include <unistd.h> 11 #include <unistd.h>
12 12
13 #include <mailutils/address.h> 13 #include <mailutils/address.h>
14 #include <mailutils/debug.h>
14 #include <mailutils/errno.h> 15 #include <mailutils/errno.h>
16 #include <mailutils/header.h>
15 #include <mailutils/mailbox.h> 17 #include <mailutils/mailbox.h>
18 #include <mailutils/message.h>
16 #include <mailutils/parse822.h> 19 #include <mailutils/parse822.h>
17 #include <mailutils/registrar.h> 20 #include <mailutils/registrar.h>
21 #include <mailutils/stream.h>
18 22
19 23
20 static const char * 24 static const char *
......
...@@ -11,9 +11,13 @@ ...@@ -11,9 +11,13 @@
11 #include <time.h> 11 #include <time.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 13
14 #include <mailutils/debug.h>
14 #include <mailutils/errno.h> 15 #include <mailutils/errno.h>
16 #include <mailutils/list.h>
15 #include <mailutils/mailbox.h> 17 #include <mailutils/mailbox.h>
16 #include <mailutils/registrar.h> 18 #include <mailutils/registrar.h>
19 #include <mailutils/stream.h>
20 #include <mailutils/message.h>
17 21
18 int 22 int
19 main (int argc, char **argv) 23 main (int argc, char **argv)
......
...@@ -28,11 +28,17 @@ ...@@ -28,11 +28,17 @@
28 28
29 #include <sys/types.h> 29 #include <sys/types.h>
30 30
31 #include <mailutils/body.h>
32 #include <mailutils/debug.h>
31 #include <mailutils/errno.h> 33 #include <mailutils/errno.h>
32 #include <mailutils/mailbox.h>
33 #include <mailutils/header.h>
34 #include <mailutils/filter.h> 34 #include <mailutils/filter.h>
35 #include <mailutils/header.h>
36 #include <mailutils/header.h>
37 #include <mailutils/list.h>
38 #include <mailutils/mailbox.h>
39 #include <mailutils/message.h>
35 #include <mailutils/registrar.h> 40 #include <mailutils/registrar.h>
41 #include <mailutils/stream.h>
36 42
37 void message_display_parts(message_t msg, const char *indent); 43 void message_display_parts(message_t msg, const char *indent);
38 44
......
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
8 #include <unistd.h> 8 #include <unistd.h>
9 9
10 #include <mailutils/address.h> 10 #include <mailutils/address.h>
11 #include <mailutils/debug.h>
11 #include <mailutils/errno.h> 12 #include <mailutils/errno.h>
13 #include <mailutils/list.h>
12 #include <mailutils/mailer.h> 14 #include <mailutils/mailer.h>
13 #include <mailutils/message.h> 15 #include <mailutils/message.h>
14 #include <mailutils/registrar.h> 16 #include <mailutils/registrar.h>
......