Sun Dec 30 05:38:55 2012 UTC ()
Add required standard headers.

XXX: this package should be terminated with prejudice


(dholland)
diff -r1.25 -r1.26 pkgsrc/mail/metamail/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/metamail/patches/patch-ae
diff -r1.4 -r1.5 pkgsrc/mail/metamail/patches/patch-af
diff -r0 -r1.1 pkgsrc/mail/metamail/patches/patch-metamail_shared.c
cvs diff -r1.25 -r1.26 pkgsrc/mail/metamail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/metamail/distinfo 2012/10/26 20:27:15 1.25
+++ pkgsrc/mail/metamail/distinfo 2012/12/30 05:38:55 1.26
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: distinfo,v 1.25 2012/10/26 20:27:15 joerg Exp $ 1$NetBSD: distinfo,v 1.26 2012/12/30 05:38:55 dholland Exp $
2 2
3SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6 3SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
4RMD160 (mm2.7.tar.Z) = ae322cad0653140cbe7f0148ce48757df98c26b0 4RMD160 (mm2.7.tar.Z) = ae322cad0653140cbe7f0148ce48757df98c26b0
5Size (mm2.7.tar.Z) = 262881 bytes 5Size (mm2.7.tar.Z) = 262881 bytes
6SHA1 (patch-aa) = 6f1d8f9cd5773deb3a050cecdc8a57718c953e0b 6SHA1 (patch-aa) = 6f1d8f9cd5773deb3a050cecdc8a57718c953e0b
7SHA1 (patch-ab) = 15dd81405551f4d7d3c0e59cf49038857603a9eb 7SHA1 (patch-ab) = 15dd81405551f4d7d3c0e59cf49038857603a9eb
8SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e 8SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
9SHA1 (patch-ad) = 1f152ab38d3c2da42afdb3b3c6a1b218ac8d3996 9SHA1 (patch-ad) = 1f152ab38d3c2da42afdb3b3c6a1b218ac8d3996
10SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8 10SHA1 (patch-ae) = c7d1997371ee5d61a0c7236da1f408502eeb0f1a
11SHA1 (patch-af) = 93e566a5e174fd259eb855e24a6dd4b7d5ffeed4 11SHA1 (patch-af) = 03d08e3bdff9009ef7f978364d99a9243f28eda5
12SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8 12SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
13SHA1 (patch-ah) = 69f286fbb45420921cfe57e16c6ec220e409b784 13SHA1 (patch-ah) = 69f286fbb45420921cfe57e16c6ec220e409b784
14SHA1 (patch-ai) = 97130d5769767788c5b20993805536a8ddd9b76e 14SHA1 (patch-ai) = 97130d5769767788c5b20993805536a8ddd9b76e
15SHA1 (patch-aj) = 7384564119a360189c68bdc5ce0ba3648a44769c 15SHA1 (patch-aj) = 7384564119a360189c68bdc5ce0ba3648a44769c
16SHA1 (patch-ak) = fcf331b9d28243cb403fd0dc34a365eb147f3da4 16SHA1 (patch-ak) = fcf331b9d28243cb403fd0dc34a365eb147f3da4
17SHA1 (patch-al) = c63427174a5d80c62b207212e0d855457939d0bc 17SHA1 (patch-al) = c63427174a5d80c62b207212e0d855457939d0bc
18SHA1 (patch-am) = d5d2cc002173da827fb452a91ccd906452420bfc 18SHA1 (patch-am) = d5d2cc002173da827fb452a91ccd906452420bfc
19SHA1 (patch-an) = 56c228106dc663623cb31ecf4eeba1fc5c27d045 19SHA1 (patch-an) = 56c228106dc663623cb31ecf4eeba1fc5c27d045
20SHA1 (patch-ao) = 90566d47642fe8ee71295ea47f3cf7420d0b2880 20SHA1 (patch-ao) = 90566d47642fe8ee71295ea47f3cf7420d0b2880
21SHA1 (patch-ap) = ade6fba2254e7db3f9cf52acf453bb512c0a3d32 21SHA1 (patch-ap) = ade6fba2254e7db3f9cf52acf453bb512c0a3d32
22SHA1 (patch-aq) = 90f84381aaf91db03cecef84d9433c3ffd1152db 22SHA1 (patch-aq) = 90f84381aaf91db03cecef84d9433c3ffd1152db
23SHA1 (patch-ar) = 7167065afb79f59febbf7821ad625972eaf921f2 23SHA1 (patch-ar) = 7167065afb79f59febbf7821ad625972eaf921f2
24SHA1 (patch-as) = 8d8c31f1ff508e9d7fc73a03a5f7ba63faa118ef 24SHA1 (patch-as) = 8d8c31f1ff508e9d7fc73a03a5f7ba63faa118ef
25SHA1 (patch-at) = 9193001c138875a0a6cc562f9f8a0424f78328aa 25SHA1 (patch-at) = 9193001c138875a0a6cc562f9f8a0424f78328aa
26SHA1 (patch-metamail_codes.c) = df6df4ff4abeba96c0d68f3d025390121c2b589a 26SHA1 (patch-metamail_codes.c) = df6df4ff4abeba96c0d68f3d025390121c2b589a
 27SHA1 (patch-metamail_shared.c) = b014d77bb5d09cd2d3199bcaecaf51da490d70ca
