uw-imap: headers diff between 2004g and 2006 versions

	c-client.h	c-client.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: c-client master include for application programs	* Program: c-client master include for application programs
	*	*
	* 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: 20 October 2003	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2003 University of Washington.
	* The full text of our legal notices is contained in the file called
	* 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 "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 */
	#include "nntp.h" /* NNTP sending routines */	#include "nntp.h" /* NNTP sending routines */

		#include "utf8.h" /* Unicode and charset routines */
	#include "misc.h" /* miscellaneous utility routines */	#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. 3 change blocks.
	6 lines changed or deleted	15 lines changed or added

	env.h	env.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Environment routines	* Program: Environment routines
	*	*
	* 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: 27 April 2004	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* Function prototypes */	/* Function prototypes */

	long pmatch_full (unsigned char s,unsigned char pat,unsigned char delim);	long pmatch_full (unsigned char s,unsigned char pat,unsigned char delim);
	long dmatch (unsigned char s,unsigned char pat,unsigned 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);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	flstring.h	flstring.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: File string routines	* Program: File string routines
	*	*
	* 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: 15 April 1997	* Date: 15 April 1997

	* Last Edited: 24 October 2000	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2000 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

	extern STRINGDRIVER file_string;	extern STRINGDRIVER file_string;

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	fs.h	fs.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Free storage management routines	* Program: Free storage management routines
	*	*
	* 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: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2000 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

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

	void *fs_get (size_t size);	void *fs_get (size_t size);
	void fs_resize (void **block,size_t size);	void fs_resize (void **block,size_t size);
	void fs_give (void **block);	void fs_give (void **block);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	ftl.h	ftl.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Crash management routines	* Program: Crash management routines
	*	*
	* 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: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2000 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

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

	void fatal (char *string);	void fatal (char *string);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	imap4r1.h	imap4r1.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Interactive Mail Access Protocol 4rev1 (IMAP4R1) routines	* Program: Interactive Mail Access Protocol 4rev1 (IMAP4R1) routines
	*	*
	* 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: 7 April 2005	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2005 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* Protocol levels */	/* Protocol levels */

	/* As of October 15, 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 extinct old TOPS-20, SUMEX servers	* IMAP2 1064 extinct old TOPS-20, SUMEX servers
	* IMAP2 1176 rare TOPS-20, old UW servers	* IMAP2 1176 rare TOPS-20, old UW servers

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	misc.h	misc.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Miscellaneous utility routines	* Program: Miscellaneous utility routines
	*	*
	* 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: 27 April 2004	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called
	* 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.
	*/	*/
	/* Hash table operations */	/* Hash table operations */


	skipping to change at line 83	skipping to change at line 91
	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);

		long ssearch (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);

		unsigned char hex2byte (unsigned char c1,unsigned char c2);
	int compare_ulong (unsigned long l1,unsigned long l2);	int compare_ulong (unsigned long l1,unsigned long l2);

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

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

	netmsg.h	netmsg.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Network message (SMTP/NNTP/POP2/POP3) routines	* Program: Network message (SMTP/NNTP/POP2/POP3) routines
	*	*
	* 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: 8 June 1995	* Date: 8 June 1995

	* Last Edited: 24 October 2000	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2000 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

	/* stream must be void* for use as readfn_t */	/* stream must be void* for use as readfn_t */
	long netmsg_read (void stream,unsigned long count,char buffer);	long netmsg_read (void stream,unsigned long count,char buffer);
	FILE netmsg_slurp (NETSTREAM stream,unsigned long size,unsigned long hs iz);	FILE netmsg_slurp (NETSTREAM stream,unsigned long size,unsigned long hs iz);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	newsrc.h	newsrc.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Newsrc manipulation routines	* Program: Newsrc manipulation routines
	*	*
	* 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: 12 September 1994	* Date: 12 September 1994

	* Last Edited: 24 October 2000	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2000 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

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

	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);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	nl.h	nl.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Newline routines	* Program: Newline routines
	*	*
	* 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: 27 April 2004	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2004 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

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

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

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	nntp.h	nntp.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Network News Transfer Protocol (NNTP) routines	* Program: Network News Transfer Protocol (NNTP) routines
	*	*
	* 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: 22 October 2003	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2003 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* Constants (should be in nntp.c) */	/* Constants (should be in nntp.c) */

	#define NNTPTCPPORT (long) 119 /* assigned TCP contact port */	#define NNTPTCPPORT (long) 119 /* assigned TCP contact port */

	/* NNTP open options	/* NNTP open options
	* For compatibility with the past, NOP_DEBUG must always be 1.	* For compatibility with the past, NOP_DEBUG must always be 1.
	*/	*/

	#define NOP_DEBUG (long) 0x1 /* debug protocol negotiations */	#define NOP_DEBUG (long) 0x1 /* debug protocol negotiations */

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	rfc822.h	rfc822.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: RFC 2822 and MIME routines	* Program: RFC 2822 and MIME routines
	*	*
	* 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: 8 September 2004	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2004 University of Washington.
	* The full text of our legal notices is contained in the file called
	* 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.
	*/	*/

	#define MAXGROUPDEPTH 50 /* RFC 822 doesn't allow nesting at all */	#define MAXGROUPDEPTH 50 /* RFC [2]822 doesn't allow any group nestin g */
	#define MAXMIMEDEPTH 50 /* more than any sane MIMEgram */	#define MAXMIMEDEPTH 50 /* more than any sane MIMEgram */


	#define rfc822_write_address(dest,adr) \	/* Output buffering for RFC [2]822 */
	rfc822_write_address_full (dest,adr,NIL)


	#define rfc822_parse_msg(en,bdy,s,i,bs,host,flags) \	typedef long (soutr_t) (void stream,char *string);
	rfc822_parse_msg_full (en,bdy,s,i,bs,host,0,flags)	typedef long (rfc822out_t) (char tmp,ENVELOPE env,BODY body,soutr_t f,
		void *s,long ok8bit);

		typedef struct rfc822buffer {
		soutr_t f; /* I/O flush routine */
		void s; / stream for I/O routine */
		char beg; / start of buffer */
		char cur; / current buffer pointer */
		char end; / end of buffer */
		} RFC822BUFFER;


		typedef long (rfc822outfull_t) (RFC822BUFFER buf,ENVELOPE env,BODY body
		,
		long ok8bit);
	/* Function prototypes */	/* Function prototypes */


	void rfc822_header (char header,ENVELOPE env,BODY *body);
	void rfc822_address_line (char *header,char type,ENVELOPE env,ADDRESS a
	dr);
	void rfc822_header_line (char *header,char type,ENVELOPE env,char text)
	;
	char rfc822_write_address_full (char dest,ADDRESS adr,char base);
	void rfc822_address (char dest,ADDRESS adr);
	void rfc822_cat (char dest,char src,const char *specials);
	void rfc822_write_body_header (char *header,BODY body);
	char *rfc822_default_subtype (unsigned short type);	char *rfc822_default_subtype (unsigned short type);
	void rfc822_parse_msg_full (ENVELOPE en,BODY bdy,char *s,unsigned long i,	void rfc822_parse_msg_full (ENVELOPE en,BODY bdy,char *s,unsigned long i,
	STRING bs,char host,unsigned long depth,	STRING bs,char host,unsigned long depth,
	unsigned long flags);	unsigned long flags);
	void rfc822_parse_content (BODY body,STRING bs,char *h,unsigned long dept h,	void rfc822_parse_content (BODY body,STRING bs,char *h,unsigned long dept h,
	unsigned long flags);	unsigned long flags);
	void rfc822_parse_content_header (BODY body,char name,char *s);	void rfc822_parse_content_header (BODY body,char name,char *s);
	void rfc822_parse_parameter (PARAMETER *par,char text);	void rfc822_parse_parameter (PARAMETER *par,char text);
	void rfc822_parse_adrlist (ADDRESS *lst,char string,char *host);	void rfc822_parse_adrlist (ADDRESS *lst,char string,char *host);
	ADDRESS rfc822_parse_address (ADDRESS lst,ADDRESS last,char **string,	ADDRESS rfc822_parse_address (ADDRESS lst,ADDRESS last,char **string,

	skipping to change at line 71	skipping to change at line 82
	ADDRESS rfc822_parse_addrspec (char string,char *ret,char defaulthost);	ADDRESS rfc822_parse_addrspec (char string,char *ret,char defaulthost);
	char rfc822_parse_domain (char string,char **end);	char rfc822_parse_domain (char string,char **end);
	char rfc822_parse_phrase (char string);	char rfc822_parse_phrase (char string);
	char rfc822_parse_word (char string,const char *delimiters);	char rfc822_parse_word (char string,const char *delimiters);
	char rfc822_cpy (char src);	char rfc822_cpy (char src);
	char rfc822_quote (char src);	char rfc822_quote (char src);
	ADDRESS rfc822_cpy_adr (ADDRESS adr);	ADDRESS rfc822_cpy_adr (ADDRESS adr);
	void rfc822_skipws (char **s);	void rfc822_skipws (char **s);
	char rfc822_skip_comment (char *s,long trim);	char rfc822_skip_comment (char *s,long trim);


	typedef long (soutr_t) (void stream,char *string);	long rfc822_output_full (RFC822BUFFER buf,ENVELOPE env,BODY *body,long ok
	typedef long (rfc822out_t) (char t,ENVELOPE env,BODY body,soutr_t f,	8);
	void *s,long ok8bit);	long rfc822_output_flush (RFC822BUFFER *buf);
		long rfc822_output_header (RFC822BUFFER buf,ENVELOPE env,BODY *body,
	long rfc822_output (char t,ENVELOPE env,BODY body,soutr_t f,void s,	const char *specials,long flags);
	long ok8bit);	long rfc822_output_header_line (RFC822BUFFER buf,char type,long resent,
		char *text);
		long rfc822_output_address_line (RFC822BUFFER buf,char type,long resent,
		ADDRESS adr,const char specials);
		long rfc822_output_address_list (RFC822BUFFER buf,ADDRESS adr,long pretty
		,
		const char *specials);
		long rfc822_output_address (RFC822BUFFER buf,ADDRESS adr);
		long rfc822_output_cat (RFC822BUFFER buf,char src,const char *specials);
		long rfc822_output_parameter (RFC822BUFFER buf,PARAMETER param);
		long rfc822_output_stringlist (RFC822BUFFER buf,STRINGLIST stl);
		long rfc822_output_body_header (RFC822BUFFER buf,BODY body);
	void rfc822_encode_body_7bit (ENVELOPE env,BODY body);	void rfc822_encode_body_7bit (ENVELOPE env,BODY body);
	void rfc822_encode_body_8bit (ENVELOPE env,BODY body);	void rfc822_encode_body_8bit (ENVELOPE env,BODY body);

	long rfc822_output_body (BODY body,soutr_t f,void s);	long rfc822_output_text (RFC822BUFFER buf,BODY body);
	void rfc822_base64 (unsigned char src,unsigned long srcl,unsigned long *l en);	void rfc822_base64 (unsigned char src,unsigned long srcl,unsigned long *l en);
	unsigned char rfc822_binary (void src,unsigned long srcl,unsigned long *l en);	unsigned char rfc822_binary (void src,unsigned long srcl,unsigned long *l en);
	unsigned char rfc822_qprint (unsigned char src,unsigned long srcl,	unsigned char rfc822_qprint (unsigned char src,unsigned long srcl,
	unsigned long *len);	unsigned long *len);
	unsigned char rfc822_8bit (unsigned char src,unsigned long srcl,	unsigned char rfc822_8bit (unsigned char src,unsigned long srcl,
	unsigned long *len);	unsigned long *len);

		/* Legacy routines for compatibility with the past */

		void rfc822_header (char header,ENVELOPE env,BODY *body);
		void rfc822_header_line (char *header,char type,ENVELOPE env,char text)
		;
		void rfc822_address_line (char *header,char type,ENVELOPE env,ADDRESS a
		dr);
		char rfc822_write_address_full (char dest,ADDRESS adr,char base);
		void rfc822_address (char dest,ADDRESS adr);
		void rfc822_cat (char dest,char src,const char *specials);
		void rfc822_write_body_header (char *header,BODY body);
		long rfc822_output (char t,ENVELOPE env,BODY body,soutr_t f,void s,
		long ok8bit);
		long rfc822_output_body (BODY body,soutr_t f,void s);

		#define rfc822_write_address(dest,adr) \
		rfc822_write_address_full (dest,adr,NIL)

		#define rfc822_parse_msg(en,bdy,s,i,bs,host,flags) \
		rfc822_parse_msg_full (en,bdy,s,i,bs,host,0,flags)

End of changes. 10 change blocks.
	27 lines changed or deleted	48 lines changed or added

	smtp.h	smtp.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: Simple Mail Transfer Protocol (SMTP) routines	* Program: Simple Mail Transfer Protocol (SMTP) routines
	*	*
	* 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: 10 March 2005	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2005 University of Washington.
	* The full text of our legal notices is contained in the file called
	* 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 (should be in smtp.c) */	/* Constants (should be in smtp.c) */


End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	sslio.h	sslio.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: SSL routines	* Program: SSL routines
	*	*
	* 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: 7 February 2001	* Date: 7 February 2001

	* Last Edited: 7 February 2001	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2001 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/
	/* SSL driver */	/* SSL driver */

	struct ssl_driver { /* must parallel NETDRIVER in mail.h */	struct ssl_driver { /* must parallel NETDRIVER in mail.h */
	SSLSTREAM (open) (char host,char service,unsigned long port);	SSLSTREAM (open) (char host,char service,unsigned long port);
	SSLSTREAM (aopen) (NETMBX mb,char service,char *usrbuf);	SSLSTREAM (aopen) (NETMBX mb,char service,char *usrbuf);
	char (getline) (SSLSTREAM *stream);	char (getline) (SSLSTREAM *stream);
	long (getbuffer) (SSLSTREAM stream,unsigned long size,char *buffer);	long (getbuffer) (SSLSTREAM stream,unsigned long size,char *buffer);
	long (soutr) (SSLSTREAM stream,char *string);	long (soutr) (SSLSTREAM stream,char *string);
	long (sout) (SSLSTREAM stream,char *string,unsigned long size);	long (sout) (SSLSTREAM stream,char *string,unsigned long size);

End of changes. 2 change blocks.
	6 lines changed or deleted	14 lines changed or added

	tcp.h	tcp.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: TCP/IP routines	* Program: TCP/IP routines
	*	*
	* 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: 7 January 2002	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 2002 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/	*/

	/* Dummy definition overridden by TCP routines */	/* Dummy definition overridden by TCP routines */

	#ifndef TCPSTREAM	#ifndef TCPSTREAM
	#define TCPSTREAM void	#define TCPSTREAM void
	#endif	#endif

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


	skipping to change at line 44	skipping to change at line 52
	long tcp_getdata (TCPSTREAM *stream);	long tcp_getdata (TCPSTREAM *stream);
	long tcp_soutr (TCPSTREAM stream,char string);	long tcp_soutr (TCPSTREAM stream,char string);
	long tcp_sout (TCPSTREAM stream,char string,unsigned long size);	long tcp_sout (TCPSTREAM stream,char string,unsigned long size);
	void tcp_close (TCPSTREAM *stream);	void tcp_close (TCPSTREAM *stream);
	char tcp_host (TCPSTREAM stream);	char tcp_host (TCPSTREAM stream);
	char tcp_remotehost (TCPSTREAM stream);	char tcp_remotehost (TCPSTREAM stream);
	unsigned long tcp_port (TCPSTREAM *stream);	unsigned long tcp_port (TCPSTREAM *stream);
	char tcp_localhost (TCPSTREAM stream);	char tcp_localhost (TCPSTREAM stream);
	char *tcp_clientaddr (void);	char *tcp_clientaddr (void);
	char *tcp_clienthost (void);	char *tcp_clienthost (void);

		long tcp_clientport (void);
	char *tcp_serveraddr (void);	char *tcp_serveraddr (void);
	char *tcp_serverhost (void);	char *tcp_serverhost (void);
	long tcp_serverport (void);	long tcp_serverport (void);
	char tcp_canonical (char name);	char tcp_canonical (char name);

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

	utf8.h	utf8.h

		/* ========================================================================
		* Copyright 1988-2006 University of Washington
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		*
		* ========================================================================
		*/

	/*	/*
	* Program: UTF-8 routines	* Program: UTF-8 routines
	*	*
	* 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: 7 April 2005	* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2005 University of Washington.
	* The full text of our legal notices is contained in the file called
	* 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 (thus in the BMP).
	* be changed if UTF-16 data (surrogate pairs) are ever an issue.	* Don't use these if UTF-16 data (surrogate pairs) are an issue.
		* For UCS-4 values, use the utf8_size() and utf8_put() functions.
	*/	*/


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


	#define UTF8_PUT(b,c) { \	#define UTF8_PUT_BMP(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_text() flag values */

		#define U8T_CASECANON 2 /* canonicalize case */
		#define U8T_DECOMPOSE 4 /* decompose */
		/* full canonicalization */
		#define U8T_CANONICAL (U8T_CASECANON \| U8T_DECOMPOSE)

	/* utf8_get() return values */	/* utf8_get() return values */

	/* 0x0000 - 0xffff BMP plane */	/* 0x0000 - 0xffff BMP plane */
	#define U8GM_NONBMP 0xffff0000 /* mask for non-BMP values */	#define U8GM_NONBMP 0xffff0000 /* mask for non-BMP values */
	/* 0x10000 - 0x10ffff extended planes */	/* 0x10000 - 0x10ffff extended planes */
	/* 0x110000 - 0x7ffffff non-Unicode */	/* 0x110000 - 0x7ffffff non-Unicode */
	#define U8G_ERROR 0x80000000 /* error flag */	#define U8G_ERROR 0x80000000 /* error flag */
	#define U8G_BADCONT U8G_ERROR+1 /* continuation when not in progress */	#define U8G_BADCONT U8G_ERROR+1 /* continuation when not in progress */
	#define U8G_INCMPLT U8G_ERROR+2 /* incomplete UTF-8 character */	#define U8G_INCMPLT U8G_ERROR+2 /* incomplete UTF-8 character */
	#define U8G_NOTUTF8 U8G_ERROR+3 /* not a valid UTF-8 octet */	#define U8G_NOTUTF8 U8G_ERROR+3 /* not a valid UTF-8 octet */
	#define U8G_ENDSTRG U8G_ERROR+4 /* end of string */	#define U8G_ENDSTRG U8G_ERROR+4 /* end of string */

		#define U8G_ENDSTRI U8G_ERROR+5 /* end of string w/ incomplete UTF-8
		char */

		/* ucs4_width() return values */

		#define U4W_ERROR 0x80000000 /* error flags */
		#define U4W_NOTUNCD U4W_ERROR+1 /* not a Unicode char */
		#define U4W_PRIVATE U4W_ERROR+2 /* private-space plane */
		#define U4W_SSPCHAR U4W_ERROR+3 /* Supplementary Special-purpose Pla
		ne */
		#define U4W_UNASSGN U4W_ERROR+4 /* unassigned space plane */
		#define U4W_CTLSRGT U4W_ERROR+5 /* C0/C1 control or surrogate */
	/* 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 300	skipping to change at line 326
	#define BITS7 0x7f /* 7-bit value mask */	#define BITS7 0x7f /* 7-bit value mask */
	#define BIT8 0x80 /* 8th bit mask */	#define BIT8 0x80 /* 8th bit mask */
	/* The following saves us from having to have yet more charset tables */	/* The following saves us from having to have yet more charset tables */

	/* Unicode codepoints */	/* Unicode codepoints */

	/* ISO 646 substituted Unicode codepoints */	/* ISO 646 substituted Unicode codepoints */
	#define UCS2_POUNDSTERLING 0x00a3	#define UCS2_POUNDSTERLING 0x00a3
	#define UCS2_YEN 0x00a5	#define UCS2_YEN 0x00a5
	#define UCS2_OVERLINE 0x203e	#define UCS2_OVERLINE 0x203e

		#define UCS2_EURO 0x20ac
	#define UCS2_KATAKANA 0xff61 /* first katakana codepoint */	#define UCS2_KATAKANA 0xff61 /* first katakana codepoint */
	#define UCS2_BOM 0xfeff /* byte order mark */	#define UCS2_BOM 0xfeff /* byte order mark */
	#define UCS2_BOGON 0xfffd /* replacement character */	#define UCS2_BOGON 0xfffd /* replacement character */


		#define UCS4_BMPBASE 0x0000 /* Basic Multilingual Plane */
		#define UCS4_SMPBASE 0x10000 /* Supplementary Multilinugual Plane */
		#define UCS4_SIPBASE 0x20000 /* Supplementary Ideographic Plane */
		#define UCS4_SSPBASE 0xe0000 /* Supplementary Special-purpose Plane */
		#define UCS4_PVTBASE 0xf0000 /* private-space (two planes) */
		#define UCS4_MAXUNICODE 0x10ffff/* highest Unicode codepoint */

	/* UBOGON is used to represent a codepoint in a character set which does n ot	/* UBOGON is used to represent a codepoint in a character set which does n ot
	* map to Unicode. It is also used for mapping failures, e.g. incomplete	* map to Unicode. It is also used for mapping failures, e.g. incomplete
	* shift sequences. NOCHAR is used to represent a codepoint in Unicode	* shift sequences. NOCHAR is used to represent a codepoint in Unicode
	* which does not map to the target character set. Note that these names	* which does not map to the target character set. Note that these names
	* have the same text width as 0x????, for convenience in the mapping table s.	* have the same text width as 0x????, for convenience in the mapping table s.
	*/	*/

	#define UBOGON UCS2_BOGON	#define UBOGON UCS2_BOGON
	#define NOCHAR 0xffff	#define NOCHAR 0xffff

		/* Non-Unicode codepoints */

	/* Codepoints in ISO 646 character sets */	/* Codepoints in ISO 646 character sets */

	/* British ASCII codepoints */	/* British ASCII codepoints */

	#define BRITISH_POUNDSTERLING 0x23	#define BRITISH_POUNDSTERLING 0x23

	/* JIS Roman codepoints */	/* JIS Roman codepoints */

	#define JISROMAN_YEN 0x5c	#define JISROMAN_YEN 0x5c
	#define JISROMAN_OVERLINE 0x7e	#define JISROMAN_OVERLINE 0x7e


	/* Hankaku katakana codepoints & parameters */	/* Hankaku katakana codepoints & parameters
		*
		* In earlier versions, MAX_KANA_7 and MAX_KANA_8 were the maximum codepoin
		t
		* values. Although this made sense, it was confusing with the "max ku" an
		d
		* "max ten" values used in the double-byte tables; there are 1-origin, but
		* the calculated values used for "ku" and "ten" are 0-origin (derived by
		* substracting the "base"). What this all meant is that for double byte
		* characters the limit test is of the form (value < max_ku), but for singl
		e
		* byte characters (which used the same cell to hold the max ku) the limit
		* test was (value <= max_ku).
		*
		* By making MAX_KANA_[78] be maximum+1, the same (value < max_ku) limit te
		st
		* is used throughout. - 6/15/2006
		*/

	#define MIN_KANA_7 0x21	#define MIN_KANA_7 0x21

	#define MAX_KANA_7 0x5f	#define MAX_KANA_7 0x60 /* maximum value + 1 */
	#define KANA_7 (UCS2_KATAKANA - MIN_KANA_7)	#define KANA_7 (UCS2_KATAKANA - MIN_KANA_7)
	#define MIN_KANA_8 (MIN_KANA_7 \| BIT8)	#define MIN_KANA_8 (MIN_KANA_7 \| BIT8)
	#define MAX_KANA_8 (MAX_KANA_7 \| BIT8)	#define MAX_KANA_8 (MAX_KANA_7 \| BIT8)
	#define KANA_8 (UCS2_KATAKANA - MIN_KANA_8)	#define KANA_8 (UCS2_KATAKANA - MIN_KANA_8)
	/* Charset scripts */	/* Charset scripts */

	/* The term "script" is used here in a very loose sense, enough to make	/* The term "script" is used here in a very loose sense, enough to make
	* purists cringe. Basically, the idea is to give the main program some	* purists cringe. Basically, the idea is to give the main program some
	* idea of how it should treat the characters of text in a charset with	* idea of how it should treat the characters of text in a charset with
	* respect to font, drawing routines, etc.	* respect to font, drawing routines, etc.

	skipping to change at line 395	skipping to change at line 443
	struct utf8_eucparam {	struct utf8_eucparam {
	unsigned int base_ku : 8; /* base row */	unsigned int base_ku : 8; /* base row */
	unsigned int base_ten : 8; /* base column */	unsigned int base_ten : 8; /* base column */
	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_UNKNOWN 0 /* unknown 8-bit */
	#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 ISO 8859-1 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 /* variable 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 */

	/* 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 */


		typedef unsigned long (*ucs4cn_t) (unsigned long c);
		typedef unsigned long (ucs4de_t) (unsigned long c,void *more);

	SCRIPT utf8_script (char script);	SCRIPT utf8_script (char script);

	CHARSET utf8_charset (char charset);	const CHARSET utf8_charset (char charset);
		char utf8_badcharset (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_text_cs (SIZEDTEXT text,const CHARSET cs,SIZEDTEXT *ret,
		ucs4cn_t cv,ucs4de_t de);
	long utf8_cstext (SIZEDTEXT text,char charset,SIZEDTEXT *ret,	long utf8_cstext (SIZEDTEXT text,char charset,SIZEDTEXT *ret,

	unsigned short errch);	unsigned long errch);
	unsigned long utf8_get (unsigned char *s,unsigned long i);
	long utf8_cstocstext (SIZEDTEXT text,char sc,SIZEDTEXT ret,char dc,	long utf8_cstocstext (SIZEDTEXT text,char sc,SIZEDTEXT ret,char dc,

	unsigned short errch);	unsigned long errch);
	void utf8_text_1byte0 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	unsigned short utf8_rmap (char charset);
	void utf8_text_1byte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	unsigned short utf8_rmap_cs (const CHARSET cs);
	void utf8_text_1byte8 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	unsigned short utf8_rmap_gen (const CHARSET cs,unsigned short *oldmap);
	void utf8_text_euc (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	long utf8_rmaptext (SIZEDTEXT text,unsigned short rmap,SIZEDTEXT *ret,
	void utf8_text_dbyte (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	unsigned long errch,long iso2022jp);
	void utf8_text_dbyte2 (SIZEDTEXT text,SIZEDTEXT ret,void *tab);	long ucs4_rmaptext (unsigned long ucs4,unsigned long len,unsigned short r
	void utf8_text_sjis (SIZEDTEXT text,SIZEDTEXT ret);	map,
	void utf8_text_2022 (SIZEDTEXT text,SIZEDTEXT ret);	SIZEDTEXT *ret,unsigned long errch);
	void utf8_text_utf7 (SIZEDTEXT text,SIZEDTEXT ret);	long ucs4_rmaplen (unsigned long ucs4,unsigned long len,unsigned short rm
		ap,
		unsigned long errch);
		long ucs4_rmapbuf (unsigned char t,unsigned long ucs4,unsigned long len,
		unsigned short *rmap,unsigned long errch);
		unsigned long utf8_get (unsigned char *s,unsigned long i);
		unsigned long ucs4_cs_get (CHARSET cs,unsigned char s,unsigned long i);
		const CHARSET utf8_infercharset (SIZEDTEXT src);
		long utf8_validate (unsigned char *s,unsigned long i);
		void utf8_text_1byte0 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t
		de);
		void utf8_text_1byte (SIZEDTEXT text,SIZEDTEXT ret,void *tab,ucs4cn_t cv,
		ucs4de_t de);
		void utf8_text_1byte8 (SIZEDTEXT text,SIZEDTEXT ret,void *tab,ucs4cn_t cv
		,
		ucs4de_t de);
		void utf8_text_euc (SIZEDTEXT text,SIZEDTEXT ret,void *tab,ucs4cn_t cv,
		ucs4de_t de);
		void utf8_text_dbyte (SIZEDTEXT text,SIZEDTEXT ret,void *tab,ucs4cn_t cv,
		ucs4de_t de);
		void utf8_text_dbyte2 (SIZEDTEXT text,SIZEDTEXT ret,void *tab,ucs4cn_t cv
		,
		ucs4de_t de);
		void utf8_text_sjis (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_2022 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_utf7 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_utf8 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_ucs2 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_ucs4 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t de
		);
		void utf8_text_utf16 (SIZEDTEXT text,SIZEDTEXT ret,ucs4cn_t cv,ucs4de_t d
		e);
		unsigned long utf8_size (unsigned long c);
		unsigned char utf8_put (unsigned char s,unsigned long c);
		unsigned long ucs4_titlecase (unsigned long c);
		long ucs4_width (unsigned long c);
		long utf8_strwidth (unsigned char *s);
		long utf8_textwidth (SIZEDTEXT *utf8);
		unsigned long ucs4_decompose (unsigned long c,void **more);
	void utf8_searchpgm (SEARCHPGM pgm,char charset);	void utf8_searchpgm (SEARCHPGM pgm,char charset);

	void utf8_stringlist (STRINGLIST st,char charset);	static void utf8_stringlist (STRINGLIST st,char charset);
	long utf8_mime2text (SIZEDTEXT src,SIZEDTEXT dst);	long utf8_mime2text (SIZEDTEXT src,SIZEDTEXT dst,long flags);
	unsigned char mime2_token (unsigned char s,unsigned char *se,	unsigned char mime2_token (unsigned char s,unsigned char *se,
	unsigned char **t);	unsigned char **t);

	unsigned char mime2_text (unsigned char s,unsigned char *se,	unsigned char mime2_text (unsigned char s,unsigned char *se);
	unsigned char **t);
	long mime2_decode (unsigned char e,unsigned char t,unsigned char *te,	long mime2_decode (unsigned char e,unsigned char t,unsigned char *te,
	SIZEDTEXT *txt);	SIZEDTEXT *txt);

End of changes. 22 change blocks.
	32 lines changed or deleted	133 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/

	mail.h		mail.h

			/* ========================================================================
			* Copyright 1988-2006 University of Washington
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			*
			* ========================================================================
			*/

	/*		/*
	* Program: Mailbox Access routines		* Program: Mailbox Access routines
	*		*
	* 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: 22 November 1989		* Date: 22 November 1989

	* Last Edited: 21 January 2005		* Last Edited: 30 August 2006
	*
	* The IMAP toolkit provided in this Distribution is
	* Copyright 1988-2005 University of Washington.
	* The full text of our legal notices is contained in the file called
	* CPYRIGHT, included with this Distribution.
	*/		*/
	/* Build parameters */		/* Build parameters */

	#define CACHEINCREMENT 250 /* cache growth increments */		#define CACHEINCREMENT 250 /* cache growth increments */
	#define MAILTMPLEN 1024 /* size of a temporary buffer */		#define MAILTMPLEN 1024 /* size of a temporary buffer */

	#define MAXMESSAGESIZE 65000 /* MS-DOS: maximum text buffer size		#define SENDBUFLEN 16385 /* size of temporary sending buffer, also