File 64bit.patch of Package hypermail
diff -ru hypermail-2.2.0.20070131.orig/src/parse.c hypermail-2.2.0.20070131/src/parse.c
--- hypermail-2.2.0.20070131.orig/src/parse.c 2005-10-25 08:19:25.000000000 +0200
+++ hypermail-2.2.0.20070131/src/parse.c 2007-02-01 16:21:32.000000000 +0100
@@ -48,6 +48,10 @@
#include <sys/dir.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
/*
** LCC doesn't have lstat() defined in sys/stat.h. We'll define it
** in lcc_extras.h, but really it just calls stat().
@@ -862,7 +866,7 @@
#ifdef HAVE_ICONV
char *orig2,*output2,*output3;
- int len;
+ size_t len;
orig2=output2=malloc(strlen(string)+1);
memset(output2,0,strlen(string)+1);
old_output=output;
@@ -3110,7 +3114,7 @@
#if HAVE_ICONV
if (charset){
char *tmpptr;
- int tmplen=0;
+ size_t tmplen=0;
tmpptr=subject;
subject=i18n_convstring(tmpptr,charset,"UTF-8",&tmplen);
if(tmpptr)
diff -ru hypermail-2.2.0.20070131.orig/src/print.c hypermail-2.2.0.20070131/src/print.c
--- hypermail-2.2.0.20070131.orig/src/print.c 2006-03-28 04:00:18.000000000 +0200
+++ hypermail-2.2.0.20070131/src/print.c 2007-02-01 17:00:28.000000000 +0100
@@ -46,6 +46,10 @@
#endif
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
static char *indextypename[NO_INDEX];
#ifdef GDBM
@@ -1412,7 +1416,7 @@
fprintf(fp, "<address class=\"headers\">\n");
#ifdef HAVE_ICONV
- int tmplen;
+ size_t tmplen;
char *tmpsubject=i18n_convstring(email->subject,"UTF-8",email->charset,&tmplen);
char *tmptmpname=i18n_convstring(email->name,"UTF-8",email->charset,&tmplen);
char *tmpname=convchars(tmptmpname,"utf-8");
@@ -2040,7 +2044,7 @@
char *ptr;
#ifdef HAVE_ICONV
char *localsubject=NULL,*localname=NULL;
- int convlen=0;
+ size_t convlen=0;
#endif
diff -ru hypermail-2.2.0.20070131.orig/src/proto.h hypermail-2.2.0.20070131/src/proto.h
--- hypermail-2.2.0.20070131.orig/src/proto.h 2005-10-25 08:22:09.000000000 +0200
+++ hypermail-2.2.0.20070131/src/proto.h 2007-02-01 16:21:32.000000000 +0100
@@ -93,7 +93,7 @@
/*
** string.c functions
*/
-char *i18n_convstring(char *, char *, char *, int *);
+char *i18n_convstring(char *, char *, char *, size_t *);
char *i18n_utf2numref(char *, int);
char *i18n_numref2utf(char *);
diff -ru hypermail-2.2.0.20070131.orig/src/string.c hypermail-2.2.0.20070131/src/string.c
--- hypermail-2.2.0.20070131.orig/src/string.c 2005-11-02 14:44:48.000000000 +0100
+++ hypermail-2.2.0.20070131/src/string.c 2007-02-01 16:41:10.000000000 +0100
@@ -28,6 +28,10 @@
#include "parse.h"
#include "uconvert.h"
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
/* I18N hack */
#ifdef HAVE_ICONV_H
#include <iconv.h>
@@ -93,9 +97,9 @@
}
-char *i18n_convstring(char *string, char *fromcharset, char *tocharset, int *len){
+char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *len){
- int origlen,strleft,bufleft;
+ size_t origlen,strleft,bufleft;
char *convbuf,*origconvbuf;
iconv_t iconvfd;
size_t ret;
@@ -1226,7 +1230,7 @@
free(newcmd2);
/* put subject */
- if (strlen(subject)>0){
+ if (subject && strlen(subject)>0){
newcmd2 = replace(newcmd, "$SUBJECT", convsubj);
}else{
newcmd2 = replace(newcmd, "$SUBJECT", "");