27SHA1 (patch-richmail_iso2022.c) = 3a6ff631d50963d31701e7a0f5519967bbbf1e2e 28SHA1 (patch-richmail_iso2022.c) = 3a6ff631d50963d31701e7a0f5519967bbbf1e2e
cvs diff -r1.5 -r1.6 pkgsrc/mail/metamail/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/mail/metamail/patches/patch-ae 2004/03/04 15:04:41 1.5
+++ pkgsrc/mail/metamail/patches/patch-ae 2012/12/30 05:38:55 1.6
@@ -1,45 +1,75 @@ @@ -1,45 +1,75 @@
1$NetBSD: patch-ae,v 1.5 2004/03/04 15:04:41 cjep Exp $ 1$NetBSD: patch-ae,v 1.6 2012/12/30 05:38:55 dholland Exp $
2--- metamail/splitmail.c.orig Mon Jan 31 23:23:14 1994 2
3+++ metamail/splitmail.c Sat Feb 28 20:08:44 2004 3- use required standard headers
4@@ -41,8 +41,8 @@ 4- make sure index() is available
 5- don't provide own declarations of standard functions
 6- fix path to sendmail (although, is this really adequately MI?)
 7- buffer length fix
 8
 9--- metamail/splitmail.c.orig 1994-01-31 22:23:14.000000000 +0000
 10+++ metamail/splitmail.c
 11@@ -21,14 +21,20 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
 12 ******************************************************* */
 13
 14 #include <stdio.h>
 15+#include <stdlib.h>
 16+#include <string.h>
 17 #include <sys/types.h>
 18 #include <sys/stat.h>
 19 #include <config.h>
 20 #include <ctype.h>
 21 #include <time.h>
 22
 23+#ifndef index
 24+#define index(a, b) strchr(a, b)
 25+#endif
 26+
 27 #define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
 28-extern char *malloc(), *index(), *getmyname();
 29+extern char *getmyname();
 30
 31 #ifdef AMIGA
 32 #define Prototype extern
 33@@ -40,9 +46,8 @@ extern char *malloc(), *index(), *getmyn
 34 #define NORMALDELIVERYCMD NormalDeliveryCmd
