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

on errors, output whatever we have before bailing out.

This commit is contained in:
yamt 2009-02-20 15:28:21 +00:00
parent 7abbdb7a0c
commit 99b23c11d2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: iconv.c,v 1.15 2009/02/20 15:27:08 yamt Exp $ */
/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt 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.15 2009/02/20 15:27:08 yamt Exp $");
__RCSID("$NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $");
#endif /* LIBC_SCCS and not lint */
#include <err.h>
@ -116,6 +116,9 @@ do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
ret = __iconv(cd, &in, &inbytes, &out, &outbytes,
flags, &inval);
invalids += inval;
if (outbytes < OUTBUFSIZE)
(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes,
stdout);
if (ret == (size_t)-1 && errno != E2BIG) {
/*
* XXX: iconv(3) is bad interface.
@ -130,6 +133,7 @@ do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
ret = fread(inbuf + inbytes, 1,
INBUFSIZE - inbytes, fp);
if (ret == 0) {
fflush(stdout);
if (feof(fp))
errx(EXIT_FAILURE,
"unexpected end of file; "
@ -141,9 +145,6 @@ do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
in = inbuf;
inbytes += ret;
}
if (outbytes < OUTBUFSIZE)
(void)fwrite(outbuf, 1, OUTBUFSIZE - outbytes,
stdout);
}
}
/* reset the shift state of the output buffer */