diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-04-17 09:40:29 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-04-17 09:40:29 -0600 |
| commit | 69b0d3a5dff7b8be0deada358dad1a55f319d769 (patch) | |
| tree | 9e8196a7d34e6b3a87525992c0f4c85362d06a07 | |
| parent | bf49fb6584bfd8c4cfae5bab4c5f46b155bcb5a7 (diff) | |
| download | alpine-69b0d3a5dff7b8be0deada358dad1a55f319d769.tar.xz | |
NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
* Call to utf8_parameters was not prototyped.
* Call to utf8_parameters did not return NULL when the value to be
searched was not defined by that function, causing a crash. Reported
and fixed by Dennis Davis.
| -rw-r--r-- | imap/src/c-client/utf8.c | 2 | ||||
| -rw-r--r-- | pico/main.c | 4 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 | ||||
| -rw-r--r-- | po/Makefile.in | 14 |
4 files changed, 12 insertions, 10 deletions
diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c index e734a6bb..cad4a7c7 100644 --- a/imap/src/c-client/utf8.c +++ b/imap/src/c-client/utf8.c @@ -2595,6 +2595,8 @@ void *utf8_parameters (long function,void *value) case GET_UCS4WIDTH: ret = (void *) ucs4width; break; + default: ret = NULL; + break; } return ret; } diff --git a/pico/main.c b/pico/main.c index 9fe41789..22e376bd 100644 --- a/pico/main.c +++ b/pico/main.c @@ -31,12 +31,12 @@ static char rcsid[] = "$Id: main.c 1184 2008-12-16 23:52:15Z hubert@u.washington #include "headers.h" #include "../c-client/mail.h" #include "../c-client/rfc822.h" +#include "../c-client/utf8.h" #include "../pith/osdep/collate.h" #include "../pith/charconv/filesys.h" #include "../pith/charconv/utf8.h" #include "../pith/conf.h" - /* * Useful internal prototypes */ @@ -167,7 +167,7 @@ main(int argc, char *argv[]) char *err = NULL; #ifndef _WINDOWS - utf8_parameters(SET_UCS4WIDTH, pith_ucs4width); + utf8_parameters(SET_UCS4WIDTH, (void *) pith_ucs4width); #endif /* _WINDOWS */ set_input_timeout(600); diff --git a/pith/pine.hlp b/pith/pine.hlp index 4f57b688..10f4473b 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 73 2015-04-03 17:07:19 +Alpine Commit 75 2015-04-17 09:40:25 ============= h_news ================= <HTML> <HEAD> diff --git a/po/Makefile.in b/po/Makefile.in index 0ab3b490..dec3b36b 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, $(MKDIR_P) is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh -d -install_sh = $(SHELL) ${SHELL} /run/media/chappa/Alpine/alpine/alpinegit/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh -d +install_sh = $(SHELL) ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh MKDIR_P = /usr/bin/mkdir -p mkdir_p = $(MKDIR_P) @@ -51,12 +51,12 @@ MSGFMT_ = /usr/bin/msgfmt MSGFMT_no = /usr/bin/msgfmt MSGFMT_yes = /usr/bin/msgfmt MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) -XGETTEXT_ = : -XGETTEXT_no = : -XGETTEXT_yes = : +XGETTEXT_ = /usr/bin/xgettext +XGETTEXT_no = /usr/bin/xgettext +XGETTEXT_yes = /usr/bin/xgettext XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) MSGMERGE = msgmerge -MSGMERGE_UPDATE = : --update +MSGMERGE_UPDATE = /usr/bin/msgmerge --update MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter |