Update.

2000-01-23  Mark Kettenis  <kettenis@gnu.org>

	* inet/rexec.c (rexec_af): Use SA_LEN instead of __libc_sa_len.

2000-01-22  Thorsten Kukuk  <kukuk@suse.de>

	* sunrpc/xdr_rec.c: Don't set frag_sent if no more data,
	fixes part 2 of bug 1549.
	* sunrpc/rpc_des.h: Remove unused defines.

2000-01-22  Mark Kettenis  <kettenis@gnu.org>

	* intl/Makefile ($(objpfx)msgs.h): Do $(make-target-directory) first.

2000-01-22  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove sys/io.h.
	* sysdeps/unix/sysv/linux/alpha/Makefile: Add sys/io.h.
	* sysdeps/unix/sysv/linux/arm/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/sys/io.h: Move from here ...
	* sysdeps/unix/sysv/linux/i386/sys/io.h: ... to here, add inb, outb
	and other inline functions for port access.
	* sysdeps/unix/sysv/linux/alpha/sys/io.h: Add prototypes for port
	access functions.

2000-01-23  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_simple.c: Fix two problems in UTF-8 decoder.
	Patch by Bruno Haibe <haible@ilog.fr>.

12 files changed, 228 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index 5912c2f3c5..4fe91c8ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2000-01-23  Mark Kettenis  <kettenis@gnu.org>
+
+	* inet/rexec.c (rexec_af): Use SA_LEN instead of __libc_sa_len.
+
+2000-01-22  Thorsten Kukuk  <kukuk@suse.de>
+
+	* sunrpc/xdr_rec.c: Don't set frag_sent if no more data,
+	fixes part 2 of bug 1549.
+	* sunrpc/rpc_des.h: Remove unused defines.
+
+2000-01-22  Mark Kettenis  <kettenis@gnu.org>
+
+	* intl/Makefile ($(objpfx)msgs.h): Do $(make-target-directory) first.
+
+2000-01-22  Thorsten Kukuk  <kukuk@suse.de>
+
+	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove sys/io.h.
+	* sysdeps/unix/sysv/linux/alpha/Makefile: Add sys/io.h.
+	* sysdeps/unix/sysv/linux/arm/Makefile: Likewise.
+	* sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
+	* sysdeps/unix/sysv/linux/sys/io.h: Move from here ...
+	* sysdeps/unix/sysv/linux/i386/sys/io.h: ... to here, add inb, outb
+	and other inline functions for port access.
+	* sysdeps/unix/sysv/linux/alpha/sys/io.h: Add prototypes for port
+	access functions.
+
+2000-01-23  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconv/gconv_simple.c: Fix two problems in UTF-8 decoder.
+	Patch by Bruno Haibe <haible@ilog.fr>.
+
 2000-01-05  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* sysdeps/mach/hurd/errnos.awk: Rediddle to collect lines and print
