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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- mail.c.orig 1998-03-11 05:02:22.000000000 -0500
+++ mail.c 2013-06-12 20:06:21.000000000 -0400
@@ -1,4 +1,8 @@
+#include <ctype.h>
#include <stdio.h>
+#include <string.h>
+
+static int ks2iso(unsigned char *, FILE *);
/* ------------------------------------------------------
Search for Starting Mark and print out (ENGLISH) prologue
@@ -66,9 +70,8 @@
#define SI '\017'
#define SO '\016'
-int ks2iso(ibuf,fpout)
-unsigned char *ibuf;
-FILE *fpout;
+static int
+ks2iso(unsigned char *ibuf, FILE *fpout)
{
int mode=ASCII;
int i=0;
@@ -172,8 +175,8 @@
if (fgets((char *) ibuf,HDR_BUF_LEN,fpin) == NULL) /* no message body */
return(1); /* header only (6/8/96) */
- if ( ! strncasecmp("Content-Type:",iptr,13) ||
- !strncasecmp("Content-Transfer-Encoding:",iptr,26) ) {
+ if ( ! strncasecmp("Content-Type:", (char *)iptr, 13) ||
+ !strncasecmp("Content-Transfer-Encoding:", (char *)iptr, 26) ) {
header_switch(iptr,fpout);
continue;
}
@@ -186,7 +189,7 @@
while ( charset[++i] != NULL ) {
sprintf(encode_prefix,"=?%s?B?",charset[i]);
- if ( ! strncasecmp(encode_prefix,iptr,
+ if ( ! strncasecmp(encode_prefix, (char *)iptr,
strlen(encode_prefix)) ) {
isbqheader=
bqheader_decode(&iptr,encode_prefix,Bencode,
@@ -195,7 +198,7 @@
}
sprintf(encode_prefix,"=?%s?Q?",charset[i]);
- if ( ! strncasecmp(encode_prefix,iptr,
+ if ( ! strncasecmp(encode_prefix, (char *)iptr,
strlen(encode_prefix)) ) {
isbqheader=
bqheader_decode(&iptr,encode_prefix,Qencode,
@@ -250,15 +253,15 @@
return;
}
ibuf[cp++] = '\n';
- ibuf[cp] = NULL;
+ ibuf[cp] = '\0';
cp = 0;
iptr = ibuf;
while (*iptr) {
tptr = tbuf;
while (*iptr && *iptr<0x80) fputc(*iptr++,fpout);
while (*iptr && (*iptr>0x80 || *iptr ==' ')) *tptr++ = *iptr++;
- *tptr = NULL;
- if (tbuf[0]!=NULL) {
+ *tptr = '\0';
+ if (tbuf[0]!='\0') {
string_to_base64(obuf, tbuf);
fprintf(fpout,"=?EUC-KR?B?%s?=",obuf);
}
@@ -342,12 +345,12 @@
only checks if there's any whitespace or '?'.
*/
- while ( *iptr && strncmp("?=",iptr,2) && tptr-tbuf < BQ_BUF_SIZE - 2 ) {
+ while ( *iptr && strncmp("?=", (char *)iptr, 2) && tptr-tbuf < BQ_BUF_SIZE - 2 ) {
if ( isspace(*iptr) || *iptr == '?' ) break;
*tptr++ = *iptr++;
}
- *tptr = NULL;
- if ( ! strncmp("?=",iptr,2) ) {
+ *tptr = '\0';
+ if ( ! strncmp("?=", (char *)iptr, 2) ) {
iptr+=2;
if ( encoding == Bencode)
base64_to_string(obuf, tbuf);
@@ -495,7 +498,7 @@
/* void header_switch(iptr0,fpout,name_len) */
void header_switch(iptr,fpout)
/* unsigned char **iptr0; */
-unsigned char *iptr;
+char *iptr;
FILE *fpout;
/* int name_len; */
{
|
