From b87507117c2424239f69ca7e3c5e6c2a52328839 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 6 Apr 2003 20:36:19 +0000 Subject: (process_block): Don't print message about invliad input if the -c option is used. --- iconv/iconv_prog.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'iconv') diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 78b430d..81edc96 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -160,14 +160,16 @@ main (int argc, char *argv[]) if (*errhand == '/') { --nslash; - ++errhand; + errhand = strchr (errhand, '\0'); } } - newp = (char *) alloca (errhand - to_code + nslash + 6 + 1); + newp = (char *) alloca (errhand - to_code + nslash + 7 + 1); cp = mempcpy (newp, to_code, errhand - to_code); while (nslash-- > 0) *cp++ = '/'; + if (cp[-1] != '/') + *cp++ = ','; memcpy (cp, "IGNORE", sizeof ("IGNORE")); to_code = newp; @@ -496,8 +498,9 @@ conversion stopped due to problem in writing the output")); switch (errno) { case EILSEQ: - error (0, 0, _("illegal input sequence at position %ld"), - (long) (addr - start)); + if (! omit_invalid) + error (0, 0, _("illegal input sequence at position %ld"), + (long int) (addr - start)); break; case EINVAL: error (0, 0, _("\ -- cgit v1.1