1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
*** metamail/splitmail.c.orig Mon Jan 31 23:23:14 1994
--- metamail/splitmail.c Sat Feb 28 19:17:32 2004
***************
*** 41,48 ****
#define VERBOSEDELIVERYCMD VerboseDeliveryCmd
#else
extern char *getenv();
! #define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
! #define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
#endif
usageexit() {
--- 41,48 ----
#define VERBOSEDELIVERYCMD VerboseDeliveryCmd
#else
extern char *getenv();
! #define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
! #define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
#endif
usageexit() {
***************
*** 194,200 ****
s = endofheader(from); /* would be index(from, '\n'),
but need to check for continuation lines */
*s = '\0';
! if (ShareThisHeader(from, SubjectBuf, &OrigID)) {
strcat(SharedHeaders, from);
strcat(SharedHeaders, "\n");
}
--- 194,200 ----
s = endofheader(from); /* would be index(from, '\n'),
but need to check for continuation lines */
*s = '\0';
! if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) {
strcat(SharedHeaders, from);
strcat(SharedHeaders, "\n");
}
***************
*** 339,347 ****
NULL
};
! ShareThisHeader(s, SubjectBuf, OrigID)
char *s;
char *SubjectBuf;
char **OrigID;
{
int i;
--- 339,348 ----
NULL
};
! ShareThisHeader(s, SubjectBuf, size, OrigID)
char *s;
char *SubjectBuf;
+ size_t size;
char **OrigID;
{
int i;
***************
*** 361,367 ****
}
if (!ULstrcmp(s, "subject")) {
*colon = ':';
! strcpy(SubjectBuf, ++colon);
return(0);
}
if (!ULstrcmp(s, "content-type")) {
--- 362,369 ----
}
if (!ULstrcmp(s, "subject")) {
*colon = ':';
! strncpy(SubjectBuf, ++colon, size);
! SubjectBuf[size - 1] = '\0';
return(0);
}
if (!ULstrcmp(s, "content-type")) {
|
