aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-21 08:10:06 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-21 08:10:06 +0000
commitc63598bf0547a8fa3286c79f9dd4f801a05ee7f8 (patch)
treefdeea64c9c74d09b0fd9975f25941dc041d826bd /iconv
parent47cd4757a888ac74bbdb89ba6a72bbf36327d283 (diff)
downloadglibc-c63598bf0547a8fa3286c79f9dd4f801a05ee7f8.tar
glibc-c63598bf0547a8fa3286c79f9dd4f801a05ee7f8.tar.gz
glibc-c63598bf0547a8fa3286c79f9dd4f801a05ee7f8.tar.bz2
glibc-c63598bf0547a8fa3286c79f9dd4f801a05ee7f8.zip
Update.
1999-12-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/getmsg.c: New file. * sysdeps/unix/sysv/linux/i386/getpmsg.c: New file. * sysdeps/unix/sysv/linux/i386/putmsg.c: New file. * sysdeps/unix/sysv/linux/i386/putpmsg.c: New file. * sysdeps/unix/sysv/linux/m68k/getmsg.c: New file. * sysdeps/unix/sysv/linux/m68k/getpmsg.c: New file. * sysdeps/unix/sysv/linux/m68k/putmsg.c: New file. * sysdeps/unix/sysv/linux/m68k/putpmsg.c: New file. * sysdeps/unix/sysv/linux/mips/getmsg.c: New file. * sysdeps/unix/sysv/linux/mips/getpmsg.c: New file. * sysdeps/unix/sysv/linux/mips/putmsg.c: New file. * sysdeps/unix/sysv/linux/mips/putpmsg.c: New file. * sysdeps/unix/sysv/linux/powerpc/getmsg.c: New file. * sysdeps/unix/sysv/linux/powerpc/getpmsg.c: New file. * sysdeps/unix/sysv/linux/powerpc/putmsg.c: New file. * sysdeps/unix/sysv/linux/powerpc/putpmsg.c: New file. * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Add getpmsg and putpmsg. 1999-12-20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/lxstat64.c: Include "kernel-features.h" before testing for __ASSUME_STAT64_SYSCALL. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/xstat64.c: Likewise. 1999-12-20 Andreas Schwab <schwab@suse.de> * manual/install.texi (Running make install): Clearify that install_root should be an absolute file name. * iconv/gconv.c (__gconv): Deal with outbuf being NULL. * iconv/iconv.c (iconv): Allow omitting output buffer if no input buffer is given to place conversion descriptor in initial state. * iconvdata/gconv-modules: Correct aliases CSPC850MULTILINGUAL and CSPC862LATINHEBREW. * iconvdata/gconv-modules: Add aliases GB2312 and csGB2312 (according to IANA registry). Reported by Bruno Haible <haible@ilog.fr>. * iconvdata/johab.c: Correct completely broken conversion to JOHAB.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv.c2
-rw-r--r--iconv/iconv.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c
index 6e3080b0e9..b9c404ac03 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -39,7 +39,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf,
assert (converted != NULL);
*converted = 0;
- cd->__data[last_step].__outbuf = *outbuf;
+ cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL;
cd->__data[last_step].__outbufend = outbufend;
if (inbuf == NULL || *inbuf == NULL)
diff --git a/iconv/iconv.c b/iconv/iconv.c
index ee16d3b091..c1b96164e5 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -39,9 +39,12 @@ iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
if (inbuf == NULL || *inbuf == NULL)
{
- result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
- (unsigned char *) (outstart + *outbytesleft),
- &converted);
+ if (outbuf == NULL || *outbuf == NULL)
+ result = __gconv (gcd, NULL, NULL, NULL, NULL, &converted);
+ else
+ result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
+ (unsigned char *) (outstart + *outbytesleft),
+ &converted);
}
else
{