uw-imap: headers diff between 2002e and 2004a versions

	c-client.h	c-client.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 19 May 2000	* Date: 19 May 2000

	* Last Edited: 7 February 2003	* Last Edited: 20 October 2003
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2003 University of Washington.	* Copyright 1988-2003 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*/	*/
	#ifndef __CCLIENT_H /* nobody should include this twice... */	#ifndef __CCLIENT_H /* nobody should include this twice... */
	#define __CCLIENT_H	#define __CCLIENT_H

	#ifdef __cplusplus /* help out people who use C++ compilers */	#ifdef __cplusplus /* help out people who use C++ compilers */
	extern "C" {	extern "C" {
	/* If you use gcc, you may also have to use -fno-operator-names */	/* If you use gcc, you may also have to use -fno-operator-names */
	#define private cclientPrivate /* private to c-client */	#define private cclientPrivate /* private to c-client */
	#define and cclientAnd /* C99 doesn't realize that ISO 646 is dead */	#define and cclientAnd /* C99 doesn't realize that ISO 646 is dead */
	#define or cclientOr	#define or cclientOr
	#define not cclientNot	#define not cclientNot
	#endif	#endif

	#include "mail.h" /* primary interfaces */	#include "mail.h" /* primary interfaces */
	#include "osdep.h" /* OS-dependent routines */	#include "osdep.h" /* OS-dependent routines */

	#include "misc.h" /* miscellaneous utility routines */
	#include "rfc822.h" /* RFC822 and MIME routines */	#include "rfc822.h" /* RFC822 and MIME routines */
	#include "smtp.h" /* SMTP sending routines */	#include "smtp.h" /* SMTP sending routines */


	#ifdef LOCAL
	#undef LOCAL /* just in case */
	#endif
	#include "nntp.h" /* NNTP sending routines */	#include "nntp.h" /* NNTP sending routines */

	#undef LOCAL /* undo driver mischief */	#include "misc.h" /* miscellaneous utility routines */

	#ifdef __cplusplus /* undo the C++ mischief */	#ifdef __cplusplus /* undo the C++ mischief */
	#undef private	#undef private
	}	}
	#endif	#endif

	#endif	#endif

End of changes. 4 change blocks.
	7 lines changed or deleted	2 lines changed or added

	env.h	env.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 1 August 1988	* Date: 1 August 1988

	* Last Edited: 20 November 2001	* Last Edited: 27 April 2004
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is

	* Copyright 2001 University of Washington.	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* Function prototypes */	/* Function prototypes */


	long pmatch_full (char s,char pat,char delim);	long pmatch_full (unsigned char s,unsigned char pat,unsigned char delim);
	long dmatch (char s,char pat,char delim);	long dmatch (unsigned char s,unsigned char pat,unsigned char delim);
	void env_parameters (long function,void value);	void env_parameters (long function,void value);
	void rfc822_date (char *date);	void rfc822_date (char *date);
	void rfc822_timezone (char s,void t);	void rfc822_timezone (char s,void t);
	void internal_date (char *date);	void internal_date (char *date);
	long server_input_wait (long seconds);	long server_input_wait (long seconds);
	void server_init (char server,char service,char *sasl,	void server_init (char server,char service,char *sasl,
	void clkint,void kodint,void hupint,void trmint);	void clkint,void kodint,void hupint,void trmint);
	long server_login (char user,char pass,char authuser,int argc,char argv []);	long server_login (char user,char pass,char authuser,int argc,char argv []);
	long authserver_login (char user,char authuser,int argc,char *argv[]);	long authserver_login (char user,char authuser,int argc,char *argv[]);
	long anonymous_login (int argc,char *argv[]);	long anonymous_login (int argc,char *argv[]);

