1 diff -dur mutt-1.4.1.orig/curs_lib.c mutt-1.4.1/curs_lib.c
2 --- mutt-1.4.1.orig/curs_lib.c 2001-10-10 14:49:37.000000000 +0200
3 +++ mutt-1.4.1/curs_lib.c 2004-02-05 08:53:53.097928184 +0100
5 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
11 #include "mutt_menu.h"
12 #include "mutt_curses.h"
19 #ifdef HAVE_LANGINFO_YESEXPR
21 diff -dur mutt-1.4.1.orig/enter.c mutt-1.4.1/enter.c
22 --- mutt-1.4.1.orig/enter.c 2001-10-03 00:20:03.000000000 +0200
23 +++ mutt-1.4.1/enter.c 2004-02-05 08:54:06.695860984 +0100
25 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
28 +#define _GNU_SOURCE 1
31 #include "mutt_menu.h"
32 #include "mutt_curses.h"
39 /* redraw flags for mutt_enter_string() */
41 diff -dur mutt-1.4.1.orig/extlib.c mutt-1.4.1/extlib.c
42 --- mutt-1.4.1.orig/extlib.c 2000-04-22 10:47:31.000000000 +0200
43 +++ mutt-1.4.1/extlib.c 2004-02-05 08:53:31.728176880 +0100
50 void (*mutt_error) (const char *, ...) = mutt_nocurses_error;
52 diff -dur mutt-1.4.1.orig/help.c mutt-1.4.1/help.c
53 --- mutt-1.4.1.orig/help.c 2000-10-07 20:06:24.000000000 +0200
54 +++ mutt-1.4.1/help.c 2004-02-05 08:54:24.125211320 +0100
56 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
59 +#define _GNU_SOURCE 1
69 static struct binding_t *help_lookupFunction (int op, int menu)
71 diff -dur mutt-1.4.1.orig/imap/message.c mutt-1.4.1/imap/message.c
72 --- mutt-1.4.1.orig/imap/message.c 2002-04-07 23:19:57.000000000 +0200
73 +++ mutt-1.4.1/imap/message.c 2004-02-05 08:53:31.729176728 +0100
77 imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
78 - snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%d}", mbox, len);
79 + snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%ld}", mbox, (long)len);
81 imap_cmd_start (idata, buf);
83 diff -dur mutt-1.4.1.orig/init.c mutt-1.4.1/init.c
84 --- mutt-1.4.1.orig/init.c 2004-02-05 08:38:03.000000000 +0100
85 +++ mutt-1.4.1/init.c 2004-02-05 08:53:31.730176576 +0100
87 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
90 +#define _GNU_SOURCE 1
94 #include "mutt_curses.h"
95 diff -dur mutt-1.4.1.orig/main.c mutt-1.4.1/main.c
96 --- mutt-1.4.1.orig/main.c 2004-02-05 08:38:03.000000000 +0100
97 +++ mutt-1.4.1/main.c 2004-02-05 08:53:31.731176424 +0100
99 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n\
102 +void mutt_start_slrnface(void);
103 +void mutt_stop_slrnface(void);
105 void mutt_exit (int code)
108 diff -dur mutt-1.4.1.orig/mutt_sasl.c mutt-1.4.1/mutt_sasl.c
109 --- mutt-1.4.1.orig/mutt_sasl.c 2004-02-05 08:38:03.000000000 +0100
110 +++ mutt-1.4.1/mutt_sasl.c 2004-02-05 09:01:49.346527392 +0100
113 #include <sys/socket.h>
114 #include <netinet/in.h>
115 +#include <sys/types.h>
116 +#include <sys/socket.h>
117 +#include <arpa/inet.h>
119 /* arbitrary. SASL will probably use a smaller buffer anyway. OTOH it's
120 * been a while since I've had access to an SASL server which negotiated
123 char prompt[SHORT_STRING];
124 char resp[SHORT_STRING];
127 while (interaction->id != SASL_CB_LIST_END)
132 interaction->len = mutt_strlen (resp)+1;
133 - interaction->result = safe_malloc (interaction->len);
134 - memcpy (interaction->result, resp, interaction->len);
135 + result = safe_malloc (interaction->len);
136 + memcpy (result, resp, interaction->len);
137 + interaction->result=result;
142 dprint (3, (debugfile, "SASL protection strength: %u\n", *sasldata->ssf));
143 /* Add SASL SSF to transport SSF */
144 conn->ssf += *sasldata->ssf;
145 - sasl_getprop (saslconn, SASL_MAXOUTBUF, (void**) &sasldata->pbufsize);
146 + sasl_getprop (saslconn, SASL_MAXOUTBUF, (const void**) &sasldata->pbufsize);
147 dprint (3, (debugfile, "SASL protection buffer size: %u\n", *sasldata->pbufsize));
149 /* clear input buffer */
154 - rc = sasl_decode (sasldata->saslconn, buf, rc, &sasldata->buf,
155 + rc = sasl_decode (sasldata->saslconn, buf, rc, (const char **)&sasldata->buf,
161 olen = (len > *sasldata->pbufsize) ? *sasldata->pbufsize : len;
163 - rc = sasl_encode (sasldata->saslconn, buf, olen, &pbuf, &plen);
164 + rc = sasl_encode (sasldata->saslconn, buf, olen, (const char **)&pbuf, &plen);
167 dprint (1, (debugfile, "SASL encoding failed: %s\n",
168 diff -dur mutt-1.4.1.orig/pager.c mutt-1.4.1/pager.c
169 --- mutt-1.4.1.orig/pager.c 2004-02-05 08:38:03.000000000 +0100
170 +++ mutt-1.4.1/pager.c 2004-02-05 08:54:45.326988160 +0100
172 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
175 +#define _GNU_SOURCE 1
178 #include "mutt_curses.h"
179 #include "mutt_regex.h"
186 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
188 diff -dur mutt-1.4.1.orig/regex.c mutt-1.4.1/regex.c
189 --- mutt-1.4.1.orig/regex.c 2001-01-09 00:09:30.000000000 +0100
190 +++ mutt-1.4.1/regex.c 2004-02-05 08:55:22.777294848 +0100
191 @@ -3113,8 +3113,6 @@
195 - /* We don't push any register information onto the failure stack. */
196 - unsigned num_regs = 0;
198 register char *fastmap = bufp->fastmap;
199 unsigned char *pattern = bufp->buffer;