5 #define VERBOSEDELIVERYCMD VerboseDeliveryCmd 35 #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
6 #else 36 #else
7 extern char *getenv(); 37-extern char *getenv();
8-#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi" 38-#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
9-#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi" 39-#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
10+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi" 40+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
11+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi" 41+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
12 #endif 42 #endif
13  43
14 usageexit() { 44 usageexit() {
15@@ -194,7 +194,7 @@ 45@@ -194,7 +199,7 @@ char **argv;
16 s = endofheader(from); /* would be index(from, '\n'), 46 s = endofheader(from); /* would be index(from, '\n'),
17 but need to check for continuation lines */ 47 but need to check for continuation lines */
18 *s = '\0'; 48 *s = '\0';
19- if (ShareThisHeader(from, SubjectBuf, &OrigID)) { 49- if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
20+ if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) { 50+ if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) {
21 strcat(SharedHeaders, from); 51 strcat(SharedHeaders, from);
22 strcat(SharedHeaders, "\n"); 52 strcat(SharedHeaders, "\n");
23 } 53 }
24@@ -339,9 +339,10 @@ 54@@ -339,9 +344,10 @@ static char *SharedHeads[] = {
25 NULL 55 NULL
26 }; 56 };
27  57
28-ShareThisHeader(s, SubjectBuf, OrigID) 58-ShareThisHeader(s, SubjectBuf, OrigID)
29+ShareThisHeader(s, SubjectBuf, size, OrigID) 59+ShareThisHeader(s, SubjectBuf, size, OrigID)
30 char *s; 60 char *s;
31 char *SubjectBuf; 61 char *SubjectBuf;
32+size_t size; 62+size_t size;
33 char **OrigID; 63 char **OrigID;
34 { 64 {
35 int i; 65 int i;
36@@ -361,7 +362,8 @@ 66@@ -361,7 +367,8 @@ char **OrigID;
37 } 67 }
38 if (!ULstrcmp(s, "subject")) { 68 if (!ULstrcmp(s, "subject")) {
39 *colon = ':'; 69 *colon = ':';
40- strcpy(SubjectBuf, ++colon); 70- strcpy(SubjectBuf, ++colon);
41+ strncpy(SubjectBuf, ++colon, size); 71+ strncpy(SubjectBuf, ++colon, size);
42+ SubjectBuf[size - 1] = '\0'; 72+ SubjectBuf[size - 1] = '\0';
43 return(0); 73 return(0);
44 } 74 }
45 if (!ULstrcmp(s, "content-type")) { 75 if (!ULstrcmp(s, "content-type")) {
cvs diff -r1.4 -r1.5 pkgsrc/mail/metamail/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/mail/metamail/patches/patch-af 2012/10/26 20:27:15 1.4
+++ pkgsrc/mail/metamail/patches/patch-af 2012/12/30 05:38:55 1.5
@@ -1,169 +1,178 @@ @@ -1,169 +1,178 @@
1$NetBSD: patch-af,v 1.4 2012/10/26 20:27:15 joerg Exp $ 1$NetBSD: patch-af,v 1.5 2012/12/30 05:38:55 dholland Exp $
 2
 3- use required standard headers
 4- don't provide own declarations of standard functions
 5- declare own functions
 6- use C89
 7- don't use gets()
 8- ...? (XXX)
2 9
3--- metamail/mailto.c.orig 1994-02-09 20:30:26.000000000 +0000 10--- metamail/mailto.c.orig 1994-02-09 20:30:26.000000000 +0000
4+++ metamail/mailto.c 11+++ metamail/mailto.c
5@@ -36,6 +36,7 @@ STILL NEED TO DO/SUPPORT: 12@@ -36,7 +36,9 @@ STILL NEED TO DO/SUPPORT:
6 -- Replace EditString with something that does the right thing in-line. 13 -- Replace EditString with something that does the right thing in-line.
7 */ 14 */
8  15
9+#include <stdlib.h> 16+#include <stdlib.h>
10 #include <stdio.h> 17 #include <stdio.h>
 18+#include <string.h>
11 #include <ctype.h> 19 #include <ctype.h>
12 #include <config.h> 20 #include <config.h>
13@@ -50,8 +51,6 @@ STILL NEED TO DO/SUPPORT: 21 #include <pwd.h>
 22@@ -50,8 +52,6 @@ STILL NEED TO DO/SUPPORT:
14 #include <getfiles.h> 23 #include <getfiles.h>
15 #include <time.h> 24 #include <time.h>
16 #include <lib_protos.h> 25 #include <lib_protos.h>
17-#else 26-#else
18-extern char *getenv(); 27-extern char *getenv();
19 #endif 28 #endif
20  29
21 #ifdef SYSV 30 #ifdef SYSV
22@@ -60,9 +59,16 @@ extern char *getenv(); 31@@ -60,9 +60,16 @@ extern char *getenv();
23 #include <unistd.h> 32 #include <unistd.h>
24 #endif 33 #endif
25  34
26-extern char *malloc(), *realloc(), *index(), *getmyname(); 35-extern char *malloc(), *realloc(), *index(), *getmyname();
27 struct mailpart *CreateNewPart(); 36 struct mailpart *CreateNewPart();
28  37
29+void DeAlias(char *name, FILE *fp, char *hdr); 38+void DeAlias(char *name, FILE *fp, char *hdr);
30+void HeaderFputs(char *s, FILE *fp, char *hdr); 39+void HeaderFputs(char *s, FILE *fp, char *hdr);
31+void HandleAliasCommand(char *aliasline); 40+void HandleAliasCommand(char *aliasline);
32+void ProcessOneMailRC(char *fname, int IsAndrew); 41+void ProcessOneMailRC(char *fname, int IsAndrew);
33+void EditCurrentMessage(int UseVisual); 42+void EditCurrentMessage(int UseVisual);
34+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode); 43+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode);
35+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart); 44+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart);
36+ 45+
37 /* The main data structure for the multiple parts of the mail */ 46 /* The main data structure for the multiple parts of the mail */
38  47
39 struct mailpart { 48 struct mailpart {
40@@ -570,6 +576,7 @@ char **argv; 49@@ -570,6 +577,7 @@ char **argv;
41 if (isupper(*sdum)) *sdum = tolower(*sdum); 50 if (isupper(*sdum)) *sdum = tolower(*sdum);
42 } 51 }
43 if (strcmp(CharacterSet, "us-ascii") 52 if (strcmp(CharacterSet, "us-ascii")
44+ && strcmp(CharacterSet, "koi8-r") 53+ && strcmp(CharacterSet, "koi8-r")
45 && strncmp(CharacterSet, "iso-8859-", 9)) { 54 && strncmp(CharacterSet, "iso-8859-", 9)) {
46 fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet); 55 fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet);
47 exit(-1); 56 exit(-1);
48@@ -1042,10 +1049,7 @@ char *newid() { 57@@ -1042,10 +1050,7 @@ char *newid() {
49 return(idbuf); 58 return(idbuf);
50 } 59 }
51  60
52-WriteOutMessage(fp, ToList, Subject, CCList, FirstPart) 61-WriteOutMessage(fp, ToList, Subject, CCList, FirstPart)
53-FILE *fp; 62-FILE *fp;
54-char *ToList, *Subject, *CCList; 63-char *ToList, *Subject, *CCList;
55-struct mailpart *FirstPart; 64-struct mailpart *FirstPart;
56+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart) 65+void WriteOutMessage(FILE *fp, char *ToList, char *Subject, char *CCList, struct mailpart *FirstPart)
57 { 66 {
58 FILE *fpin; 67 FILE *fpin;
59 static int ctr = 0; 68 static int ctr = 0;
60@@ -1130,6 +1134,7 @@ struct mailpart *part; 69@@ -1130,6 +1135,7 @@ struct mailpart *part;
61 if (part->isrich) { 70 if (part->isrich) {
62 if (strcmp(CharacterSet, "us-ascii") 71 if (strcmp(CharacterSet, "us-ascii")
63 && (strncmp(CharacterSet, "iso-8859-", 9)  72 && (strncmp(CharacterSet, "iso-8859-", 9)
64+ && strcmp(CharacterSet, "koi8-r") 73+ && strcmp(CharacterSet, "koi8-r")
65 || part->encoding_type_needed != ENC_NONE)) { 74 || part->encoding_type_needed != ENC_NONE)) {
66 fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet); 75 fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
67 } else { 76 } else {
68@@ -1140,6 +1145,7 @@ struct mailpart *part; 77@@ -1140,6 +1146,7 @@ struct mailpart *part;
69 WriteCtypeNicely(fp, part->content_type); 78 WriteCtypeNicely(fp, part->content_type);
70 if (strcmp(CharacterSet, "us-ascii") 79 if (strcmp(CharacterSet, "us-ascii")
71 && (strncmp(CharacterSet, "iso-8859-", 9)  80 && (strncmp(CharacterSet, "iso-8859-", 9)
72+ && strcmp(CharacterSet, "koi8-r") 81+ && strcmp(CharacterSet, "koi8-r")
73 || part->encoding_type_needed != ENC_NONE)) { 82 || part->encoding_type_needed != ENC_NONE)) {
74 fprintf(fp, "; charset=\"%s\"\n", CharacterSet); 83 fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
75 } else fputs("\n", fp); 84 } else fputs("\n", fp);
76@@ -1328,11 +1334,7 @@ struct mailpart *part; 85@@ -1328,11 +1335,7 @@ struct mailpart *part;
77 } 86 }
78 } 87 }
79  88
80-FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode) 89-FputsQuotingLT(s, fp, part, EightBitMode, RightToLeftMode)
81-char *s; 90-char *s;
82-FILE *fp; 91-FILE *fp;
83-struct mailpart *part; 92-struct mailpart *part;
84-int EightBitMode, RightToLeftMode; 93-int EightBitMode, RightToLeftMode;
85+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode) 94+void FputsQuotingLT(char *s, FILE *fp, struct mailpart *part, int EightBitMode, int RightToLeftMode)
86 { 95 {
87 static int InNewLineSequence=1; 96 static int InNewLineSequence=1;
88 int c=0; 97 int c=0;
89@@ -1745,6 +1747,7 @@ CreateNewPart() { 98@@ -1745,6 +1748,7 @@ CreateNewPart() {
90 } 99 }
91 printf("\n\nEnter your choice as a number from 0 to %d: ", i); 100 printf("\n\nEnter your choice as a number from 0 to %d: ", i);
92 fflush(stdout); 101 fflush(stdout);
93+ *LineBuf = '\0'; 102+ *LineBuf = '\0';
94 fgets(LineBuf, sizeof(LineBuf), stdin); 103 fgets(LineBuf, sizeof(LineBuf), stdin);
95 ans = atoi(LineBuf); 104 ans = atoi(LineBuf);
96 if (ans == 0 || ans == 1) { 105 if (ans == 0 || ans == 1) {
97@@ -1791,7 +1794,7 @@ CreateNewPart() { 106@@ -1791,7 +1795,7 @@ CreateNewPart() {
98 int ct; 107 int ct;
99 printf("\nEnter the MIME Content-type value for the data from file %s\n (type '?' for a list of locally-valid content-types): ", sdum); 108 printf("\nEnter the MIME Content-type value for the data from file %s\n (type '?' for a list of locally-valid content-types): ", sdum);
100 fflush(stdout); 109 fflush(stdout);
101- gets(LineBuf); 110- gets(LineBuf);
102+ fgets(LineBuf, sizeof(LineBuf), stdin); 111+ fgets(LineBuf, sizeof(LineBuf), stdin);
103 if (index(LineBuf, '/')) { 112 if (index(LineBuf, '/')) {
104 char lc[100], *s, AnsBuf[100]; 113 char lc[100], *s, AnsBuf[100];
105 strcpy(lc, LineBuf); 114 strcpy(lc, LineBuf);
106@@ -1809,7 +1812,7 @@ CreateNewPart() { 115@@ -1809,7 +1813,7 @@ CreateNewPart() {
107 } 116 }
108 if (mc) break; 117 if (mc) break;
109 printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type. Do you want to use it anyway [no] ? ", LineBuf); 118 printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type. Do you want to use it anyway [no] ? ", LineBuf);
110- s = gets(AnsBuf); 119- s = gets(AnsBuf);
111+ s = fgets(AnsBuf, sizeof(AnsBuf), stdin); 120+ s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
112 while (s && *s && isspace((unsigned char) *s)) ++s; 121 while (s && *s && isspace((unsigned char) *s)) ++s;
113 if (s && (*s == 'y' || *s == 'Y')) break; 122 if (s && (*s == 'y' || *s == 'Y')) break;
114 continue; 123 continue;
115@@ -2073,8 +2076,7 @@ char *ctype, *pat; 124@@ -2073,8 +2077,7 @@ char *ctype, *pat;
116 return(0); 125 return(0);
117 } 126 }
118  127
119-EditCurrentMessage(UseVisual) 128-EditCurrentMessage(UseVisual)
120-int UseVisual; 129-int UseVisual;
121+void EditCurrentMessage(int UseVisual) 130+void EditCurrentMessage(int UseVisual)
122 { 131 {
123 char *editor = NULL; 132 char *editor = NULL;
124 char *CmdBuf, *CmdBuf2, LineBuf[100]; 133 char *CmdBuf, *CmdBuf2, LineBuf[100];
125@@ -2212,9 +2214,7 @@ int IsAndrew; 134@@ -2212,9 +2215,7 @@ int IsAndrew;
126 } 135 }
127 } 136 }
128  137
129-ProcessOneMailRC(fname, IsAndrew) 138-ProcessOneMailRC(fname, IsAndrew)
130-char *fname; 139-char *fname;
131-int IsAndrew; 140-int IsAndrew;
132+void ProcessOneMailRC(char *fname, int IsAndrew) 141+void ProcessOneMailRC(char *fname, int IsAndrew)
133 { 142 {
134 FILE *fp; 143 FILE *fp;
135 char *LineBuf = NULL, *sdum; 144 char *LineBuf = NULL, *sdum;
136@@ -2290,8 +2290,7 @@ struct alias { 145@@ -2290,8 +2291,7 @@ struct alias {
137 struct alias *next; 146 struct alias *next;
138 } *FirstAlias = NULL; 147 } *FirstAlias = NULL;
139  148
140-HandleAliasCommand(aliasline) 149-HandleAliasCommand(aliasline)
141-char *aliasline; 150-char *aliasline;
142+void HandleAliasCommand(char *aliasline) 151+void HandleAliasCommand(char *aliasline)
143 { 152 {
144 struct alias *tmpalias; 153 struct alias *tmpalias;
145 char *s, *s2; 154 char *s, *s2;
146@@ -2357,10 +2356,7 @@ char *s; 155@@ -2357,10 +2357,7 @@ char *s;
147 return(NULL); 156 return(NULL);
148 } 157 }
149  158
150-HeaderFputs(s, fp, hdr) 159-HeaderFputs(s, fp, hdr)
151-char *s; 160-char *s;
152-FILE *fp; 161-FILE *fp;
153-char *hdr; 162-char *hdr;
154+void HeaderFputs(char *s, FILE *fp, char *hdr) 163+void HeaderFputs(char *s, FILE *fp, char *hdr)
155 { 164 {
156 char *firstnonascii, *firstascii; 165 char *firstnonascii, *firstascii;
157  166
158@@ -2436,10 +2432,7 @@ char *hdr; 167@@ -2436,10 +2433,7 @@ char *hdr;
159 } 168 }
160 } 169 }
161  170
162-DeAlias(name, fp, hdr) 171-DeAlias(name, fp, hdr)
163-char *name; 172-char *name;
164-FILE *fp; 173-FILE *fp;
165-char *hdr; 174-char *hdr;
166+void DeAlias(char *name, FILE *fp, char *hdr) 175+void DeAlias(char *name, FILE *fp, char *hdr)
167 { 176 {
168 struct alias *tmpalias; 177 struct alias *tmpalias;
169 char *end, savechar; 178 char *end, savechar;
File Added: pkgsrc/mail/metamail/patches/patch-metamail_shared.c
$NetBSD: patch-metamail_shared.c,v 1.1 2012/12/30 05:38:55 dholland Exp $

- use standard headers
- don't provide own declarations of standard functions
- don't cast the return value of malloc

--- metamail/shared.c~	1993-05-16 18:19:32.000000000 +0000
+++ metamail/shared.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <config.h>
 #ifdef SYSV
@@ -6,7 +8,6 @@
 #include <sys/utsname.h>
 #endif
 
-extern char *malloc();
 char **Exceptions;
 int *NeedsPortableNewlines;
 int ExceptionsAlloced = 0, ExceptionsUsed = 0;
@@ -18,14 +19,14 @@ int needsportable;
     char *s;
     if (ExceptionsAlloced == 0) {
         ExceptionsAlloced = 25;
-        Exceptions = (char **) malloc(ExceptionsAlloced * sizeof(char *));
-        NeedsPortableNewlines = (int *) malloc(ExceptionsAlloced * sizeof(int));
+        Exceptions = malloc(ExceptionsAlloced * sizeof(char *));
+        NeedsPortableNewlines = malloc(ExceptionsAlloced * sizeof(int));
         if (!Exceptions || !NeedsPortableNewlines) return(-1);
     }
     if (ExceptionsUsed >= ExceptionsAlloced) {
         ExceptionsAlloced += 25;
-        Exceptions = (char **) realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
-        NeedsPortableNewlines = (int *) realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
+        Exceptions = realloc(Exceptions, ExceptionsAlloced * sizeof(char *));
+        NeedsPortableNewlines = realloc(NeedsPortableNewlines, ExceptionsAlloced * sizeof(int));
         if (!Exceptions || !NeedsPortableNewlines) return(-1);
     }
     s = malloc(1+strlen(contenttype));