diff options
| -rw-r--r-- | driver.c | 4 | ||||
| -rw-r--r-- | etrn.c | 2 | ||||
| -rw-r--r-- | fetchmail.c | 2 | ||||
| -rw-r--r-- | fetchmail.h | 4 | ||||
| -rw-r--r-- | imap.c | 12 | ||||
| -rw-r--r-- | rcfile_l.l | 4 |
6 files changed, 14 insertions, 14 deletions
@@ -2234,7 +2234,7 @@ const char *fmt; /* printf-style format */ va_dcl #endif { - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; va_list ap; if (protocol->tagged) @@ -2315,7 +2315,7 @@ va_dcl #endif { int ok; - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; va_list ap; int oldphase = phase; /* we don't have to be re-entrant */ @@ -33,7 +33,7 @@ static int etrn_getrange(int sock, struct query *ctl, char *id, int *countp, /* send ETRN and interpret the response */ { int ok, opts; - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; struct idlist *qnp; /* pointer to Q names */ if ((ok = SMTP_ehlo(sock, ctl->server.truename, &opts))) diff --git a/fetchmail.c b/fetchmail.c index af5e474b..ea5a56bb 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -134,7 +134,7 @@ int main (int argc, char **argv) exit(PS_SYNTAX); /* this hint to stdio should help messages come out in the right order */ - setvbuf(stdout, NULL, _IOLBF, POPBUFSIZE); + setvbuf(stdout, NULL, _IOLBF, MSGBUFSIZE); if (versioninfo) { diff --git a/fetchmail.h b/fetchmail.h index 22ab295f..021df036 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -28,11 +28,11 @@ * from IMAP RFCs up to 2060, so these are mostly from POP3. */ #define HOSTLEN 635 /* max hostname length (RFC1123) */ -#define POPBUFSIZE 512 /* max length of respone (RFC1939) */ +#define POPBUFSIZE 512 /* max length of response (RFC1939) */ #define USERNAMELEN 40 /* max POP3 arg length (RFC1939) */ #define IDLEN 128 /* max length of UID (RFC1939) */ -/* clear a netbsd kernel parameter out of the way */ +/* clear a netBSD kernel parameter out of the way */ #undef MSGBUFSIZE #define MSGBUFSIZE 2048 /* size of message read buffer */ @@ -45,12 +45,12 @@ extern char *strstr(); /* needed on sysV68 R3V7.1. */ #define IMAP4rev1 1 /* IMAP4 rev 1, RFC2060 */ static int count, seen, recent, unseen, deletions,expunged, imap_version; -static char capabilities[POPBUFSIZE+1]; +static char capabilities[MSGBUFSIZE+1]; int imap_ok(int sock, char *argbuf) /* parse command response */ { - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; seen = 0; do { @@ -746,7 +746,7 @@ static int imap_getrange(int sock, static int imap_getsizes(int sock, int count, int *sizes) /* capture the sizes of all messages */ { - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; /* * Some servers (as in, PMDF5.1-9.1 under OpenVMS 6.1) @@ -789,7 +789,7 @@ static int imap_is_old(int sock, struct query *ctl, int number) static int imap_fetch_headers(int sock, struct query *ctl,int number,int *lenp) /* request headers of nth message */ { - char buf [POPBUFSIZE+1]; + char buf [MSGBUFSIZE+1]; int num; /* expunges change the fetch numbers */ @@ -819,7 +819,7 @@ static int imap_fetch_headers(int sock, struct query *ctl,int number,int *lenp) static int imap_fetch_body(int sock, struct query *ctl, int number, int *lenp) /* request body of nth message */ { - char buf [POPBUFSIZE+1], *cp; + char buf [MSGBUFSIZE+1], *cp; int num; /* expunges change the fetch numbers */ @@ -885,7 +885,7 @@ static int imap_trail(int sock, struct query *ctl, int number) for (;;) { - char buf[POPBUFSIZE+1]; + char buf[MSGBUFSIZE+1]; int ok; if ((ok = gen_recv(sock, buf, sizeof(buf)))) @@ -110,7 +110,7 @@ remote(folder)? { [0-9]+ { yylval.number = atoi(yytext); return NUMBER; } \"[^\"]*\" { - char buf[POPBUFSIZE]; + char buf[MSGBUFSIZE]; yytext[strlen(yytext)-1] = '\0'; escapes(yytext+1, buf); @@ -118,7 +118,7 @@ remote(folder)? { return STRING; } [^=;:, \t\r\n]+ { - char buf[POPBUFSIZE]; + char buf[MSGBUFSIZE]; escapes(yytext, buf); yylval.sval = (char *) xstrdup(buf); |