diff --git a/inet/rexec.c b/inet/rexec.c
index 5cab324591..8a977c6ab9 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -117,7 +117,7 @@ retry:
 		listen(s2, 1);
 		sa2len = sizeof (sa2);
 		if (getsockname(s2, (struct sockaddr *)&sa2, &sa2len) < 0 ||
-		    sa2len != __libc_sa_len(sa2.__ss_family)) {
+		    sa2len != SA_LEN((struct sockaddr *)&sa2)) {
 			perror("getsockname");
 			(void) __close(s2);
 			goto bad;
diff --git a/intl/Makefile b/intl/Makefile
index 21c73e7566..ce7b15b8c7 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -48,6 +48,7 @@ do-gettext-test: tst-gettext.sh $(objpfx)tst-gettext
 	$(SHELL) -e $< $(common-objpfx) $(objpfx)
 
 $(objpfx)msgs.h: po2test.sed ../po/de.po
+	$(make-target-directory)
 	sed -f $^ > $@
 
 CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\"
diff --git a/sunrpc/rpc/rpc_des.h b/sunrpc/rpc/rpc_des.h
index 68bd7c47ab..0f36d16977 100644
--- a/sunrpc/rpc/rpc_des.h
+++ b/sunrpc/rpc/rpc_des.h
@@ -1,4 +1,3 @@
-/*  @(#)des.h   2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -70,14 +69,4 @@ struct desparams
 #define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
   };
 
-/*
- * Encrypt an arbitrary sized buffer
- */
-#define	DESIOCBLOCK	_IOWR(d, 6, struct desparams)
-
-/* 
- * Encrypt of small amount of data, quickly
- */
-#define DESIOCQUICK	_IOWR(d, 7, struct desparams)
-
 #endif
diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
index 101f8c85ce..675eaacc15 100644
--- a/sunrpc/xdr_rec.c
+++ b/sunrpc/xdr_rec.c
@@ -66,8 +66,7 @@ static void xdrrec_destroy (XDR *);
 static bool_t xdrrec_getint32 (XDR *, int32_t *);
 static bool_t xdrrec_putint32 (XDR *, const int32_t *);
 
-static const struct xdr_ops xdrrec_ops =
-{
+static const struct xdr_ops xdrrec_ops = {
   xdrrec_getlong,
   xdrrec_putlong,
   xdrrec_getbytes,
@@ -289,7 +288,7 @@ xdrrec_putbytes (XDR *xdrs, const char *addr, u_int len)
       rstrm->out_finger += current;
       addr += current;
       len -= current;
-      if (rstrm->out_finger == rstrm->out_boundry)
+      if (rstrm->out_finger == rstrm->out_boundry && len > 0)
 	{
 	  rstrm->frag_sent = TRUE;
 	  if (!flush_out (rstrm, FALSE))
@@ -465,8 +464,7 @@ xdrrec_putint32 (XDR *xdrs, const int32_t *ip)
  * this procedure to guarantee proper record alignment.
  */
 bool_t
-xdrrec_skiprecord (xdrs)
-     XDR *xdrs;
+xdrrec_skiprecord (XDR *xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
 
@@ -488,8 +486,7 @@ xdrrec_skiprecord (xdrs)
  * after consuming the rest of the current record.
  */
 bool_t
-xdrrec_eof (xdrs)
-     XDR *xdrs;
+xdrrec_eof (XDR *xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
 
@@ -513,9 +510,7 @@ xdrrec_eof (xdrs)
  * pipelined procedure calls.)  TRUE => immediate flush to tcp connection.
  */
 bool_t
-xdrrec_endofrecord (xdrs, sendnow)
-     XDR *xdrs;
-     bool_t sendnow;
+xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
   u_long len;		/* fragment length */
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 4d7594d1ec..0d230664dc 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -16,7 +16,7 @@ ifeq ($(subdir),misc)
 sysdep_routines += sysctl clone llseek getresuid getresgid umount umount2
 
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-		  sys/io.h sys/klog.h sys/kdaemon.h \
+		  sys/klog.h sys/kdaemon.h \
 		  sys/user.h sys/procfs.h sys/prctl.h \
 		  sys/kd.h sys/soundcard.h sys/vt.h \
 		  sys/quota.h sys/fsuid.h \
diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index b62a871506..3265e0fa1e 100644
--- a/sysdeps/unix/sysv/linux/alpha/Makefile
+++ b/sysdeps/unix/sysv/linux/alpha/Makefile
@@ -3,7 +3,7 @@ sysdep_routines += oldglob
 endif
 
 ifeq ($(subdir),misc)
-sysdep_headers += alpha/ptrace.h alpha/regdef.h
+sysdep_headers += alpha/ptrace.h alpha/regdef.h sys/io.h
 
 sysdep_routines += ieee_get_fp_control ieee_set_fp_control \
 		   sethae ioperm osf_sigprocmask llseek adjtimex
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/io.h b/sysdeps/unix/sysv/linux/alpha/sys/io.h
index 0095714148..d1f5ac3eec 100644
--- a/sysdeps/unix/sysv/linux/alpha/sys/io.h
+++ b/sysdeps/unix/sysv/linux/alpha/sys/io.h
@@ -64,6 +64,14 @@ extern int pciconfig_write (unsigned long int __bus,
 			    unsigned long int __len,
 			    unsigned char *__buf) __THROW;
 
+/* Userspace declarations.  */
+extern unsigned int inb (unsigned long __port) __THROW;
+extern unsigned int inw (unsigned long __port) __THROW;
+extern unsigned int inl (unsigned long __port) __THROW;
+extern void outb (unsigned char __b, unsigned long __port) __THROW;
+extern void outw (unsigned short __w, unsigned long __port) __THROW;
+extern void outl (unsigned int __l, unsigned long __port) __THROW;
+
 __END_DECLS
 
 #endif /* _SYS_IO_H */
diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile
index 79eff05b90..b82a6ef160 100644
--- a/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/sysdeps/unix/sysv/linux/arm/Makefile
@@ -1,6 +1,6 @@
 ifeq ($(subdir),misc)
 sysdep_routines += setfsgid setfsuid setresgid setresuid ioperm
-sysdep_headers += sys/elf.h
+sysdep_headers += sys/elf.h sys/io.h
 endif
 
 ifeq ($(subdir),signal)
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index a26a27a3d0..c44c2b5ed1 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -1,6 +1,6 @@
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl vm86 setfsgid setfsuid setresgid setresuid
-sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h
+sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
 endif
 
 ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/i386/sys/io.h b/sysdeps/unix/sysv/linux/i386/sys/io.h
new file mode 100644
index 0000000000..8310525456
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/sys/io.h
@@ -0,0 +1,178 @@
+/* Copyright (C) 1996, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef	_SYS_IO_H
+#define	_SYS_IO_H	1
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+/* If TURN_ON is TRUE, request for permission to do direct i/o on the
+   port numbers in the range [FROM,FROM+NUM-1].  Otherwise, turn I/O
+   permission off for that range.  This call requires root privileges.
+
+   Portability note: not all Linux platforms support this call.  Most
+   platforms based on the PC I/O architecture probably will, however.
+   E.g., Linux/Alpha for Alpha PCs supports this.  */
+extern int ioperm (unsigned long int __from, unsigned long int __num,
+                   int __turn_on) __THROW;
+
+/* Set the I/O privilege level to LEVEL.  If LEVEL>3, permission to
+   access any I/O port is granted.  This call requires root
+   privileges. */
+extern int iopl (int __level) __THROW;
+
+
+extern inline unsigned char
+inb (unsigned short port)
+{
+  unsigned char _v;
+
+  __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline unsigned char
+inb_p (unsigned short port)
+{
+  unsigned char _v;
+
+  __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline unsigned short
+inw (unsigned short port)
+{
+  unsigned short _v;
+
+  __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline unsigned short
+inw_p (unsigned short port)
+{
+  unsigned short _v;
+
+  __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline unsigned int
+inl (unsigned short port)
+{
+  unsigned int _v;
+
+  __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline unsigned int
+inl_p (unsigned short port)
+{
+  unsigned int _v;
+  __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+  return _v;
+}
+
+extern inline void
+outb (unsigned char value, unsigned short port)
+{
+  __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "Nd" (port));
+}
+
+extern inline void
+outb_p (unsigned char value, unsigned short port)
+{
+  __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80"::"a" (value),
+			"Nd" (port));
+}
+
+extern inline void
+outw (unsigned short value, unsigned short port)
+{
+  __asm__ __volatile__ ("outw %w0,%w1"::"a" (value), "Nd" (port));
+
+}
+
+extern inline void
+outw_p (unsigned short value, unsigned short port)
+{
+  __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80"::"a" (value),
+			"Nd" (port));
+}
+
+extern inline void
+outl (unsigned int value, unsigned short port)
+{
+  __asm__ __volatile__ ("outl %0,%w1"::"a" (value), "Nd" (port));
+}
+
+extern inline void
+outl_p (unsigned int value, unsigned short port)
+{
+  __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80"::"a" (value),
+			"Nd" (port));
+}
+
+extern inline void
+insb (unsigned short port, void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+extern inline void
+insw (unsigned short port, void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+extern inline void
+insl (unsigned short port, void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+extern inline void
+outsb (unsigned short port, const void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+extern inline void
+outsw (unsigned short port, const void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+extern inline void
+outsl (unsigned short port, const void *addr, unsigned long count)
+{
+  __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr),
+			"=c" (count):"d" (port), "0" (addr), "1" (count));
+}
+
+__END_DECLS
+#endif /* _SYS_IO_H */
diff --git a/sysdeps/unix/sysv/linux/sys/io.h b/sysdeps/unix/sysv/linux/sys/io.h
deleted file mode 100644
index c0ecca57e6..0000000000
--- a/sysdeps/unix/sysv/linux/sys/io.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1996, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef	_SYS_IO_H
-
-#define	_SYS_IO_H	1
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* If TURN_ON is TRUE, request for permission to do direct i/o on the
-   port numbers in the range [FROM,FROM+NUM-1].  Otherwise, turn I/O
-   permission off for that range.  This call requires root privileges.
-
-   Portability note: not all Linux platforms support this call.  Most
-   platforms based on the PC I/O architecture probably will, however.
-   E.g., Linux/Alpha for Alpha PCs supports this.  */
-extern int ioperm (unsigned long int __from, unsigned long int __num,
-		   int __turn_on) __THROW;
-
-/* Set the I/O privilege level to LEVEL.  If LEVEL>3, permission to
-   access any I/O port is granted.  This call requires root
-   privileges. */
-extern int iopl (int __level) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_IO_H */