diff options
author | Roland McGrath <roland@gnu.org> | 1996-06-19 06:54:12 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-06-19 06:54:12 +0000 |
commit | a1470b6f839addde3f8ee2c29a237aca21e62565 (patch) | |
tree | e57a088836e66c6784c7e48cbe01d61621d37f34 /sunrpc | |
parent | 6990326c21e6d767e3531a00782af1e091eab4fe (diff) | |
download | glibc-a1470b6f839addde3f8ee2c29a237aca21e62565.tar glibc-a1470b6f839addde3f8ee2c29a237aca21e62565.tar.gz glibc-a1470b6f839addde3f8ee2c29a237aca21e62565.tar.bz2 glibc-a1470b6f839addde3f8ee2c29a237aca21e62565.zip |
Thu Jun 13 17:25:11 1996 David Mosberger-Tang <davidm@azstarnet.com>cvs/libc-960619
* sysdeps/generic/memcmp.c: Add prototype decls for internal fns.
* locale/programs/locale.c: Include string.h.
* sunrpc/xdr_stdio.c (xdrstdio_getlong), sunrpc/xdr_rec.c
(xdrrec_getlong), sunrpc/xdr_mem.c (xdrmem_getlong): Make sure
appropriate sign-extension is performed on machines with
sizeof(long) > 4.
* sunrpc/xdr.c (xdr_int, xdr_u_int): If sizeof(long)==8 and
sizeof(int)<sizeof(long), we need to go through a temporary
variable.
* locale/programs/ld-numeric.c: Include <alloca.h>
* libio/stdio.h (__libc_fatal): Add prototype.
* libio/cleanup.c: Use __P() to declare prototype when __STDC__ is
in efect.
* libio/iopopen.c (read_or_write, parent_end, child_end): Declare
volatile to avoid "might get clobbered by longjmp" warning.
* features.h (__KERNEL_STRICT_NAMES): Define __KERNEL_STRICT_NAMES
unless _LOOSE_KERNEL_NAMES is in effect (which, with high
probability is a sure loser).
* sysdeps/unix/sysv/linux/gnu/types.h (__KERNEL_STRICT_NAMES): Remove.
* sysdeps/unix/bsd/osf/alpha/start.S (errno): Removed.
* sysdeps/unix/sysv/linux/alpha/start.S: Ditto.
* misc/paths.h (_PATH_MAN): Change from /usr/share/man to /usr/man
to be Linux FSSTND compliant.
Mon Jun 10 17:50:31 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/pipe.S: Use PSEUDO.
* sysdeps/unix/sysv/linux/alpha/sysdep.S,
sysdeps/unix/sysv/linux/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S,
sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S,
sysdeps/unix/sysv/linux/alpha/llseek.S,
sysdeps/unix/sysv/linux/alpha/sigsuspend.S,
sysdeps/unix/sysv/linux/alpha/syscall.S: Rename syscall_error to
__syscall_error to avoid intruding application name space.
* sysdeps/unix/sysv/linux/alpha/sysdep.h: Rename __NR_get?id
to SYS_get?id so that syscall stubs in sysdeps/unix define
these syscalls in terms of getxpid/getxuid/getxgid.
* sysdeps/unix/_exit.S, sysdeps/unix/getegid.S,
sysdeps/unix/geteuid.S, sysdeps/unix/getppid.S,
sysdeps/unix/execve.S, sysdeps/unix/fork.S,
sysdeps/unix/syscall.S: Terminate syscall with PSEUDO_END.
* sysdeps/unix/make-syscalls.sh, sysdeps/unix/sysdep.h
(PSEUDO_END): Rename END() to PSEUDO_END().
* sysdeps/unix/alpha/sysdep.h: Move error-handling code in PSEUDO
to PSEUDO_END to improve branch-prediction. Include .frame
directive to make syscalls debugabble.
(PSEUDO_END): New macro.
* sysdeps/unix/alpha/sysdep.h, sysdeps/alpha/bb_init_func.S,
sysdeps/unix/sysv/linux/alpha/brk.S: Use ldiq instead of ldi since
latter is illegal under DEC Unix.
* sysdeps/unix/alpha/sysdep.S: Renamed from
sysdeps/unix/sysv/linux/alpha/sysdep.S. This file works for OSF/1
as well.
* sysdeps/unix/bsd/osf/alpha/sysdep.S: Remove (note that the
EWOULDBLOCK -> EAGAIN mapping was unnecessary since
EWOULDBLOCK==EAGAIN under DEC Unix and Linux/Alpha).
* sysdeps/alpha/divrem.h: Use retaddr instead of ra as the return
address register in the .frame directive.
* sysdeps/alpha/copysign.c: Remove.
* sunrpc/rpc/types.h: Include <sys/param.h> and <netinet/in.h> to
avoid RPC definitions of INADDR_LOOPBACK and/or MAXHOSTNAMELEN.
* errno.h: Move __END_DECLS to correct place to make file
compilable under c++.
* dirent/dirent.h: Document _DIRENT_HAVE_D_OFF macro. Define
d_ino only if <direntry.h> hasn't defined d_fileno.
* configure.in (HAVE_ASM_WEAKEXT_DIRECTIVE): Reverse order of
arguments to weakext to make .weakext detection work on ECOFF systems.
* FAQ: Add Linux/Alpha to list of supported platforms. Mention
that _validuser() has been replaced by __ivaliduser().
Thu Jun 6 21:39:38 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/bsd/sun/sunos4/tcsetattr.c (tcsetattr): Declare cmd
as unsigned long, not as int (to avoid incorrect int->long
promotion).
Diffstat (limited to 'sunrpc')
-rw-r--r-- | sunrpc/rpc/types.h | 3 | ||||
-rw-r--r-- | sunrpc/xdr.c | 49 | ||||
-rw-r--r-- | sunrpc/xdr_mem.c | 2 | ||||
-rw-r--r-- | sunrpc/xdr_rec.c | 4 | ||||
-rw-r--r-- | sunrpc/xdr_stdio.c | 2 |
5 files changed, 51 insertions, 9 deletions
diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h index 1f620eff8f..032543f448 100644 --- a/sunrpc/rpc/types.h +++ b/sunrpc/rpc/types.h @@ -52,6 +52,9 @@ extern char *malloc(); #include <sys/types.h> #endif #include <sys/time.h> +#include <sys/param.h> + +#include <netinet/in.h> #ifndef INADDR_LOOPBACK #define INADDR_LOOPBACK (u_long)0x7F000001 diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index a79db85b86..fccc2a5fe5 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -99,10 +99,30 @@ xdr_int(xdrs, ip) (void) (xdr_short(xdrs, (short *)ip)); return (xdr_long(xdrs, (long *)ip)); #else - if (sizeof (int) == 4) { + if (sizeof (int) < sizeof (long)) { + long l; + + switch (xdrs->x_op) { + case XDR_ENCODE: + l = (long) *ip; + return XDR_PUTLONG(xdrs, &l); + + case XDR_DECODE: + if (!XDR_GETLONG(xdrs, &l)) { + return FALSE; + } + *ip = (int) l; + return TRUE; + } + } else if (sizeof (int) == sizeof (long)) { return (xdr_long(xdrs, (long *)ip)); - } else { + } else if (sizeof (int) == sizeof (short)) { return (xdr_short(xdrs, (short *)ip)); + } else { + /* force unresolved reference (link-time error): */ + extern unexpected_sizes_in_xdr_int (); + + unexpected_sizes_in_xdr_int(); } #endif } @@ -115,15 +135,34 @@ xdr_u_int(xdrs, up) XDR *xdrs; u_int *up; { - #ifdef lint (void) (xdr_short(xdrs, (short *)up)); return (xdr_u_long(xdrs, (u_long *)up)); #else - if (sizeof (u_int) == 4) { + if (sizeof (u_int) < sizeof (u_long)) { + u_long l; + + switch (xdrs->x_op) { + case XDR_ENCODE: + l = (u_long) *up; + return XDR_PUTLONG(xdrs, &l); + + case XDR_DECODE: + if (!XDR_GETLONG(xdrs, &l)) { + return FALSE; + } + *up = (u_int) l; + return TRUE; + } + } else if (sizeof (u_int) == sizeof (u_long)) { return (xdr_u_long(xdrs, (u_long *)up)); - } else { + } else if (sizeof (u_int) == sizeof (u_short)) { return (xdr_short(xdrs, (short *)up)); + } else { + /* force unresolved reference (link-time error): */ + extern unexpected_sizes_in_xdr_u_int (); + + unexpected_sizes_in_xdr_u_int(); } #endif } diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c index fb15f113ce..ac7c9541d0 100644 --- a/sunrpc/xdr_mem.c +++ b/sunrpc/xdr_mem.c @@ -99,7 +99,7 @@ xdrmem_getlong(xdrs, lp) if ((xdrs->x_handy -= 4) < 0) return (FALSE); - *lp = (long)ntohl((u_long)(*((int32_t *)(xdrs->x_private)))); + *lp = (int32_t) ntohl((*((int32_t *)(xdrs->x_private)))); xdrs->x_private += 4; return (TRUE); } diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index 45435951d0..974e8295dd 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -201,14 +201,14 @@ xdrrec_getlong(xdrs, lp) if (rstrm->fbtbc >= BYTES_PER_XDR_UNIT && rstrm->in_boundry - (char *) buflp >= BYTES_PER_XDR_UNIT) { - *lp = ntohl(*buflp); + *lp = (int32_t) ntohl(*buflp); rstrm->fbtbc -= BYTES_PER_XDR_UNIT; rstrm->in_finger += BYTES_PER_XDR_UNIT; } else { if (! xdrrec_getbytes(xdrs, (caddr_t) &mylong, BYTES_PER_XDR_UNIT)) return FALSE; - *lp = ntohl(mylong); + *lp = (int32_t) ntohl(mylong); } return TRUE; } diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c index da4877a9e8..5f016993e7 100644 --- a/sunrpc/xdr_stdio.c +++ b/sunrpc/xdr_stdio.c @@ -108,7 +108,7 @@ xdrstdio_getlong(xdrs, lp) if (fread((caddr_t)&mycopy, 4, 1, (FILE *)xdrs->x_private) != 1) return (FALSE); - *(int32_t*)lp = ntohl(mycopy); + *lp = (int32_t) ntohl(mycopy); return (TRUE); } |