summaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-04 12:33:59 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-04 12:33:59 +0000
commit3c5edd4dc680911b5dd1bd9a0c2b55cc134b6a46 (patch)
tree084f88fb4c54c55864087c54d94bc7940a6c02b0 /iconv
parentdcac8408e04f993354bbc3a89a1a100d4a15baf0 (diff)
downloadglibc-3c5edd4dc680911b5dd1bd9a0c2b55cc134b6a46.tar.gz
Update.
1999-01-04 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Update year in copyright message text. * db2/makedb.c: Likewise. * debug/catchsegv.sh: Likewise. * elf/ldd.bash.in: Likewise. * iconv/iconv_prog.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * malloc/mtrace.pl: Likewise. * nscd/nscd.c: Likewise. 1999-01-02 Philip Blundell <philb@gnu.org> * sunrpc/Makefile: Ensure that we really use the right path for cpp. 1999-01-03 Philip Blundell <philb@gnu.org> * Makefile (tests-clean): New test output files. * Makerules (do-tests-clean): New rule to support the above. * Rules (subdir_testclean): Likewise. 1999-01-03 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * iconv/Makefile: Use install-others instead of explicit dependency on subdir_install. 1999-01-02 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * iconv/gconv_db.c (find_derivation): Release lock before returning. (__gconv_find_transform): Likewise. 1999-01-01 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * inet/ether_ntoa.c (ether_ntoa): Make `asc' static since that's what we return. 1999-01-01 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * Makerules: Remove all references to obsolete variables tests-static and test-srcs-static. * Make-dist: Likewise. * Rules: Likewise. Remove rules to generate obsolete empty.{c,o*}. 1999-01-03 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/pread.c: Use the i386 implementation. * sysdeps/unix/sysv/linux/arm/pread64.c: Likewise. * sysdeps/unix/sysv/linux/arm/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/Makefile3
-rw-r--r--iconv/gconv_db.c10
-rw-r--r--iconv/iconv_prog.c6
3 files changed, 12 insertions, 7 deletions
diff --git a/iconv/Makefile b/iconv/Makefile
index 8b4f605e5b..431100d7da 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -37,12 +37,11 @@ endif
distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c
others = iconv_prog
+install-others = $(inst_bindir)/iconv
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
include ../Rules
-subdir_install: $(inst_bindir)/iconv
-
$(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
$(do-install-program)
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 11914547c7..e6253b8380 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -294,7 +294,10 @@ find_derivation (const char *toset, const char *toset_expand,
result = derivation_lookup (fromset_expand ?: fromset, toset_expand ?: toset,
handle, nsteps);
if (result == GCONV_OK)
- return result;
+ {
+ __libc_lock_unlock (lock);
+ return result;
+ }
/* ### TODO
For now we use a simple algorithm with quadratic runtime behaviour.
@@ -527,7 +530,10 @@ __gconv_find_transform (const char *toset, const char *fromset,
/* If we don't have a module database return with an error. */
if (__gconv_modules_db == NULL)
- return GCONV_NOCONV;
+ {
+ __libc_lock_unlock (lock);
+ return GCONV_NOCONV;
+ }
/* See whether the names are aliases. */
if (__gconv_alias_db != NULL)
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 7dd0f3422c..8f05d57a18 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -1,5 +1,5 @@
/* Convert text in given files from the specified from-set to the to-set.
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -295,7 +295,7 @@ print_version (FILE *stream, struct argp_state *state)
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1998");
+"), "1999");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
@@ -319,7 +319,7 @@ process_block (iconv_t cd, const char *addr, size_t len, FILE *output)
if (outptr != outbuf)
{
/* We have something to write out. */
- if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
+ if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
|| ferror (output))
{
/* Error occurred while printing the result. */