Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save errno around fwrite(), which can otherwise trash it; PR 47813. 

This appears to fully resolve the problem described in the PR, even
though one might think it wouldn't.
This commit is contained in:
dholland 2013-10-07 02:00:46 +00:00
parent 603ad97a41
commit 04fb430032
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/iconv/iconv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $ */
/* $NetBSD: iconv.c,v 1.19 2013/10/07 02:00:46 dholland Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $");
__RCSID("$NetBSD: iconv.c,v 1.19 2013/10/07 02:00:46 dholland Exp $");
#endif /* LIBC_SCCS and not lint */
#include <err.h>
@ -99,6 +99,7 @@ do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
size_t inbytes, outbytes, ret, invalids;
iconv_t cd;
uint32_t flags = 0;
int serrno;
if (hide_invalid)
flags |= __ICONV_F_HIDE_INVALID;
@ -116,10 +117,12 @@ do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
outbytes = OUTBUFSIZE;
ret = __iconv(cd, &in, &inbytes, &out, &outbytes,
flags, &inval);
serrno = errno;
invalids += inval;
if (outbytes < OUTBUFSIZE)
(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes,
stdout);
errno = serrno;
if (ret == (size_t)-1 && errno != E2BIG) {
/*
* XXX: iconv(3) is bad interface.