From ac3d553b8b5bcfbc7a13bd746966036422cf5275 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Jul 2002 08:20:17 +0000 Subject: Update. 2002-07-27 Ulrich Drepper * iconvdata/Makefile (CPPFLAGS): Add NOT_IN_libc. * iconv/iconv_prog.c (main): Improve error message for the cases where -t and/or -f parameter are missing. 2002-07-10 Stepan Kasal * posix/regexec.c (re_match): Reorganize to remove duplicate code. (re_search): Likewise. (re_match_2): Likewise. (re_search_2): Likewise. (re_search_stub): New function. (re_search_2_stub): New function. * regcomp.c (re_compile_pattern): Typo in a comment fixed. 2002-07-10 Isamu Hasegawa * posix/regex_internal.h: Add new member STOP to struct re_string_t. (re_string_eoi): Use STOP instead of LEN. * posix/regex_internal.c (re_string_allocate): Initialize pstr->len. (re_string_construct): Likewise. (re_string_reconstruct): Adjust pstr->stop like pstr->len. * posix/regexec.c (re_search_internal): Add a new argument STOP so that it can handle the argument STOP of re_search_2 and re_match_2 correctly. (regexec): Adapt to new I/F of re_search_internal. (re_search_stub): Likewise. --- iconv/iconv_prog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'iconv') diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index baeec79..f7aa340 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -220,7 +221,8 @@ main (int argc, char *argv[]) if (errno == EINVAL) error (EXIT_FAILURE, 0, _("conversion from `%s' to `%s' not supported"), - from_code, orig_to_code); + from_code[0] ? from_code : nl_langinfo (CODESET), + orig_to_code[0] ? orig_to_code : nl_langinfo (CODESET)); else error (EXIT_FAILURE, errno, _("failed to start conversion processing")); -- cgit v1.1