]>
Commit | Line | Data |
---|---|---|
65546d4b JK |
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 | |
4 | @@ -16,6 +16,8 @@ | |
5 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. | |
6 | */ | |
7 | ||
8 | +#define _GNU_SOURCE 1 | |
9 | + | |
10 | #include "mutt.h" | |
11 | #include "mutt_menu.h" | |
12 | #include "mutt_curses.h" | |
13 | @@ -30,6 +32,7 @@ | |
14 | #include <string.h> | |
15 | #include <errno.h> | |
16 | #include <ctype.h> | |
17 | +#include <wchar.h> | |
18 | ||
19 | #ifdef HAVE_LANGINFO_YESEXPR | |
20 | #include <langinfo.h> | |
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 | |
24 | @@ -17,6 +17,8 @@ | |
25 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. | |
26 | */ | |
27 | ||
28 | +#define _GNU_SOURCE 1 | |
29 | + | |
30 | #include "mutt.h" | |
31 | #include "mutt_menu.h" | |
32 | #include "mutt_curses.h" | |
33 | @@ -24,6 +26,7 @@ | |
34 | #include "history.h" | |
35 | ||
36 | #include <string.h> | |
37 | +#include <wchar.h> | |
38 | ||
39 | /* redraw flags for mutt_enter_string() */ | |
40 | enum | |
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 | |
44 | @@ -28,6 +28,7 @@ | |
45 | #define _EXTLIB_C | |
46 | ||
47 | #include "lib.h" | |
48 | +#include <stdlib.h> | |
49 | ||
50 | void (*mutt_error) (const char *, ...) = mutt_nocurses_error; | |
51 | ||
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 | |
55 | @@ -16,6 +16,7 @@ | |
56 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. | |
57 | */ | |
58 | ||
59 | +#define _GNU_SOURCE 1 | |
60 | #define HELP_C | |
61 | ||
62 | #include "mutt.h" | |
63 | @@ -26,6 +27,7 @@ | |
64 | ||
65 | #include <ctype.h> | |
66 | #include <string.h> | |
67 | +#include <wchar.h> | |
68 | ||
69 | static struct binding_t *help_lookupFunction (int op, int menu) | |
70 | { | |
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 | |
74 | @@ -435,7 +435,7 @@ | |
75 | rewind (fp); | |
76 | ||
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); | |
80 | ||
81 | imap_cmd_start (idata, buf); | |
82 | ||
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 | |
86 | @@ -16,6 +16,8 @@ | |
87 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. | |
88 | */ | |
89 | ||
90 | +#define _GNU_SOURCE 1 | |
91 | + | |
92 | #include "mutt.h" | |
93 | #include "mapping.h" | |
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 | |
98 | @@ -74,6 +74,9 @@ | |
99 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n\ | |
100 | "); | |
101 | ||
102 | +void mutt_start_slrnface(void); | |
103 | +void mutt_stop_slrnface(void); | |
104 | + | |
105 | void mutt_exit (int code) | |
106 | { | |
107 | mutt_endwin (NULL); | |
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 | |
111 | @@ -26,6 +26,9 @@ | |
112 | #include <sasl.h> | |
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> | |
118 | ||
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 | |
121 | @@ -212,6 +215,7 @@ | |
122 | { | |
123 | char prompt[SHORT_STRING]; | |
124 | char resp[SHORT_STRING]; | |
125 | + char * result; | |
126 | ||
127 | while (interaction->id != SASL_CB_LIST_END) | |
128 | { | |
129 | @@ -223,8 +227,9 @@ | |
130 | return SASL_FAIL; | |
131 | ||
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; | |
138 | ||
139 | interaction++; | |
140 | } | |
141 | @@ -258,7 +263,7 @@ | |
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)); | |
148 | ||
149 | /* clear input buffer */ | |
150 | @@ -424,7 +429,7 @@ | |
151 | if (rc <= 0) | |
152 | goto out; | |
153 | ||
154 | - rc = sasl_decode (sasldata->saslconn, buf, rc, &sasldata->buf, | |
155 | + rc = sasl_decode (sasldata->saslconn, buf, rc, (const char **)&sasldata->buf, | |
156 | &sasldata->blen); | |
157 | if (rc != SASL_OK) | |
158 | { | |
159 | @@ -472,7 +477,7 @@ | |
160 | { | |
161 | olen = (len > *sasldata->pbufsize) ? *sasldata->pbufsize : len; | |
162 | ||
163 | - rc = sasl_encode (sasldata->saslconn, buf, olen, &pbuf, &plen); | |
164 | + rc = sasl_encode (sasldata->saslconn, buf, olen, (const char **)&pbuf, &plen); | |
165 | if (rc != SASL_OK) | |
166 | { | |
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 | |
171 | @@ -16,6 +16,8 @@ | |
172 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. | |
173 | */ | |
174 | ||
175 | +#define _GNU_SOURCE 1 | |
176 | + | |
177 | #include "mutt.h" | |
178 | #include "mutt_curses.h" | |
179 | #include "mutt_regex.h" | |
180 | @@ -52,6 +54,7 @@ | |
181 | #include <stdlib.h> | |
182 | #include <string.h> | |
183 | #include <errno.h> | |
184 | +#include <wchar.h> | |
185 | ||
186 | #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) | |
187 | ||
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 @@ | |
192 | #ifndef REGEX_MALLOC | |
193 | char *destination; | |
194 | #endif | |
195 | - /* We don't push any register information onto the failure stack. */ | |
196 | - unsigned num_regs = 0; | |
197 | ||
198 | register char *fastmap = bufp->fastmap; | |
199 | unsigned char *pattern = bufp->buffer; |