End of changes. 3 change blocks.
	4 lines changed or deleted	4 lines changed or added

	imap4r1.h	imap4r1.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 14 October 1988	* Date: 14 October 1988

	* Last Edited: 25 June 2003	* Last Edited: 30 October 2003
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2003 University of Washington.	* Copyright 1988-2003 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.

	*
	* This original version of this file is
	* Copyright 1988 Stanford University
	* and was developed in the Symbolic Systems Resources Group of the Knowled
	ge
	* Systems Laboratory at Stanford University in 1987-88, and was funded by
	the
	* Biomedical Research Technology Program of the NationalInstitutes of Heal
	th
	* under grant number RR-00785.
	*/	*/

	/* Parameters */

	#define MAXLOGINTRIALS 3 /* maximum number of login trials */
	#define IMAPLOOKAHEAD 20 /* envelope lookahead */
	#define IMAPUIDLOOKAHEAD 1000 /* UID lookahead */
	#define IMAPTCPPORT (long) 143 /* assigned TCP contact port */
	#define IMAPSSLPORT (long) 993 /* assigned SSL TCP contact port */
	#define MAXCOMMAND 1000 /* RFC 2683 guideline for cmd line l
	ength */

	/* Parsed reply message from imap_reply */

	typedef struct imap_parsed_reply {
	char line; / original reply string pointer */
	char tag; / command tag this reply is for */
	char key; / reply keyword */
	char text; / subsequent text */
	} IMAPPARSEDREPLY;

	#define IMAPTMPLEN 16*MAILTMPLEN

	/* IMAP4 I/O stream local data */

	typedef struct imap_local {
	NETSTREAM netstream; / TCP I/O stream */
	IMAPPARSEDREPLY reply; /* last parsed reply */
	MAILSTATUS stat; / status to fill in */
	unsigned int imap2bis : 1; /* server is IMAP2bis */
	unsigned int rfc1176 : 1; /* server is RFC-1176 IMAP2 */
	struct {
	unsigned int imap4rev1 : 1; /* server is IMAP4rev1 */
	unsigned int imap4 : 1; /* server is IMAP4 (RFC 1730) */
	unsigned int acl : 1; /* server has ACL (RFC 2086) */
	unsigned int quota : 1; /* server has QUOTA (RFC 2087) */
	unsigned int litplus : 1; /* server has LITERAL+ (RFC 2088) */
	unsigned int idle : 1; /* server has IDLE (RFC 2177) */
	unsigned int mbx_ref : 1; /* server has mailbox referrals (RFC 2193) *
	/
	unsigned int log_ref : 1; /* server has login referrals (RFC 2221) */
	unsigned int authanon : 1; /* server has anonymous SASL (RFC 2245) */
	unsigned int namespace :1; /* server has NAMESPACE (RFC 2342) */
	unsigned int uidplus : 1; /* server has UIDPLUS (RFC 2359) */
	unsigned int starttls : 1; /* server has STARTTLS (RFC 2595) */
	/* server disallows LOGIN command (RFC 2595)
	*/
	unsigned int logindisabled : 1;
	unsigned int id : 1; /* server has ID (RFC 2971) */
	unsigned int children : 1; /* server has CHILDREN (RFC 3398) */
	/* server has multi-APPEND */
	unsigned int multiappend : 1;
	unsigned int unselect : 1; /* server has UNSELECT */
	unsigned int sort : 1; /* server has SORT */
	unsigned int scan : 1; /* server has SCAN */
	/* supported authenticators */
	unsigned int auth : MAXAUTHENTICATORS;
	THREADER threader; / list of threaders */
	} cap;
	unsigned int uidsearch : 1; /* UID searching */
	unsigned int byeseen : 1; /* saw a BYE response */
	/* got implicit capabilities */
	unsigned int gotcapability : 1;
	unsigned int sensitive : 1; /* sensitive data in progress */
	unsigned int tlsflag : 1; /* TLS session */
	unsigned int notlsflag : 1; /* TLS not used in session */
	unsigned int sslflag : 1; /* SSL session */
	unsigned int novalidate : 1; /* certificate not validated */
	unsigned int filter : 1; /* filter SEARCH/SORT/THREAD results */
	unsigned int loser : 1; /* server is a loser */
	unsigned short extlevel; /* extension data level supported by server
	*/
	long authflags; /* required flags for authenticators */
	unsigned long sortsize; /* sort return data size */
	unsigned long sortdata; / sort return data */
	NAMESPACE *namespace; / namespace return data */
	THREADNODE threaddata; / thread return data */
	char referral; / last referral */
	char prefix; / find prefix */
	char user; / logged-in user */
	char reform; / reformed sequence */
	char tmp[IMAPTMPLEN]; /* temporary buffer */
	SEARCHSET lookahead; / fetch lookahead */
	} IMAPLOCAL;

	/* Convenient access to local data */

	#define LOCAL ((IMAPLOCAL *) stream->local)
	/* Protocol levels */	/* Protocol levels */


	/* As of February 11, 2003, it is believed that:	/* As of October 15, 2003, it is believed that:
	*	*
	* Version RFC Status Known Implementations	* Version RFC Status Known Implementations
	* ------- --- ------ ---------------------	* ------- --- ------ ---------------------
	* IMAP1 none extinct experimental TOPS-20 server	* IMAP1 none extinct experimental TOPS-20 server

	* IMAP2 1064, 1176 rare TOPS-20, SUMEX, old UW serve	* IMAP2 1064 extinct old TOPS-20, SUMEX servers
	rs	* IMAP2 1176 rare TOPS-20, old UW servers
	* IMAP2bis I-D uncommon old UW, Cyrus servers	* IMAP2bis expired I-D uncommon old UW, Cyrus servers
	* IMAP3 1203 extinct none (never implemented)	* IMAP3 1203 extinct none (never implemented)
	* IMAP4 1730 rare old UW, Cyrus, Netscape serv ers	* IMAP4 1730 rare old UW, Cyrus, Netscape serv ers

	* IMAP4rev1 2060, I-D ubiquitous UW, Cyrus, and many others	* IMAP4rev1 2060, 3501 ubiquitous UW, Cyrus, and many others
	*	*
	* Most client implementations will only interoperate with an IMAP4rev1	* Most client implementations will only interoperate with an IMAP4rev1
	* server. c-client based client implementations can interoperate with IMA P2,	* server. c-client based client implementations can interoperate with IMA P2,
	* IMAP2bis, IMAP4, and IMAP4rev1 servers, but only if they are very carefu l.	* IMAP2bis, IMAP4, and IMAP4rev1 servers, but only if they are very carefu l.
	*/	*/


		/* Server protocol level and capabilities */

		typedef struct imap_cap {
		unsigned int rfc1176 : 1; /* server is RFC-1176 IMAP2 */
		unsigned int imap2bis : 1; /* server is IMAP2bis */
		unsigned int imap4 : 1; /* server is IMAP4 (RFC 1730) */
		unsigned int imap4rev1 : 1; /* server is IMAP4rev1 */
		unsigned int acl : 1; /* server has ACL (RFC 2086) */
		unsigned int quota : 1; /* server has QUOTA (RFC 2087) */
		unsigned int litplus : 1; /* server has LITERAL+ (RFC 2088) */
		unsigned int idle : 1; /* server has IDLE (RFC 2177) */
		unsigned int mbx_ref : 1; /* server has mailbox referrals (RFC 2193) *
		/
		unsigned int log_ref : 1; /* server has login referrals (RFC 2221) */
		unsigned int authanon : 1; /* server has anonymous SASL (RFC 2245) */
		unsigned int namespace :1; /* server has NAMESPACE (RFC 2342) */
		unsigned int uidplus : 1; /* server has UIDPLUS (RFC 2359) */
		unsigned int starttls : 1; /* server has STARTTLS (RFC 2595) */
		/* server disallows LOGIN command (RFC 2595)
		*/
		unsigned int logindisabled : 1;
		unsigned int id : 1; /* server has ID (RFC 2971) */
		unsigned int children : 1; /* server has CHILDREN (RFC 3398) */
		unsigned int multiappend : 1; /* server has multi-APPEND (RFC 3502
		) ;*/
		unsigned int binary : 1; /* server has BINARY (RFC 3516) */
		unsigned int unselect : 1; /* server has UNSELECT */
		unsigned int sasl_ir : 1; /* server has SASL-IR initial response */
		unsigned int sort : 1; /* server has SORT */
		unsigned int scan : 1; /* server has SCAN */
		unsigned int extlevel; /* extension data level supported by server
		*/
		/* supported authenticators */
		unsigned int auth : MAXAUTHENTICATORS;
		THREADER threader; / list of threaders */
		} IMAPCAP;
	/* IMAP4rev1 level or better */	/* IMAP4rev1 level or better */


	#define LEVELIMAP4rev1(stream) ((IMAPLOCAL *) stream->local)->cap.imap4rev1	#define LEVELIMAP4rev1(stream) imap_cap (stream)->imap4rev1

	#define LEVELSTATUS LEVELIMAP4rev1	#define LEVELSTATUS LEVELIMAP4rev1

	/* IMAP4 level or better (not including RFC 1730 design mistakes) */	/* IMAP4 level or better (not including RFC 1730 design mistakes) */


	#define LEVELIMAP4(stream) (((IMAPLOCAL *) stream->local)->cap.imap4rev1 \|\|	#define LEVELIMAP4(stream) (imap_cap (stream)->imap4rev1 \|\| \
	\	imap_cap (stream)->imap4)
	((IMAPLOCAL *) stream->local)->cap.imap4)

	/* IMAP4 RFC-1730 level */	/* IMAP4 RFC-1730 level */


	#define LEVEL1730(stream) ((IMAPLOCAL *) stream->local)->cap.imap4	#define LEVEL1730(stream) imap_cap (stream)->imap4

	/* IMAP2bis level or better */	/* IMAP2bis level or better */


	#define LEVELIMAP2bis(stream) ((IMAPLOCAL *) stream->local)->imap2bis	#define LEVELIMAP2bis(stream) imap_cap (stream)->imap2bis

	/* IMAP2 RFC-1176 level or better */	/* IMAP2 RFC-1176 level or better */


	#define LEVEL1176(stream) ((IMAPLOCAL *) stream->local)->rfc1176	#define LEVEL1176(stream) imap_cap (stream)->rfc1176

	/* IMAP2 RFC-1064 or better */	/* IMAP2 RFC-1064 or better */

	#define LEVEL1064(stream) 1	#define LEVEL1064(stream) 1

	/* Body structure extension levels */

	/* These are in BODYSTRUCTURE order. Note that multipart bodies do not hav
	e
	* body-fld-md5. This is alright, since all subsequent body structure
	* extensions are in both singlepart and multipart bodies. If that ever
	* changes, this will have to be split.
	*/

	#define BODYEXTMD5 1 /* body-fld-md5 */
	#define BODYEXTDSP 2 /* body-fld-dsp */
	#define BODYEXTLANG 3 /* body-fld-lang */
	#define BODYEXTLOC 4 /* body-fld-loc */

	/* Has ACL extension */	/* Has ACL extension */


	#define LEVELACL(stream) ((IMAPLOCAL *) stream->local)->cap.acl	#define LEVELACL(stream) imap_cap (stream)->acl

	/* Has QUOTA extension */	/* Has QUOTA extension */


	#define LEVELQUOTA(stream) ((IMAPLOCAL *) stream->local)->cap.quota	#define LEVELQUOTA(stream) imap_cap (stream)->quota

	/* Has LITERALPLUS extension */	/* Has LITERALPLUS extension */


	#define LEVELLITERALPLUS(stream) ((IMAPLOCAL *) stream->local)->cap.litplus	#define LEVELLITERALPLUS(stream) imap_cap (stream)->litplus

	/* Has IDLE extension */	/* Has IDLE extension */


	#define LEVELIDLE(stream) ((IMAPLOCAL *) stream->local)->cap.idle	#define LEVELIDLE(stream) imap_cap (stream)->idle

	/* Has mailbox referrals */	/* Has mailbox referrals */


	#define LEVELMBX_REF(stream) ((IMAPLOCAL *) stream->local)->cap.mbx_ref	#define LEVELMBX_REF(stream) imap_cap (stream)->mbx_ref

	/* Has login referrals */	/* Has login referrals */


	#define LEVELLOG_REF(stream) ((IMAPLOCAL *) stream->local)->cap.log_ref	#define LEVELLOG_REF(stream) imap_cap (stream)->log_ref

		/* Has AUTH=ANONYMOUS extension */

		#define LEVELANONYMOUS(stream) imap_cap (stream)->authanon

	/* Has NAMESPACE extension */	/* Has NAMESPACE extension */


	#define LEVELNAMESPACE(stream) ((IMAPLOCAL *) stream->local)->cap.namespace	#define LEVELNAMESPACE(stream) imap_cap (stream)->namespace

	/* Has UIDPLUS extension */	/* Has UIDPLUS extension */


	#define LEVELUIDPLUS(stream) ((IMAPLOCAL *) stream->local)->cap.uidplus	#define LEVELUIDPLUS(stream) imap_cap (stream)->uidplus

		/* Has STARTTLS extension */

		#define LEVELSTARTTLS(stream) imap_cap (stream)->starttls

		/* Has LOGINDISABLED extension */

		#define LEVELLOGINDISABLED(stream) imap_cap (stream)->logindisabled
	/* Has ID extension */	/* Has ID extension */


	#define LEVELID(stream) ((IMAPLOCAL *) stream->local)->cap.id	#define LEVELID(stream) imap_cap (stream)->id

	/* Has CHILDREN extension */	/* Has CHILDREN extension */


	#define LEVELCHILDREN(stream) ((IMAPLOCAL *) stream->local)->cap.children	#define LEVELCHILDREN(stream) imap_cap (stream)->children

	/* Has MULTIAPPEND extension */	/* Has MULTIAPPEND extension */


	#define LEVELMULTIAPPEND(stream) ((IMAPLOCAL *) stream->local)->cap.multiap	#define LEVELMULTIAPPEND(stream) imap_cap (stream)->multiappend
	pend
		/* Has BINARY extension */

		#define LEVELBINARY(stream) imap_cap (stream)->binary

		/* Has UNSELECT extension */

		#define LEVELUNSELECT(stream) imap_cap (stream)->unselect

		/* Has SASL initial response extension */

		#define LEVELSASLIR(stream) imap_cap (stream)->sasl_ir

	/* Has SORT extension */	/* Has SORT extension */


	#define LEVELSORT(stream) ((IMAPLOCAL *) stream->local)->cap.sort	#define LEVELSORT(stream) imap_cap (stream)->sort

	/* Has at least one THREAD extension */	/* Has at least one THREAD extension */


	#define LEVELTHREAD(stream) (((IMAPLOCAL *) stream->local)->threader ? T : NIL)	#define LEVELTHREAD(stream) ((imap_cap (stream)->threader) ? T : NIL)

	/* Has SCAN extension */	/* Has SCAN extension */


	#define LEVELSCAN(stream) ((IMAPLOCAL *) stream->local)->cap.scan	#define LEVELSCAN(stream) imap_cap (stream)->scan
	/* Arguments to imap_send() */	/* Body structure extension levels */


	typedef struct imap_argument {	/* These are in BODYSTRUCTURE order. Note that multipart bodies do not hav
	int type; /* argument type */	e
	void text; / argument text */	* body-fld-md5. This is alright, since all subsequent body structure
	} IMAPARG;	* extensions are in both singlepart and multipart bodies. If that ever
		* changes, this will have to be split.
		*/


	/* imap_send() argument types */	#define BODYEXTMD5 1 /* body-fld-md5 */
		#define BODYEXTDSP 2 /* body-fld-dsp */
		#define BODYEXTLANG 3 /* body-fld-lang */
		#define BODYEXTLOC 4 /* body-fld-loc */


	#define ATOM 0	/* Function prototypes */
	#define NUMBER 1
	#define FLAGS 2
	#define ASTRING 3
	#define LITERAL 4
	#define LIST 5
	#define SEARCHPROGRAM 6
	#define SORTPROGRAM 7
	#define BODYTEXT 8
	#define BODYPEEK 9
	#define BODYCLOSE 10
	#define SEQUENCE 11
	#define LISTMAILBOX 12
	#define MULTIAPPEND 13
	#define SNLIST 14
	#define MULTIAPPENDREDO 15


	/* Append data */	IMAPCAP imap_cap (MAILSTREAM stream);
		char imap_host (MAILSTREAM stream);
		long imap_cache (MAILSTREAM stream,unsigned long msgno,char seg,
		STRINGLIST stl,SIZEDTEXT text);


	typedef struct append_data {	/* Temporary */
	append_t af;
	void *data;
	char *flags;
	char *date;
	STRING *message;
	} APPENDDATA;
	/* Function prototypes */


	DRIVER imap_valid (char name);
	void imap_parameters (long function,void value);
	void imap_scan (MAILSTREAM stream,char ref,char pat,char contents);
	void imap_list (MAILSTREAM stream,char ref,char *pat);
	void imap_lsub (MAILSTREAM stream,char ref,char *pat);
	void imap_list_work (MAILSTREAM stream,char cmd,char ref,char pat,
	char *contents);
	long imap_subscribe (MAILSTREAM stream,char mailbox);
	long imap_unsubscribe (MAILSTREAM stream,char mailbox);
	long imap_create (MAILSTREAM stream,char mailbox);
	long imap_delete (MAILSTREAM stream,char mailbox);
	long imap_rename (MAILSTREAM stream,char old,char *newname);
	long imap_manage (MAILSTREAM stream,char mailbox,char command,char arg2
	);
	long imap_status (MAILSTREAM stream,char mbx,long flags);
	MAILSTREAM imap_open (MAILSTREAM stream);
	IMAPPARSEDREPLY imap_rimap (MAILSTREAM stream,char service,NETMBX mb,
	char usr,char tmp);
	long imap_anon (MAILSTREAM stream,char tmp);
	long imap_auth (MAILSTREAM stream,NETMBX mb,char tmp,char usr);
	long imap_login (MAILSTREAM stream,NETMBX mb,char pwd,char usr);
	void imap_challenge (void stream,unsigned long *len);
	long imap_response (void stream,char s,unsigned long size);
	void imap_close (MAILSTREAM *stream,long options);
	void imap_fast (MAILSTREAM stream,char sequence,long flags);
	void imap_flags (MAILSTREAM stream,char sequence,long flags);
	long imap_overview (MAILSTREAM *stream,overview_t ofn);
	ENVELOPE imap_structure (MAILSTREAM stream,unsigned long msgno,BODY **bod
	y,
	long flags);
	long imap_msgdata (MAILSTREAM stream,unsigned long msgno,char section,
	unsigned long first,unsigned long last,STRINGLIST *lines,
	long flags);
	unsigned long imap_uid (MAILSTREAM *stream,unsigned long msgno);
	unsigned long imap_msgno (MAILSTREAM *stream,unsigned long uid);
	void imap_flag (MAILSTREAM stream,char sequence,char *flag,long flags);
	long imap_search (MAILSTREAM stream,char charset,SEARCHPGM *pgm,long flag
	s);
	unsigned long imap_sort (MAILSTREAM stream,char charset,SEARCHPGM spg,
	SORTPGM *pgm,long flags);
	THREADNODE imap_thread (MAILSTREAM stream,char type,char charset,
	SEARCHPGM *spg,long flags);
	THREADNODE imap_thread_work (MAILSTREAM stream,char type,char charset,
	SEARCHPGM *spg,long flags);
	long imap_ping (MAILSTREAM *stream);
	void imap_check (MAILSTREAM *stream);
	void imap_expunge (MAILSTREAM *stream);
	long imap_copy (MAILSTREAM stream,char sequence,char *mailbox,long option
	s);
	long imap_append (MAILSTREAM stream,char mailbox,append_t af,void *data);
	long imap_append_referral (char mailbox,char tmp,append_t af,void *data,
	char flags,char date,STRING *message,
	APPENDDATA *map);
	IMAPPARSEDREPLY imap_append_single (MAILSTREAM stream,char *mailbox,
	char flags,char date,STRING *message)
	;
	void imap_gc (MAILSTREAM *stream,long gcflags);
	void imap_gc_body (BODY *body);
	void imap_capability (MAILSTREAM *stream);
	long imap_setacl (MAILSTREAM stream,char mailbox,char id,char rights);	long imap_setacl (MAILSTREAM stream,char mailbox,char id,char rights);
	long imap_deleteacl (MAILSTREAM stream,char mailbox,char *id);	long imap_deleteacl (MAILSTREAM stream,char mailbox,char *id);
	long imap_getacl (MAILSTREAM stream,char mailbox);	long imap_getacl (MAILSTREAM stream,char mailbox);
	long imap_listrights (MAILSTREAM stream,char mailbox,char *id);	long imap_listrights (MAILSTREAM stream,char mailbox,char *id);
	long imap_myrights (MAILSTREAM stream,char mailbox);	long imap_myrights (MAILSTREAM stream,char mailbox);

	long imap_acl_work (MAILSTREAM stream,char command,IMAPARG *args[]);
	long imap_setquota (MAILSTREAM stream,char qroot,STRINGLIST *limits);	long imap_setquota (MAILSTREAM stream,char qroot,STRINGLIST *limits);
	long imap_getquota (MAILSTREAM stream,char qroot);	long imap_getquota (MAILSTREAM stream,char qroot);
	long imap_getquotaroot (MAILSTREAM stream,char mailbox);	long imap_getquotaroot (MAILSTREAM stream,char mailbox);


	IMAPPARSEDREPLY imap_send (MAILSTREAM stream,char cmd,IMAPARG args[]);
	IMAPPARSEDREPLY imap_sout (MAILSTREAM stream,char tag,char base,char **
	s);
	long imap_soutr (MAILSTREAM stream,char string);
	IMAPPARSEDREPLY imap_send_astring (MAILSTREAM stream,char tag,char *s,
	SIZEDTEXT as,long wildok,char limit);
	IMAPPARSEDREPLY imap_send_literal (MAILSTREAM stream,char tag,char *s,
	STRING *st);
	IMAPPARSEDREPLY imap_send_spgm (MAILSTREAM stream,char tag,char base,
	char *s,SEARCHPGM pgm,char *limit);
	char imap_send_spgm_trim (char base,char s,char text);
	IMAPPARSEDREPLY imap_send_sset (MAILSTREAM stream,char tag,char base,
	char *s,SEARCHSET set,char *prefix,
	char *limit);
	IMAPPARSEDREPLY imap_send_slist (MAILSTREAM stream,char tag,char base,
	char *s,char name,STRINGLIST *list,
	char *limit);
	void imap_send_sdate (char *s,char name,unsigned short date);
	IMAPPARSEDREPLY imap_reply (MAILSTREAM stream,char *tag);
	IMAPPARSEDREPLY imap_parse_reply (MAILSTREAM stream,char *text);
	IMAPPARSEDREPLY imap_fake (MAILSTREAM stream,char tag,char text);
	long imap_OK (MAILSTREAM stream,IMAPPARSEDREPLY reply);
	void imap_parse_unsolicited (MAILSTREAM stream,IMAPPARSEDREPLY reply);
	void imap_parse_response (MAILSTREAM stream,char text,long errflg,long nt
	fy);
	NAMESPACE imap_parse_namespace (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	THREADNODE imap_parse_thread (MAILSTREAM stream,char **txtptr);
	void imap_parse_header (MAILSTREAM stream,ENVELOPE env,SIZEDTEXT hdr,
	STRINGLIST *stl);
	void imap_parse_envelope (MAILSTREAM stream,ENVELOPE env,char *txtptr,
	IMAPPARSEDREPLY *reply);
	ADDRESS imap_parse_adrlist (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	ADDRESS imap_parse_address (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	void imap_parse_flags (MAILSTREAM stream,MESSAGECACHE elt,char **txtptr);
	unsigned long imap_parse_user_flag (MAILSTREAM stream,char flag);
	char imap_parse_astring (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY reply,unsigned long len);
	char imap_parse_string (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY reply,GETS_DATA md,
	unsigned long *len,long flags);
	void imap_parse_body (GETS_DATA md,char seg,char **txtptr,
	IMAPPARSEDREPLY *reply);
	long imap_cache (MAILSTREAM stream,unsigned long msgno,char seg,
	STRINGLIST stl,SIZEDTEXT text);
	void imap_parse_body_structure (MAILSTREAM stream,BODY body,char **txtptr
	,
	IMAPPARSEDREPLY *reply);
	PARAMETER imap_parse_body_parameter (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	void imap_parse_disposition (MAILSTREAM stream,BODY body,char **txtptr,
	IMAPPARSEDREPLY *reply);
	STRINGLIST imap_parse_language (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	STRINGLIST imap_parse_stringlist (MAILSTREAM stream,char **txtptr,
	IMAPPARSEDREPLY *reply);
	void imap_parse_extension (MAILSTREAM stream,char *txtptr,
	IMAPPARSEDREPLY *reply);
	void imap_parse_capabilities (MAILSTREAM stream,char t);
	char imap_host (MAILSTREAM stream);
	IMAPPARSEDREPLY imap_fetch (MAILSTREAM stream,char *sequence,long flags);
	char imap_reform_sequence (MAILSTREAM stream,char *sequence,long flags);

End of changes. 35 change blocks.
	229 lines changed or deleted	103 lines changed or added

	misc.h	misc.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 5 July 1988	* Date: 5 July 1988

	* Last Edited: 16 October 2001	* Last Edited: 27 April 2004
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is

	* Copyright 2001 University of Washington.	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*	*
	* This original version of this file is	* This original version of this file is
	* Copyright 1988 Stanford University	* Copyright 1988 Stanford University
	* and was developed in the Symbolic Systems Resources Group of the Knowled ge	* and was developed in the Symbolic Systems Resources Group of the Knowled ge
	* Systems Laboratory at Stanford University in 1987-88, and was funded by the	* Systems Laboratory at Stanford University in 1987-88, and was funded by the
	* Biomedical Research Technology Program of the NationalInstitutes of Heal th	* Biomedical Research Technology Program of the NationalInstitutes of Heal th
	* under grant number RR-00785.	* under grant number RR-00785.
	*/	*/

	skipping to change at line 71	skipping to change at line 71

	#define min Min	#define min Min
	#define max Max	#define max Max

	/* Compatibility definitions */	/* Compatibility definitions */

	#define pmatch(s,pat) \	#define pmatch(s,pat) \
	pmatch_full (s,pat,NIL)	pmatch_full (s,pat,NIL)
	/* Function prototypes */	/* Function prototypes */


	char ucase (char string);	unsigned char ucase (unsigned char string);
	char lcase (char string);	unsigned char lcase (unsigned char string);
	char cpystr (const char string);	char cpystr (const char string);
	char cpytxt (SIZEDTEXT dst,char *text,unsigned long size);	char cpytxt (SIZEDTEXT dst,char *text,unsigned long size);
	char textcpy (SIZEDTEXT dst,SIZEDTEXT *src);	char textcpy (SIZEDTEXT dst,SIZEDTEXT *src);
	char textcpystring (SIZEDTEXT text,STRING *bs);	char textcpystring (SIZEDTEXT text,STRING *bs);
	char textcpyoffstring (SIZEDTEXT text,STRING *bs,unsigned long offset,	char textcpyoffstring (SIZEDTEXT text,STRING *bs,unsigned long offset,
	unsigned long size);	unsigned long size);
	unsigned long find_rightmost_bit (unsigned long *valptr);	unsigned long find_rightmost_bit (unsigned long *valptr);
	long min (long i,long j);	long min (long i,long j);
	long max (long i,long j);	long max (long i,long j);
	long search (unsigned char base,long basec,unsigned char pat,long patc);	long search (unsigned char base,long basec,unsigned char pat,long patc);
	HASHTAB *hash_create (size_t size);	HASHTAB *hash_create (size_t size);
	void hash_destroy (HASHTAB **hashtab);	void hash_destroy (HASHTAB **hashtab);
	void hash_reset (HASHTAB *hashtab);	void hash_reset (HASHTAB *hashtab);
	unsigned long hash_index (HASHTAB hashtab,char key);	unsigned long hash_index (HASHTAB hashtab,char key);
	void *hash_lookup (HASHTAB hashtab,char *key);	void *hash_lookup (HASHTAB hashtab,char *key);
	HASHENT hash_add (HASHTAB hashtab,char key,void data,long extra);	HASHENT hash_add (HASHTAB hashtab,char key,void data,long extra);
	void *hash_lookup_and_add (HASHTAB hashtab,char key,void data,long extr a);	void *hash_lookup_and_add (HASHTAB hashtab,char key,void data,long extr a);
	int compare_ulong (unsigned long l1,unsigned long l2);	int compare_ulong (unsigned long l1,unsigned long l2);

	int compare_cstring (char s1,char s2);	int compare_cstring (unsigned char s1,unsigned char s2);
	int compare_csizedtext (char s1,SIZEDTEXT s2);	int compare_csizedtext (unsigned char s1,SIZEDTEXT s2);

End of changes. 4 change blocks.
	4 lines changed or deleted	4 lines changed or added

	nl.h	nl.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 1 August 1988	* Date: 1 August 1988

	* Last Edited: 24 October 2000	* Last Edited: 27 April 2004
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is

	* Copyright 2000 University of Washington.	* Copyright 2004 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*/	*/

	/* Function prototypes */	/* Function prototypes */


	unsigned long strcrlfcpy (char *dst,unsigned long dstl,char *src,	unsigned long strcrlfcpy (unsigned char *dst,unsigned long dstl,
	unsigned long srcl);	unsigned char *src,unsigned long srcl);
	unsigned long strcrlflen (STRING *s);	unsigned long strcrlflen (STRING *s);

End of changes. 3 change blocks.
	4 lines changed or deleted	4 lines changed or added

	nntp.h	nntp.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 10 February 1992	* Date: 10 February 1992

	* Last Edited: 2 June 2003	* Last Edited: 22 October 2003
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2003 University of Washington.	* Copyright 1988-2003 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*/	*/

	/* Constants */	/* Constants (should be in nntp.c) */


	#define MAXLOGINTRIALS 3 /* maximum number of login trials */
	#define NNTPTCPPORT (long) 119 /* assigned TCP contact port */	#define NNTPTCPPORT (long) 119 /* assigned TCP contact port */

	#define NNTPSSLPORT (long) 563 /* assigned(?) SSL TCP contact port */
	#define NNTPGREET (long) 200 /* NNTP successful greeting */
	#define NNTPGREETNOPOST (long) 201
	#define NNTPEXTOK (long) 202 /* NNTP extensions OK */
	#define NNTPGOK (long) 211 /* NNTP group selection OK */
	#define NNTPGLIST (long) 215 /* NNTP group list being returned */
	#define NNTPARTICLE (long) 220 /* NNTP article file */
	#define NNTPHEAD (long) 221 /* NNTP header text */
	#define NNTPBODY (long) 222 /* NNTP body text */
	#define NNTPOVER (long) 224 /* NNTP overview text */
	#define NNTPOK (long) 240 /* NNTP OK code */
	#define NNTPSASLED (long) 250 /* NNTP successful SASL authentication */
	#define NNTPAUTHED (long) 281 /* NNTP successful authentication */
	#define NNTPREADY (long) 340 /* NNTP ready for data */
	#define NNTPCHALLENGE (long) 351/* NNTP challenge, want response */
	#define NNTPWANTAUTH (long) 380 /* NNTP authentication needed */
	#define NNTPWANTPASS (long) 381 /* NNTP password needed */
	#define NNTPTLSSTART (long) 382 /* NNTP continue with TLS negotiatio
	n */
	#define NNTPSOFTFATAL (long) 400/* NNTP soft fatal code */
	#define NNTPWANTAUTH2 (long) 480/* NNTP authentication needed (alternate) *
	/
	#define NNTPBADCMD (long) 500 /* NNTP unrecognized command */

	/* NNTP I/O stream local data */


	typedef struct nntp_local {	/* NNTP open options
	SENDSTREAM nntpstream; / NNTP stream for I/O */	* For compatibility with the past, NOP_DEBUG must always be 1.
	unsigned int dirty : 1; /* disk copy of .newsrc needs updating */	*/
	unsigned int tlsflag : 1; /* TLS session */
	unsigned int notlsflag : 1; /* TLS not used in session */
	unsigned int sslflag : 1; /* SSL session */
	unsigned int novalidate : 1; /* certificate not validated */
	unsigned int xover : 1; /* supports XOVER */
	unsigned int xhdr : 1; /* supports XHDR */
	char name; / remote newsgroup name */
	char user; / mailbox user */
	char newsrc; / newsrc file */
	char over_fmt; / overview format */
	unsigned long msgno; /* current text message number */
	FILE txt; / current text */
	unsigned long txtsize; /* current text size */
	} NNTPLOCAL;

	/* Convenient access to local data */

	#define LOCAL ((NNTPLOCAL *) stream->local)

	/* Convenient access to protocol-specific data */

	#define NNTP stream->protocol.nntp


	/* Convenient access to extensions */	#define NOP_DEBUG (long) 0x1 /* debug protocol negotiations */
		#define NOP_READONLY (long) 0x2 /* read-only open */
		#define NOP_TRYSSL (long) 0x4 /* try SSL first */
		/* reserved for application use */
		#define NOP_RESERVED (unsigned long) 0xff000000


	#define EXTENSION LOCAL->nntpstream->protocol.nntp.ext
	/* Compatibility support names */	/* Compatibility support names */

	#define nntp_open(hostlist,options) \	#define nntp_open(hostlist,options) \

	nntp_open_full (NIL,hostlist,"nntp",NNTPTCPPORT,options)	nntp_open_full (NIL,hostlist,"nntp",NIL,options)

	/* Function prototypes */	/* Function prototypes */


	DRIVER nntp_valid (char name);
	DRIVER nntp_isvalid (char name,char *mbx);
	void nntp_parameters (long function,void value);
	void nntp_scan (MAILSTREAM stream,char ref,char pat,char contents);
	void nntp_list (MAILSTREAM stream,char ref,char *pat);
	void nntp_lsub (MAILSTREAM stream,char ref,char *pat);
	long nntp_canonicalize (char ref,char pat,char pattern,char wildmat);
	long nntp_subscribe (MAILSTREAM stream,char mailbox);
	long nntp_unsubscribe (MAILSTREAM stream,char mailbox);
	long nntp_create (MAILSTREAM stream,char mailbox);
	long nntp_delete (MAILSTREAM stream,char mailbox);
	long nntp_rename (MAILSTREAM stream,char old,char *newname);
	long nntp_status (MAILSTREAM stream,char mbx,long flags);
	long nntp_getmap (MAILSTREAM stream,char name,
	unsigned long first,unsigned long last,
	unsigned long rnmsgs,unsigned long nmsgs,char *tmp);
	MAILSTREAM nntp_mopen (MAILSTREAM stream);
	void nntp_mclose (MAILSTREAM *stream,long options);
	void nntp_fetchfast (MAILSTREAM stream,char sequence,long flags);
	void nntp_flags (MAILSTREAM stream,char sequence,long flags);
	long nntp_overview (MAILSTREAM *stream,overview_t ofn);
	long nntp_parse_overview (OVERVIEW ov,char text,MESSAGECACHE *elt);
	long nntp_over (MAILSTREAM stream,char sequence);
	char nntp_header (MAILSTREAM stream,unsigned long msgno,unsigned long *si
	ze,
	long flags);
	long nntp_text (MAILSTREAM stream,unsigned long msgno,STRING bs,long flag
	s);
	FILE nntp_article (MAILSTREAM stream,char msgid,unsigned long size,
	unsigned long *hsiz);
	void nntp_flagmsg (MAILSTREAM stream,MESSAGECACHE elt);
	long nntp_search (MAILSTREAM stream,char charset,SEARCHPGM *pgm,long flag
	s);
	long nntp_search_msg (MAILSTREAM stream,unsigned long msgno,SEARCHPGM pgm
	,
	OVERVIEW *ov);
	unsigned long nntp_sort (MAILSTREAM stream,char charset,SEARCHPGM spg,
	SORTPGM *pgm,long flags);
	SORTCACHE *nntp_sort_loadcache (MAILSTREAM stream,SORTPGM *pgm,
	unsigned long start,unsigned long last,
	long flags);
	THREADNODE nntp_thread (MAILSTREAM stream,char type,char charset,
	SEARCHPGM *spg,long flags);
	long nntp_ping (MAILSTREAM *stream);
	void nntp_check (MAILSTREAM *stream);
	void nntp_expunge (MAILSTREAM *stream);
	long nntp_copy (MAILSTREAM stream,char sequence,char *mailbox,long option
	s);
	long nntp_append (MAILSTREAM stream,char mailbox,append_t af,void *data);

	SENDSTREAM nntp_open_full (NETDRIVER dv,char *hostlist,char service,	SENDSTREAM nntp_open_full (NETDRIVER dv,char *hostlist,char service,
	unsigned long port,long options);	unsigned long port,long options);

	SENDSTREAM nntp_greet (SENDSTREAM stream,long options);
	long nntp_extensions (SENDSTREAM *stream,long flags);
	SENDSTREAM nntp_close (SENDSTREAM stream);	SENDSTREAM nntp_close (SENDSTREAM stream);
	long nntp_mail (SENDSTREAM stream,ENVELOPE msg,BODY *body);	long nntp_mail (SENDSTREAM stream,ENVELOPE msg,BODY *body);

	long nntp_send (SENDSTREAM stream,char command,char *args);
	long nntp_send_work (SENDSTREAM stream,char command,char *args);
	long nntp_send_auth (SENDSTREAM *stream);
	long nntp_send_auth_work (SENDSTREAM stream,NETMBX mb,char *pwd);
	void nntp_challenge (void s,unsigned long *len);
	long nntp_response (void s,char response,unsigned long size);
	long nntp_reply (SENDSTREAM *stream);
	long nntp_fake (SENDSTREAM stream,char text);
	long nntp_soutr (void stream,char s);

End of changes. 11 change blocks.
	108 lines changed or deleted	11 lines changed or added

	smtp.h	smtp.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 27 July 1988	* Date: 27 July 1988

	* Last Edited: 11 September 2002	* Last Edited: 22 October 2003
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is

	* Copyright 2002 University of Washington.	* Copyright 2003 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*	*
	* This original version of this file is	* This original version of this file is
	* Copyright 1988 Stanford University	* Copyright 1988 Stanford University
	* and was developed in the Symbolic Systems Resources Group of the Knowled ge	* and was developed in the Symbolic Systems Resources Group of the Knowled ge
	* Systems Laboratory at Stanford University in 1987-88, and was funded by the	* Systems Laboratory at Stanford University in 1987-88, and was funded by the
	* Biomedical Research Technology Program of the NationalInstitutes of Heal th	* Biomedical Research Technology Program of the NationalInstitutes of Heal th
	* under grant number RR-00785.	* under grant number RR-00785.
	*/	*/

	/* Constants */	/* Constants (should be in smtp.c) */


	#define MAXLOGINTRIALS 3 /* maximum number of login trials */
	#define SMTPTCPPORT (long) 25 /* assigned TCP contact port */	#define SMTPTCPPORT (long) 25 /* assigned TCP contact port */

	#define SMTPSSLPORT (long) 465 /* former assigned SSL TCP contact port */
	#define SMTPGREET (long) 220 /* SMTP successful greeting */
	#define SMTPAUTHED (long) 235 /* SMTP successful authentication */
	#define SMTPOK (long) 250 /* SMTP OK code */
	#define SMTPAUTHREADY (long) 334/* SMTP ready for authentication */
	#define SMTPREADY (long) 354 /* SMTP ready for data */
	#define SMTPSOFTFATAL (long) 421/* SMTP soft fatal code */
	#define SMTPWANTAUTH (long) 505 /* SMTP authentication needed */
	#define SMTPWANTAUTH2 (long) 530/* SMTP authentication needed */
	#define SMTPHARDERROR (long) 554/* SMTP miscellaneous hard failure */


	/* SMTP open options */	/* SMTP open options
		* For compatibility with the past, SOP_DEBUG must always be 1.
		*/

	#define SOP_DEBUG (long) 1 /* debug protocol negotiations */	#define SOP_DEBUG (long) 1 /* debug protocol negotiations */
	#define SOP_DSN (long) 2 /* DSN requested */	#define SOP_DSN (long) 2 /* DSN requested */
	/* DSN notification, none set mean NEVER */	/* DSN notification, none set mean NEVER */
	#define SOP_DSN_NOTIFY_FAILURE (long) 4	#define SOP_DSN_NOTIFY_FAILURE (long) 4
	#define SOP_DSN_NOTIFY_DELAY (long) 8	#define SOP_DSN_NOTIFY_DELAY (long) 8
	#define SOP_DSN_NOTIFY_SUCCESS (long) 16	#define SOP_DSN_NOTIFY_SUCCESS (long) 16
	/* DSN return full msg vs. header */	/* DSN return full msg vs. header */


	#define SOP_DSN_RETURN_FULL (long) 32	#define SOP_DSN_RETURN_FULL (long) 32
	#define SOP_8BITMIME (long) 64 /* 8-bit MIME requested */	#define SOP_8BITMIME (long) 64 /* 8-bit MIME requested */
	#define SOP_SECURE (long) 256 /* don't do non-secure authentication */	#define SOP_SECURE (long) 256 /* don't do non-secure authentication */
	#define SOP_TRYSSL (long) 512 /* try SSL first */	#define SOP_TRYSSL (long) 512 /* try SSL first */
	#define SOP_TRYALT SOP_TRYSSL /* old name */	#define SOP_TRYALT SOP_TRYSSL /* old name */

		/* reserved for application use */
	/* Convenient access to protocol-specific data */	#define SOP_RESERVED (unsigned long) 0xff000000

	#define ESMTP stream->protocol.esmtp

	/* Compatibility support names */	/* Compatibility support names */

	#define smtp_open(hostlist,options) \	#define smtp_open(hostlist,options) \

	smtp_open_full (NIL,hostlist,"smtp",SMTPTCPPORT,options)	smtp_open_full (NIL,hostlist,"smtp",NIL,options)

	/* Function prototypes */	/* Function prototypes */

	void smtp_parameters (long function,void value);	void smtp_parameters (long function,void value);
	SENDSTREAM smtp_open_full (NETDRIVER dv,char *hostlist,char service,	SENDSTREAM smtp_open_full (NETDRIVER dv,char *hostlist,char service,
	unsigned long port,long options);	unsigned long port,long options);

	void smtp_challenge (void s,unsigned long *len);
	long smtp_response (void s,char response,unsigned long size);
	long smtp_auth (SENDSTREAM stream,NETMBX mb,char *tmp);
	SENDSTREAM smtp_close (SENDSTREAM stream);	SENDSTREAM smtp_close (SENDSTREAM stream);
	long smtp_mail (SENDSTREAM stream,char type,ENVELOPE msg,BODY body);	long smtp_mail (SENDSTREAM stream,char type,ENVELOPE msg,BODY body);
	void smtp_debug (SENDSTREAM *stream);	void smtp_debug (SENDSTREAM *stream);
	void smtp_nodebug (SENDSTREAM *stream);	void smtp_nodebug (SENDSTREAM *stream);

	long smtp_rcpt (SENDSTREAM stream,ADDRESS adr,long *error);
	long smtp_send (SENDSTREAM stream,char command,char *args);
	long smtp_reply (SENDSTREAM *stream);
	long smtp_ehlo (SENDSTREAM stream,char host,NETMBX *mb);
	long smtp_fake (SENDSTREAM stream,long code,char text);
	long smtp_soutr (void stream,char s);

End of changes. 11 change blocks.
	23 lines changed or deleted	10 lines changed or added

	utf8.h	utf8.h

	skipping to change at line 13	skipping to change at line 13
	*	*
	* Author: Mark Crispin	* Author: Mark Crispin
	* Networks and Distributed Computing	* Networks and Distributed Computing
	* Computing & Communications	* Computing & Communications
	* University of Washington	* University of Washington
	* Administration Building, AG-44	* Administration Building, AG-44
	* Seattle, WA 98195	* Seattle, WA 98195
	* Internet: MRC@CAC.Washington.EDU	* Internet: MRC@CAC.Washington.EDU
	*	*
	* Date: 11 June 1997	* Date: 11 June 1997

	* Last Edited: 10 July 2002	* Last Edited: 3 June 2004
	*	*
	* The IMAP toolkit provided in this Distribution is	* The IMAP toolkit provided in this Distribution is

	* Copyright 2002 University of Washington.	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* UTF-8 size and conversion routines from UCS-2 values. This will need to	/* UTF-8 size and conversion routines from UCS-2 values. This will need to
	* be changed if UTF-16 data (surrogate pairs) are ever an issue.	* be changed if UTF-16 data (surrogate pairs) are ever an issue.
	*/	*/

	#define UTF8_SIZE(c) ((c & 0xff80) ? ((c & 0xf800) ? 3 : 2) : 1)	#define UTF8_SIZE(c) ((c & 0xff80) ? ((c & 0xf800) ? 3 : 2) : 1)

	#define UTF8_PUT(b,c) { \	#define UTF8_PUT(b,c) { \
	if (c & 0xff80) { /* non-ASCII? */ \	if (c & 0xff80) { /* non-ASCII? */ \
	if (c & 0xf800) { /* three byte code */ \	if (c & 0xf800) { /* three byte code */ \
	*b++ = 0xe0 \| (c >> 12); \	*b++ = 0xe0 \| (c >> 12); \
	*b++ = 0x80 \| ((c >> 6) & 0x3f); \	*b++ = 0x80 \| ((c >> 6) & 0x3f); \
	} \	} \
	else *b++ = 0xc0 \| ((c >> 6) & 0x3f); \	else *b++ = 0xc0 \| ((c >> 6) & 0x3f); \
	*b++ = 0x80 \| (c & 0x3f); \	*b++ = 0x80 \| (c & 0x3f); \
	} \	} \
	else *b++ = c; \	else *b++ = c; \
	}	}


		/* utf8_get() error returns */

		#define U8G_BADCONT 0x80000001 /* continuation when not in progress */
		#define U8G_INCMPLT 0x80000002 /* incomplete UTF-8 character */
		#define U8G_NOTUTF8 0x80000003 /* not a valid UTF-8 octet */
		#define U8G_ENDSTRG 0x80000004 /* end of string */
	/* ISO-2022 engine states */	/* ISO-2022 engine states */

	#define I2S_CHAR 0 /* character */	#define I2S_CHAR 0 /* character */
	#define I2S_ESC 1 /* previous character was ESC */	#define I2S_ESC 1 /* previous character was ESC */
	#define I2S_MUL 2 /* previous character was multi-byte code */	#define I2S_MUL 2 /* previous character was multi-byte code */
	#define I2S_INT 3 /* previous character was intermediate */	#define I2S_INT 3 /* previous character was intermediate */

	/* ISO-2022 Gn selections */	/* ISO-2022 Gn selections */

	#define I2C_G0 0 /* G0 */	#define I2C_G0 0 /* G0 */

	skipping to change at line 351	skipping to change at line 358
	unsigned int max_ku : 8; /* maximum row */	unsigned int max_ku : 8; /* maximum row */
	unsigned int max_ten : 8; /* maximum column */	unsigned int max_ten : 8; /* maximum column */
	void tab; / conversion table */	void tab; / conversion table */
	};	};

	/* Charset types */	/* Charset types */

	#define CT_ASCII 1 /* 7-bit ASCII no table */	#define CT_ASCII 1 /* 7-bit ASCII no table */
	#define CT_UCS2 2 /* 2 byte 16-bit Unicode no table */	#define CT_UCS2 2 /* 2 byte 16-bit Unicode no table */
	#define CT_UCS4 3 /* 4 byte 32-bit Unicode no table */	#define CT_UCS4 3 /* 4 byte 32-bit Unicode no table */

	#define CT_1BYTE0 10 /* 1 byte no table */	#define CT_1BYTE0 10 /* 1 byte ISO 8859-1 no table */
	#define CT_1BYTE 11 /* 1 byte ASCII + table 0x80-0xff */	#define CT_1BYTE 11 /* 1 byte ASCII + table 0x80-0xff */
	#define CT_1BYTE8 12 /* 1 byte table 0x00 - 0xff */	#define CT_1BYTE8 12 /* 1 byte table 0x00 - 0xff */
	#define CT_EUC 100 /* 2 byte ASCII + utf8_eucparam base/CS2/CS3 */	#define CT_EUC 100 /* 2 byte ASCII + utf8_eucparam base/CS2/CS3 */
	#define CT_DBYTE 101 /* 2 byte ASCII + utf8_eucparam */	#define CT_DBYTE 101 /* 2 byte ASCII + utf8_eucparam */
	#define CT_DBYTE2 102 /* 2 byte ASCII + utf8_eucparam plane1/2 */	#define CT_DBYTE2 102 /* 2 byte ASCII + utf8_eucparam plane1/2 */
	#define CT_UTF16 1000 /* 2 byte UTF-16 encoded Unicode no table */	#define CT_UTF16 1000 /* 2 byte UTF-16 encoded Unicode no table */
	#define CT_UTF8 1001 /* variable UTF-8 encoded Unicode no table * /	#define CT_UTF8 1001 /* variable UTF-8 encoded Unicode no table * /
	#define CT_UTF7 1002 /* variable UTF-7 encoded Unicode no table * /	#define CT_UTF7 1002 /* variable UTF-7 encoded Unicode no table * /
	#define CT_2022 10000 /* variable ISO-2022 encoded no table*/	#define CT_2022 10000 /* variable ISO-2022 encoded no table*/
	#define CT_SJIS 10001 /* 2 byte Shift-JIS encoded JIS no table */	#define CT_SJIS 10001 /* 2 byte Shift-JIS encoded JIS no table */

	skipping to change at line 373	skipping to change at line 380
	/* UTF-7 engine states */	/* UTF-7 engine states */

	#define U7_ASCII 0 /* ASCII character */	#define U7_ASCII 0 /* ASCII character */
	#define U7_PLUS 1 /* plus seen */	#define U7_PLUS 1 /* plus seen */
	#define U7_UNICODE 2 /* Unicode characters */	#define U7_UNICODE 2 /* Unicode characters */
	#define U7_MINUS 3 /* absorbed minus seen */	#define U7_MINUS 3 /* absorbed minus seen */
	/* Function prototypes */	/* Function prototypes */

	CHARSET utf8_charset (char charset);	CHARSET utf8_charset (char charset);
	long utf8_text (SIZEDTEXT text,char charset,SIZEDTEXT *ret,long flags);	long utf8_text (SIZEDTEXT text,char charset,SIZEDTEXT *ret,long flags);

		unsigned short utf8_rmap (char charset);
		long utf8_cstext (SIZEDTEXT text,char charset,SIZEDTEXT *ret,
		unsigned short errch);
		unsigned long utf8_get (unsigned char *s,unsigned long i);
		long utf8_cstocstext (SIZEDTEXT text,char sc,SIZEDTEXT ret,char dc,
		unsigned short errch);
		void utf8_text_1byte0 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_1byte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	void utf8_text_1byte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_1byte8 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	void utf8_text_1byte8 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_euc (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	void utf8_text_euc (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_dbyte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	void utf8_text_dbyte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_dbyte2 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	void utf8_text_dbyte2 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);
	void utf8_text_sjis (SIZEDTEXT text,SIZEDTEXT ret);	void utf8_text_sjis (SIZEDTEXT text,SIZEDTEXT ret);
	void utf8_text_2022 (SIZEDTEXT text,SIZEDTEXT ret);	void utf8_text_2022 (SIZEDTEXT text,SIZEDTEXT ret);
	void utf8_text_utf7 (SIZEDTEXT text,SIZEDTEXT ret);	void utf8_text_utf7 (SIZEDTEXT text,SIZEDTEXT ret);
	void utf8_searchpgm (SEARCHPGM pgm,char charset);	void utf8_searchpgm (SEARCHPGM pgm,char charset);
	void utf8_stringlist (STRINGLIST st,char charset);	void utf8_stringlist (STRINGLIST st,char charset);

End of changes. 5 change blocks.
	3 lines changed or deleted	17 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	newsrc.h	newsrc.h

	skipping to change at line 33	skipping to change at line 33
	long newsrc_error (char fmt,char text,long errflg);	long newsrc_error (char fmt,char text,long errflg);
	long newsrc_write_error (char name,FILE f1,FILE *f2);	long newsrc_write_error (char name,FILE f1,FILE *f2);
	FILE newsrc_create (MAILSTREAM stream,int notify);	FILE newsrc_create (MAILSTREAM stream,int notify);
	long newsrc_newstate (FILE f,char group,char state,char *nl);	long newsrc_newstate (FILE f,char group,char state,char *nl);
	long newsrc_newmessages (FILE f,MAILSTREAM stream,char *nl);	long newsrc_newmessages (FILE f,MAILSTREAM stream,char *nl);
	void newsrc_lsub (MAILSTREAM stream,char pattern);	void newsrc_lsub (MAILSTREAM stream,char pattern);
	long newsrc_update (MAILSTREAM stream,char group,char state);	long newsrc_update (MAILSTREAM stream,char group,char state);
	long newsrc_read (char group,MAILSTREAM stream);	long newsrc_read (char group,MAILSTREAM stream);
	long newsrc_write (char group,MAILSTREAM stream);	long newsrc_write (char group,MAILSTREAM stream);
	char newsrc_state (MAILSTREAM stream,char *group);	char newsrc_state (MAILSTREAM stream,char *group);

	void newsrc_check_uid (char state,unsigned long uid,unsigned long recent,	void newsrc_check_uid (unsigned char *state,unsigned long uid,
	unsigned long *unseen);	unsigned long recent,unsigned long unseen);

End of changes. 1 change blocks.
	0 lines changed or deleted	0 lines changed or added