oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

be careful with msg-id, subject, and from

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3871 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-11-09 08:10:58 +00:00
parent 5fdba33d9e
commit 450bab6676
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
appl/popper/pop_dropinfo.c
View File

@@ -64,14 +64,6 @@ pop_dropinfo(POP *p)
int nchar; /* Bytes written/read */ int nchar; /* Bytes written/read */
int blank_line = 1; /* previous line was blank */ int blank_line = 1; /* previous line was blank */
int in_header = 0; /* if we are in a header block */ int in_header = 0; /* if we are in a header block */
#if defined(UIDL) || defined(XOVER)
/* msg_idp points to the current Message-Id to be filled in. The
* pointer is moved every time we find a From line and we fill in
* msg_id whenever we encounter the corresponding Message-Id or
* X-UIDL line. */
char *_sentinel = 0;
char **msg_idp = &_sentinel;
#endif
/* Initialize maildrop status variables in the POP parameter block */ /* Initialize maildrop status variables in the POP parameter block */
p->msg_count = 0; p->msg_count = 0;
@@ -123,7 +115,6 @@ pop_dropinfo(POP *p)
mp->retr_flag = FALSE; mp->retr_flag = FALSE;
#if defined(UIDL) || defined(XOVER) #if defined(UIDL) || defined(XOVER)
mp->msg_id = 0; mp->msg_id = 0;
msg_idp = &mp->msg_id;
#endif #endif
#ifdef XOVER #ifdef XOVER
mp->subject = 0; mp->subject = 0;
@@ -140,13 +131,13 @@ pop_dropinfo(POP *p)
#if defined(UIDL) || defined(XOVER) #if defined(UIDL) || defined(XOVER)
if (strncasecmp("Message-Id:",buffer, 11) == 0) { if (strncasecmp("Message-Id:",buffer, 11) == 0) {
if (mp->msg_id == 0) if (mp->msg_id == 0)
*msg_idp = find_value_after_colon(buffer); mp->msg_id = find_value_after_colon(buffer);
} }
#ifdef UIDL #ifdef UIDL
else if (strncasecmp(buffer, "X-UIDL:", 7) == 0) { else if (strncasecmp(buffer, "X-UIDL:", 7) == 0) {
/* Courtesy to Qualcomm, there really is no such /* Courtesy to Qualcomm, there really is no such
thing as X-UIDL */ thing as X-UIDL */
*msg_idp = find_value_after_colon(buffer); mp->msg_id = find_value_after_colon(buffer);
} }
#endif #endif
#endif #endif
@@ -178,8 +169,29 @@ pop_dropinfo(POP *p)
#endif #endif
} }
blank_line = (strncmp(buffer, "\n", nchar) == 0); blank_line = (strncmp(buffer, "\n", nchar) == 0);
if(blank_line) if(blank_line) {
in_header = 0; in_header = 0;
#if defined(UIDL) || defined(XOVER)
if (mp->msg_id) {
asprintf(&mp->msg_id, "no-message-id-%d", mp->number);
if(mp->msg_id == NULL) {
fclose (p->drop);
p->msg_count = 0;
return pop_msg (p,POP_FAILURE,
"Can't build message list for '%s': Out of memory",
p->user);
}
}
#endif
#ifdef XOVER
if (mp->subject == 0)
mp->subject = "<none>";
if (mp->from == 0)
mp->from = "<unknown>";
if (mp->date == 0)
mp->date = "<unknown>";
#endif
}
mp->length += nchar; mp->length += nchar;
p->drop_size += nchar; p->drop_size += nchar;
mp->lines++; mp->lines++;