Allow this code to compile with an older version of GCC and on an older

version of FreeBSD.

3 files changed, 63 insertions, 1 deletions

diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index c5f1e9305d8..abcad2373ed 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2007/08/10 17:57:13 jlam Exp $
+$NetBSD: distinfo,v 1.17 2007/09/06 04:05:41 jlam Exp $
 
 SHA1 (sqwebmail-5.1.6.tar.bz2) = 04ecff69dfcd01fc947adfafe39d8f2bd80254e6
 RMD160 (sqwebmail-5.1.6.tar.bz2) = 231c0f972a7423c231ff7db8bacc6417aae5354a
@@ -8,4 +8,6 @@ SHA1 (patch-ad) = 813bab377ad047599af8846631e16a240f2fd7ec
 SHA1 (patch-ah) = 5f88760e7d69fbad6894557283c069e0c9592044
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
 SHA1 (patch-aj) = 510c91faf9d0cd584b5ec9da07a034a7d89d62f3
+SHA1 (patch-ak) = e84966ea5ed5cee58bbde380f0d9ace31034e1ba
 SHA1 (patch-am) = 8d78356319eead76a9170bf8183ddddb34481552
+SHA1 (patch-an) = 288dfa758d39c8e0efde2ff8b9325268b3910265
diff --git a/mail/sqwebmail/patches/patch-ak b/mail/sqwebmail/patches/patch-ak
new file mode 100644
index 00000000000..5c8140d720e
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.3 2007/09/06 04:05:41 jlam Exp $
+
+--- sqwebmail/folder.c.orig	2007-02-24 14:05:45.000000000 -0500
++++ sqwebmail/folder.c
+@@ -270,7 +270,7 @@ void folder_delmsgs(const char *dir, siz
+ 	} 
+ 	else if (*cgi("cmdpurgeall")) 
+ 	{
+-	    char *deldir;
++	    char *cur, *deldir;
+ 	    struct maildir_info minfo;
+ 
+ 	    if (maildir_info_imap_find(&minfo, dir, login_returnaddr())<0) 
+@@ -288,7 +288,7 @@ void folder_delmsgs(const char *dir, siz
+ 		return;
+ 	    }
+ 	    
+-	    char *cur = malloc(strlen(deldir)+5);
++	    cur = malloc(strlen(deldir)+5);
+ 	    strcpy(cur, deldir);
+ 	    strcat(cur, "/cur");
+ 
diff --git a/mail/sqwebmail/patches/patch-an b/mail/sqwebmail/patches/patch-an
new file mode 100644
index 00000000000..69b9afd1a24
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-an
@@ -0,0 +1,38 @@
+$NetBSD: patch-an,v 1.1 2007/09/06 04:05:42 jlam Exp $
+
+--- sqwebmail/newmsg.c.orig	2007-02-24 14:05:45.000000000 -0500
++++ sqwebmail/newmsg.c
+@@ -72,12 +72,15 @@ static void newmsg_header(const char *la
+ {
+ int		hdrmaxlen=512;
+ const char	*p=getarg("HDRMAXLEN");
++#if	HAVE_SQWEBMAIL_UNICODE
++const struct unicode_info *uiptr;
++#endif
+ 
+ 	if (p && (atoi(p) > hdrmaxlen))
+ 		hdrmaxlen=atoi(p);
+ 
+ #if	HAVE_SQWEBMAIL_UNICODE
+-const struct unicode_info *uiptr=unicode_find(sqwebmail_content_charset);
++	uiptr=unicode_find(sqwebmail_content_charset);
+ #endif
+ 	printf("<tr><th align=\"right\"><p class=\"new-message-header\">"
+ 	       "<span class=\"new-message-header-%s\">%s</span></p></th>"
+@@ -493,6 +496,7 @@ void newmsg_init(const char *folder, con
+ 	char	*draftmessagefilename;
+ 	const	char *p;
+ 	FILE	*fp;
++	int	wbnochangingfrom;
+ 	int	attachcnt=0;
+ 	char	*cursubj, *curto, *curcc, *curbcc, *curfrom, *curreplyto;
+ 
+@@ -642,7 +646,7 @@ void newmsg_init(const char *folder, con
+ 	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n");
+ 
+ 	printf("<table border=\"0\" width=\"100%%\">\n");
+-	int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
++	wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
+ 	if (wbnochangingfrom < 2)
+ 		newmsg_header_rfc822(fromlab, "headerfrom", curfrom,
+ 			*cgi("from") ? cgi("from"):