[Bug 161] New: FETCH %s BODY[text] and FETCH %s RFC822.TEXT should be same

http://bugzilla.citadel.org/show_bug.cgi?id=161

*** shadow/161  Sun Oct  2 21:06:02 2005
--- shadow/161.tmp.29558        Sun Oct  2 21:06:02 2005
***************
*** 0 ****
--- 1,56 ----
+ Bug#: 161
+ Product: Citadel/UX
+ Version: Latest CVS
+ Platform: PC
+ OS/Version: All
+ Status: NEW   
+ Resolution: 
+ Severity: normal
+ Priority: P2
+ Component: server
+ AssignedTo: 
room_citadel_development-fKiUzCIgRVDPE26QjMOA49i2O/JbrIOy@xxxxxxxxxxxxxxxx      
                      
+ ReportedBy: matt-p/Qkuqn10vVnImJazdtaBEB+6BGkLq7r@xxxxxxxxxxxxxxxx            
   
+ URL: 
+ Cc: 
+ Summary: FETCH %s BODY[text] and FETCH %s RFC822.TEXT should be same
+ 
+ As per my post on Citadel Support, FETCH %s BODY[text] doesn't work as 
intended.
+ 
+ As a temporary fix I have made a patch to divert BODY[text] and 
BODY.PEEK[text]
+ to RFC822.TEXT
+ 
+ Index: imap_fetch.c
+ ===================================================================
+ RCS file: /appl/cvs/citadel/imap_fetch.c,v
+ retrieving revision 655.1
+ diff -r655.1 imap_fetch.c
+ 115a116,118
+ >  *      "BODY[text]" quick fix inserted by me 
(matt-p/Qkuqn10vVnImJazdtaBEB+6BGkLq7r@xxxxxxxxxxxxxxxx)
+ >  *      because fetchmail sends BODY[text] for IMAP4rev1 and the default
+ >  *      implementation is broke
+ 117a121
+ > 
+ 131c135,138
+ <          || (!strcasecmp(whichfmt, "RFC822.TEXT")) ) {
+ ---
+ >          || (!strcasecmp(whichfmt, "RFC822.TEXT"))
+ >             || (!strcasecmp(whichfmt, "BODY[text]"))
+ >             || (!strcasecmp(whichfmt, "BODY.PEEK[text]"))) {
+ > 
+ 241c248,249
+ <       else if (!strcasecmp(whichfmt, "RFC822.TEXT")) {
+ ---
+ >       else if (!strcasecmp(whichfmt, "RFC822.TEXT") || 
!strcasecmp(whichfmt,"B
+ ODY[text]")
+ >         || (!strcasecmp(whichfmt, "BODY.PEEK[text]")) ) {
+ 577c585
+ <       size_t pstart, pbytes;
+ ---
+ >       size_t pstart, pbytes, header_size;
+ 966c974,977
+ <               else if (!strcasecmp(itemlist[i], "RFC822.TEXT")) {
+ ---
+ >                 /* Treat BODY[text] as RFC822.TEXT too. */
+ >               else if (!strcasecmp(itemlist[i], "RFC822.TEXT") ||
+ >                 !strcasecmp(itemlist[i], "BODY[text]") 
+ >                 || (!strcasecmp(itemlist[i], "BODY.PEEK[text]"))) {