mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-20 19:24:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use libiconv instead of newlib's iconv

Browse Source 
Requires invalid input to be explicitly ignored, as unlike newlib invalid characters are not replaced with '?'
Fixes bug 2440
This commit is contained in:
Chris Young 2016-06-25 21:24:45 +01:00
parent 14bf4b47a5
commit 7051b9e563
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontends/amiga/Makefile.defaults
View File

@ -4,11 +4,7 @@
# Force using glibc internal iconv implementation instead of external libiconv
# Valid options: YES, NO
ifneq ($(SUBTARGET),os3)
NETSURF_USE_LIBICONV_PLUG := YES
else
NETSURF_USE_LIBICONV_PLUG := NO
endif
NETSURF_USE_LIBICONV_PLUG := NO
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO

14
frontends/amiga/utf8.c
View File

@ -16,10 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "amiga/os3support.h"
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <proto/exec.h>
#include <proto/utility.h>
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "netsurf/utf8.h"
@ -33,7 +38,13 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result)
nserror utf8_to_local_encoding(const char *string, size_t len, char **result)
{
return utf8_to_enc(string, nsoption_charp(local_charset), len, result);
nserror err = NSERROR_NOMEM;
char *local_charset = ASPrintf("%s//IGNORE", nsoption_charp(local_charset));
if(local_charset) {
err = utf8_to_enc(string, local_charset, len, result);
FreeVec(local_charset);
}
return err;
}
void ami_utf8_free(char *ptr)
@ -44,7 +55,6 @@ void ami_utf8_free(char *ptr)
char *ami_utf8_easy(const char *string)
{
char *localtext;
if(utf8_to_local_encoding(string, strlen(string), &localtext) == NSERROR_OK) {
return localtext;
} else {