1995-02-18 01:27:10 +00:00
|
|
|
/* @(#)xdr.c 2.1 88/07/29 4.0 RPCSRC */
|
|
|
|
/*
|
|
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
|
|
* unrestricted use provided that this legend is included on all tape
|
|
|
|
* media and as a part of the software program in whole or part. Users
|
|
|
|
* may copy or modify Sun RPC without charge, but are not authorized
|
|
|
|
* to license or distribute it to anyone else except as part of a product or
|
|
|
|
* program developed by the user.
|
|
|
|
*
|
|
|
|
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
|
|
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
|
|
*
|
|
|
|
* Sun RPC is provided with no support and without any obligation on the
|
|
|
|
* part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
|
|
* modification or enhancement.
|
|
|
|
*
|
|
|
|
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
|
|
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
|
|
* OR ANY PART THEREOF.
|
|
|
|
*
|
|
|
|
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
|
|
* or profits or other special, indirect and consequential damages, even if
|
|
|
|
* Sun has been advised of the possibility of such damages.
|
|
|
|
*
|
|
|
|
* Sun Microsystems, Inc.
|
|
|
|
* 2550 Garcia Avenue
|
|
|
|
* Mountain View, California 94043
|
|
|
|
*/
|
|
|
|
#if !defined(lint) && defined(SCCSIDS)
|
|
|
|
static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* xdr.c, Generic XDR routines implementation.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1986, Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* These are the "generic" xdr routines used to serialize and de-serialize
|
|
|
|
* most common data items. See xdr.h for more info on the interface to
|
|
|
|
* xdr.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
char *malloc();
|
|
|
|
|
|
|
|
#include <rpc/types.h>
|
|
|
|
#include <rpc/xdr.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* constants specific to the xdr "protocol"
|
|
|
|
*/
|
|
|
|
#define XDR_FALSE ((long) 0)
|
|
|
|
#define XDR_TRUE ((long) 1)
|
|
|
|
#define LASTUNSIGNED ((u_int) 0-1)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* for unit alignment
|
|
|
|
*/
|
|
|
|
static char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Free a data structure using XDR
|
|
|
|
* Not a filter, but a convenient utility nonetheless
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
xdr_free(proc, objp)
|
|
|
|
xdrproc_t proc;
|
|
|
|
char *objp;
|
|
|
|
{
|
|
|
|
XDR x;
|
|
|
|
|
|
|
|
x.x_op = XDR_FREE;
|
|
|
|
(*proc)(&x, objp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR nothing
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_void(/* xdrs, addr */)
|
|
|
|
/* XDR *xdrs; */
|
|
|
|
/* caddr_t addr; */
|
|
|
|
{
|
|
|
|
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR integers
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_int(xdrs, ip)
|
|
|
|
XDR *xdrs;
|
|
|
|
int *ip;
|
|
|
|
{
|
|
|
|
|
|
|
|
#ifdef lint
|
|
|
|
(void) (xdr_short(xdrs, (short *)ip));
|
|
|
|
return (xdr_long(xdrs, (long *)ip));
|
|
|
|
#else
|
Tue Mar 19 14:18:42 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/unix/bsd/pause.c: Moved to sysdeps/unix/common/pause.c.
Mon Mar 4 20:17:28 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/adjtime.c: Use INT_MAX instead of LONG_MAX.
* sysdeps/unix/sysv/Makefile (sysdep_routines): Don't add s_getdents.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add mount,
umount.
* sysdeps/alpha/__math.h (atan, cabs): New functions.
* sysdeps/unix/sysv/linux/alpha/sigsuspend.S: new file (syscall
expects set-value, not pointer to it).
Sun Feb 25 22:36:10 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/profil-counter.h: New file.
* gmon/gmon.c (__bb_head): new variable.
(write_hist, write_call_graph, write_bb_counts): new functions.
(_mcleanup): modified to call above functions instead of directly
writing out gmon.out.
* gmon/sys/gmon.h (struct __bb): New type.
(struct gmonhdr): Type removed.
(struct gmonparam): New member `log_hashfraction'.
(GMONVERSION): Macro removed.
* gmon/sys/gmon_out.h, gmon/bb_exit_func.c,
sysdeps/generic/bb_init_func.c, sysdeps/alpha/bb_init_func.S: new
files.
* gmon/Makefile (headers): Add sys/gmon_out.h.
(routines): Add bb_init_func, bb_exit_func.
* gmon/mcount.c: Avoid integer division.
Wed Feb 21 23:56:41 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/alpha/setjmp.S: switched order in which sp and fp are
passed to match what __sigsetjmp_aux() expects.
Tue Feb 20 11:33:46 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/syscalls.list (select, bind,
connect, getpeername, getsockname, listen, recv, recvfrom,
recvmsg, send, sendmsg, sendto, setsockopt, shutdown, socketpair):
added to override same-name assembly file in the parent directory.
* stdlib/stdlib.h: add include of sys/types.h in front of random
etc declarations to ensure int32_t is declared.
* stdlib/random.c, stdlib/random_r.c: replaced "long int" by int32_t
where 32 bit integers are required. Also change LONG_MAX into
0x7fffffff since the intent is to turn off the sign bit in a
32 bit integer.
* time/offtime.c (__offtime): Use Paul Eggert's code to deal
with very large values for "days" (e.g., 64 bit values).
Mon Feb 19 22:22:12 1996 David Mosberger-Tang <davidm@azstarnet.com>
* stdlib/stdlib.h (__random, __random_r, random_r, struct
random_data): use int32_t instead of `long int'.
Sat Feb 17 11:29:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c: new file.
* sysdeps/alpha/ffs.S: new file.
* sysdeps/alpha/fabs.c: File removed.
* time/tzfile.c (__tzfile_read): counter variable is i, *not*
num_transitions!
* time/offtime.c: make capable of dealing with very large (64 bit)
time_t values. Use old algorithm until a year is reached that
is an integer multiple of 400, then use DAYS_PER_400_YEARS to
do the remainder in a single division.
* sysdeps/generic/ffs.c (ffs): fix variable declarations to
be unsigned int, not unsigned long.
* string/test-ffs.c (main): add test case with all upper bits
set.
* stdlib/tst-strtol.c: add tests cases for machines where
sizeof(long)==8.
* stdlib/testrand.c (main): disallow rand() to return negative
integers.
* stdlib/testmb.c (main): fix format to use %lx instead of %x.
* stdlib/stdlib.h: on 64 bit machines, declare
struct random_data, __random(), __random_r, and random_r to
return "int" instead of "long int".
* stdlib/random_r.c: 64 bit machines use "int" instead of "long
int". Similarly, use INT_MAX instead of LONG_MAX.
* stdlib/random.c: on 64 bit machines, randtbl[] and __random[]
need to operate on "int" instead of "long int".
* locale/locfile-hash.c (compute_hashval): make shifted constant
a long to avoid loosing bits on 64 bit machines.
* dirent/tst-seekdir.c (main): fix confusing comment; print
a line to mark point where directory is rewound.
Fri Feb 16 15:01:49 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/strftime.c (strftime): any hour > 11 is PM (not > 12!).
Wed Feb 14 00:21:17 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/Makefile,
sysdeps/unix/sysv/linux/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/fpu_control.c,
sysdeps/unix/sysv/linux/alpha/fpu_control.h,
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/pipe.S,
sysdeps/unix/sysv/linux/alpha/setfpucw.c,
sysdeps/unix/sysv/linux/alpha/sigprocmask.c,
sysdeps/unix/sysv/linux/alpha/speed.c,
sysdeps/unix/sysv/linux/alpha/start.S,
sysdeps/unix/sysv/linux/alpha/syscall.S,
sysdeps/unix/sysv/linux/alpha/syscalls.list,
sysdeps/unix/sysv/linux/alpha/alpha/regdef.h,
sysdeps/unix/sysv/linux/alpha/sysdep.S,
sysdeps/unix/sysv/linux/alpha/sysdep.h: New files.
* sysdeps/alpha/setjmp_aux.c (__sigsetjmp_aux): restore return
address register before returning (gcc 2.7.1 doesn't do it,
presumably because $26 is declared as a global variable).
* sysdeps/unix/sysv/linux/sys/mman.h: msync was missing "flags"
argument.
* sysdeps/unix/alarm.c (alarm): do roundup using test & increment
instead of multiplication.
* sysdeps/posix/sleep.c (sleep): initialize sa_mask to mask of
currently blocked signals instead of the empty mask to ensure
that execution of alarm handler occurs with none of the currently
blocked signals enabled.
* sysdeps/unix/alpha/sysdep.h: new file (adapted from OSF/1 version).
* sysdeps/unix/bsd/osf/alpha/sysdep.h: include
sysdeps/unix/alpha/sysdep.h and removed definitions now in that file.
* sysdeps/alpha/divrem.S, sysdeps/alpha/htonl.S,
sysdeps/alpha/htons.S, sysdeps/alpha/machine-gmon.h,
sysdeps/alpha/_mcount.S, sysdeps/alpha/ntohl.s, sysdeps/alpha/ntohs.s,
sysdeps/alpha/strlen.S: New files.
* sysdeps/alpha/divl.S, sysdeps/alpha/divlu.S, sysdeps/alpha/divq.S,
sysdeps/alpha/divqu.S, sysdeps/alpha/divrem.m4,
sysdeps/alpha/macros.m4, sysdeps/alpha/reml.S, sysdeps/alpha/remlu.S,
sysdeps/alpha/remq.S, sysdeps/alpha/remqu.S, sysdeps/alpha/strlen.c:
Removed.
* sysdeps/generic/sbrk.c (__sbrk): argument is of type ptrdiff_t, not
int.
* sysdeps/alpha/__longjmp.c (__longjmp): moved dummy while loop
to end of function to avoid a jump across NOPs.
* sysdeps/alpha/Makefile (sysdep_routines): Removed all rules
pertaining to integer division/remainder routines since new code
doesn't require them.
* sunrpc/xdr_mem.c, sunrpc/xdr_stdio.c: Use 4 instead of sizeof(long)
where 32 bit quantities are consumed/stored. Various other minor
64-bit cleanups (casting).
* sunrpc/xdr.c (xdr_int): test for sizeof(int)==4 to determine
whether xdr_long or xdr_short should be used to encode an int.
Notice that an xdr_long is 4 bytes independent of the architecture
(otherwise no Alpha could interoperate with existing NFS servers,
for example). Ditto for enums.
* sunrpc/svc_udp.c (svcudp_recv): changed test from 4*sizeof(u_long)
to 16 since it really wants 16 bytes.
* sunrpc/svc.c (maskp): changed from u_long* to u_int32*.
* sunrpc/rpc_cmsg.c (xdr_callmsg), sunrpc/svc_authux.c: increment
"buf" pointer by casting it to a char* first since a long* may be 8
bytes or more and oa->oa_length may be any multiple of 4.
* sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): change casts to
u_int32_t (instead of u_long).
* sunrpc/clnt_udp.c (clntudp_call): replaced sizeof(u_long) by 4
since it really is testing for 32 bits. Fixed casts to use
u_int32 instead of u_long.
* sunrpc/xdr_rec.c: Likewise.
* sunrpc/clnt_tcp.c (clnttcp_call): replaced u_long by u_int32.
* sunrpc/rpc/auth.h: Likewise.
* limits.h (LONG_MAX, LONG_MIN, ULONG_MAX): use 64 bit values
for Alpha.
Tue Mar 19 13:27:49 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/i386/fpu/__math.h: New file.
Contributed by John C. Bowman <bowman@hagar.ph.utexas.edu>.
Sun Mar 17 00:28:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/posix/clock.c: Don't multiply the return value by
CLOCKS_PER_SEC or CLK_TCK.
* sysdeps/mach/hurd/getcwd.c: Fail with ENOENT if a parent directory
scan finds no match.
* posix/unistd.h (setpgrp): Declare no-arg version unless __FAVOR_BSD.
* misc/bsd-compat.c (setpgrp): New function, two arg version.
* sysdeps/stub/setpgid.c: Remove setpgrp alias.
* sysdeps/mach/hurd/setpgid.c: Likewise.
* sysdeps/unix/sysv/sysv4/setpgid.c: Likewise.
* sysdeps/unix/common/syscalls.list (setpgid): Remove setpgrp alias.
* sysdeps/unix/sysv/irix4/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/setpgrp.c: Obsolete file removed.
* posix/setpgrp.c (setpgrp): New file.
* posix/Makefile (routines): Add setpgrp.
Tue Feb 6 12:46:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* libc-symbols.h (weak_alias, weak_symbol): added definitions
for ECOFF (HAVE_ECOFF).
1996-03-19 20:21:54 +00:00
|
|
|
if (sizeof (int) == 4) {
|
1995-02-18 01:27:10 +00:00
|
|
|
return (xdr_long(xdrs, (long *)ip));
|
|
|
|
} else {
|
|
|
|
return (xdr_short(xdrs, (short *)ip));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR unsigned integers
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
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
|
Tue Mar 19 14:18:42 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/unix/bsd/pause.c: Moved to sysdeps/unix/common/pause.c.
Mon Mar 4 20:17:28 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/adjtime.c: Use INT_MAX instead of LONG_MAX.
* sysdeps/unix/sysv/Makefile (sysdep_routines): Don't add s_getdents.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add mount,
umount.
* sysdeps/alpha/__math.h (atan, cabs): New functions.
* sysdeps/unix/sysv/linux/alpha/sigsuspend.S: new file (syscall
expects set-value, not pointer to it).
Sun Feb 25 22:36:10 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/profil-counter.h: New file.
* gmon/gmon.c (__bb_head): new variable.
(write_hist, write_call_graph, write_bb_counts): new functions.
(_mcleanup): modified to call above functions instead of directly
writing out gmon.out.
* gmon/sys/gmon.h (struct __bb): New type.
(struct gmonhdr): Type removed.
(struct gmonparam): New member `log_hashfraction'.
(GMONVERSION): Macro removed.
* gmon/sys/gmon_out.h, gmon/bb_exit_func.c,
sysdeps/generic/bb_init_func.c, sysdeps/alpha/bb_init_func.S: new
files.
* gmon/Makefile (headers): Add sys/gmon_out.h.
(routines): Add bb_init_func, bb_exit_func.
* gmon/mcount.c: Avoid integer division.
Wed Feb 21 23:56:41 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/alpha/setjmp.S: switched order in which sp and fp are
passed to match what __sigsetjmp_aux() expects.
Tue Feb 20 11:33:46 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/syscalls.list (select, bind,
connect, getpeername, getsockname, listen, recv, recvfrom,
recvmsg, send, sendmsg, sendto, setsockopt, shutdown, socketpair):
added to override same-name assembly file in the parent directory.
* stdlib/stdlib.h: add include of sys/types.h in front of random
etc declarations to ensure int32_t is declared.
* stdlib/random.c, stdlib/random_r.c: replaced "long int" by int32_t
where 32 bit integers are required. Also change LONG_MAX into
0x7fffffff since the intent is to turn off the sign bit in a
32 bit integer.
* time/offtime.c (__offtime): Use Paul Eggert's code to deal
with very large values for "days" (e.g., 64 bit values).
Mon Feb 19 22:22:12 1996 David Mosberger-Tang <davidm@azstarnet.com>
* stdlib/stdlib.h (__random, __random_r, random_r, struct
random_data): use int32_t instead of `long int'.
Sat Feb 17 11:29:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c: new file.
* sysdeps/alpha/ffs.S: new file.
* sysdeps/alpha/fabs.c: File removed.
* time/tzfile.c (__tzfile_read): counter variable is i, *not*
num_transitions!
* time/offtime.c: make capable of dealing with very large (64 bit)
time_t values. Use old algorithm until a year is reached that
is an integer multiple of 400, then use DAYS_PER_400_YEARS to
do the remainder in a single division.
* sysdeps/generic/ffs.c (ffs): fix variable declarations to
be unsigned int, not unsigned long.
* string/test-ffs.c (main): add test case with all upper bits
set.
* stdlib/tst-strtol.c: add tests cases for machines where
sizeof(long)==8.
* stdlib/testrand.c (main): disallow rand() to return negative
integers.
* stdlib/testmb.c (main): fix format to use %lx instead of %x.
* stdlib/stdlib.h: on 64 bit machines, declare
struct random_data, __random(), __random_r, and random_r to
return "int" instead of "long int".
* stdlib/random_r.c: 64 bit machines use "int" instead of "long
int". Similarly, use INT_MAX instead of LONG_MAX.
* stdlib/random.c: on 64 bit machines, randtbl[] and __random[]
need to operate on "int" instead of "long int".
* locale/locfile-hash.c (compute_hashval): make shifted constant
a long to avoid loosing bits on 64 bit machines.
* dirent/tst-seekdir.c (main): fix confusing comment; print
a line to mark point where directory is rewound.
Fri Feb 16 15:01:49 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/strftime.c (strftime): any hour > 11 is PM (not > 12!).
Wed Feb 14 00:21:17 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/Makefile,
sysdeps/unix/sysv/linux/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/fpu_control.c,
sysdeps/unix/sysv/linux/alpha/fpu_control.h,
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/pipe.S,
sysdeps/unix/sysv/linux/alpha/setfpucw.c,
sysdeps/unix/sysv/linux/alpha/sigprocmask.c,
sysdeps/unix/sysv/linux/alpha/speed.c,
sysdeps/unix/sysv/linux/alpha/start.S,
sysdeps/unix/sysv/linux/alpha/syscall.S,
sysdeps/unix/sysv/linux/alpha/syscalls.list,
sysdeps/unix/sysv/linux/alpha/alpha/regdef.h,
sysdeps/unix/sysv/linux/alpha/sysdep.S,
sysdeps/unix/sysv/linux/alpha/sysdep.h: New files.
* sysdeps/alpha/setjmp_aux.c (__sigsetjmp_aux): restore return
address register before returning (gcc 2.7.1 doesn't do it,
presumably because $26 is declared as a global variable).
* sysdeps/unix/sysv/linux/sys/mman.h: msync was missing "flags"
argument.
* sysdeps/unix/alarm.c (alarm): do roundup using test & increment
instead of multiplication.
* sysdeps/posix/sleep.c (sleep): initialize sa_mask to mask of
currently blocked signals instead of the empty mask to ensure
that execution of alarm handler occurs with none of the currently
blocked signals enabled.
* sysdeps/unix/alpha/sysdep.h: new file (adapted from OSF/1 version).
* sysdeps/unix/bsd/osf/alpha/sysdep.h: include
sysdeps/unix/alpha/sysdep.h and removed definitions now in that file.
* sysdeps/alpha/divrem.S, sysdeps/alpha/htonl.S,
sysdeps/alpha/htons.S, sysdeps/alpha/machine-gmon.h,
sysdeps/alpha/_mcount.S, sysdeps/alpha/ntohl.s, sysdeps/alpha/ntohs.s,
sysdeps/alpha/strlen.S: New files.
* sysdeps/alpha/divl.S, sysdeps/alpha/divlu.S, sysdeps/alpha/divq.S,
sysdeps/alpha/divqu.S, sysdeps/alpha/divrem.m4,
sysdeps/alpha/macros.m4, sysdeps/alpha/reml.S, sysdeps/alpha/remlu.S,
sysdeps/alpha/remq.S, sysdeps/alpha/remqu.S, sysdeps/alpha/strlen.c:
Removed.
* sysdeps/generic/sbrk.c (__sbrk): argument is of type ptrdiff_t, not
int.
* sysdeps/alpha/__longjmp.c (__longjmp): moved dummy while loop
to end of function to avoid a jump across NOPs.
* sysdeps/alpha/Makefile (sysdep_routines): Removed all rules
pertaining to integer division/remainder routines since new code
doesn't require them.
* sunrpc/xdr_mem.c, sunrpc/xdr_stdio.c: Use 4 instead of sizeof(long)
where 32 bit quantities are consumed/stored. Various other minor
64-bit cleanups (casting).
* sunrpc/xdr.c (xdr_int): test for sizeof(int)==4 to determine
whether xdr_long or xdr_short should be used to encode an int.
Notice that an xdr_long is 4 bytes independent of the architecture
(otherwise no Alpha could interoperate with existing NFS servers,
for example). Ditto for enums.
* sunrpc/svc_udp.c (svcudp_recv): changed test from 4*sizeof(u_long)
to 16 since it really wants 16 bytes.
* sunrpc/svc.c (maskp): changed from u_long* to u_int32*.
* sunrpc/rpc_cmsg.c (xdr_callmsg), sunrpc/svc_authux.c: increment
"buf" pointer by casting it to a char* first since a long* may be 8
bytes or more and oa->oa_length may be any multiple of 4.
* sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): change casts to
u_int32_t (instead of u_long).
* sunrpc/clnt_udp.c (clntudp_call): replaced sizeof(u_long) by 4
since it really is testing for 32 bits. Fixed casts to use
u_int32 instead of u_long.
* sunrpc/xdr_rec.c: Likewise.
* sunrpc/clnt_tcp.c (clnttcp_call): replaced u_long by u_int32.
* sunrpc/rpc/auth.h: Likewise.
* limits.h (LONG_MAX, LONG_MIN, ULONG_MAX): use 64 bit values
for Alpha.
Tue Mar 19 13:27:49 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/i386/fpu/__math.h: New file.
Contributed by John C. Bowman <bowman@hagar.ph.utexas.edu>.
Sun Mar 17 00:28:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/posix/clock.c: Don't multiply the return value by
CLOCKS_PER_SEC or CLK_TCK.
* sysdeps/mach/hurd/getcwd.c: Fail with ENOENT if a parent directory
scan finds no match.
* posix/unistd.h (setpgrp): Declare no-arg version unless __FAVOR_BSD.
* misc/bsd-compat.c (setpgrp): New function, two arg version.
* sysdeps/stub/setpgid.c: Remove setpgrp alias.
* sysdeps/mach/hurd/setpgid.c: Likewise.
* sysdeps/unix/sysv/sysv4/setpgid.c: Likewise.
* sysdeps/unix/common/syscalls.list (setpgid): Remove setpgrp alias.
* sysdeps/unix/sysv/irix4/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/setpgrp.c: Obsolete file removed.
* posix/setpgrp.c (setpgrp): New file.
* posix/Makefile (routines): Add setpgrp.
Tue Feb 6 12:46:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* libc-symbols.h (weak_alias, weak_symbol): added definitions
for ECOFF (HAVE_ECOFF).
1996-03-19 20:21:54 +00:00
|
|
|
if (sizeof (u_int) == 4) {
|
1995-02-18 01:27:10 +00:00
|
|
|
return (xdr_u_long(xdrs, (u_long *)up));
|
|
|
|
} else {
|
|
|
|
return (xdr_short(xdrs, (short *)up));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR long integers
|
|
|
|
* same as xdr_u_long - open coded to save a proc call!
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_long(xdrs, lp)
|
|
|
|
register XDR *xdrs;
|
|
|
|
long *lp;
|
|
|
|
{
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_ENCODE)
|
|
|
|
return (XDR_PUTLONG(xdrs, lp));
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_DECODE)
|
|
|
|
return (XDR_GETLONG(xdrs, lp));
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_FREE)
|
|
|
|
return (TRUE);
|
|
|
|
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR unsigned long integers
|
|
|
|
* same as xdr_long - open coded to save a proc call!
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_u_long(xdrs, ulp)
|
|
|
|
register XDR *xdrs;
|
|
|
|
u_long *ulp;
|
|
|
|
{
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_DECODE)
|
|
|
|
return (XDR_GETLONG(xdrs, (long *)ulp));
|
|
|
|
if (xdrs->x_op == XDR_ENCODE)
|
|
|
|
return (XDR_PUTLONG(xdrs, (long *)ulp));
|
|
|
|
if (xdrs->x_op == XDR_FREE)
|
|
|
|
return (TRUE);
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR short integers
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_short(xdrs, sp)
|
|
|
|
register XDR *xdrs;
|
|
|
|
short *sp;
|
|
|
|
{
|
|
|
|
long l;
|
|
|
|
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
|
|
|
|
case XDR_ENCODE:
|
|
|
|
l = (long) *sp;
|
|
|
|
return (XDR_PUTLONG(xdrs, &l));
|
|
|
|
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETLONG(xdrs, &l)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
*sp = (short) l;
|
|
|
|
return (TRUE);
|
|
|
|
|
|
|
|
case XDR_FREE:
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR unsigned short integers
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_u_short(xdrs, usp)
|
|
|
|
register XDR *xdrs;
|
|
|
|
u_short *usp;
|
|
|
|
{
|
|
|
|
u_long l;
|
|
|
|
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
|
|
|
|
case XDR_ENCODE:
|
|
|
|
l = (u_long) *usp;
|
|
|
|
return (XDR_PUTLONG(xdrs, &l));
|
|
|
|
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETLONG(xdrs, &l)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
*usp = (u_short) l;
|
|
|
|
return (TRUE);
|
|
|
|
|
|
|
|
case XDR_FREE:
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR a char
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_char(xdrs, cp)
|
|
|
|
XDR *xdrs;
|
|
|
|
char *cp;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i = (*cp);
|
|
|
|
if (!xdr_int(xdrs, &i)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
*cp = i;
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR an unsigned char
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_u_char(xdrs, cp)
|
|
|
|
XDR *xdrs;
|
|
|
|
char *cp;
|
|
|
|
{
|
|
|
|
u_int u;
|
|
|
|
|
|
|
|
u = (*cp);
|
|
|
|
if (!xdr_u_int(xdrs, &u)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
*cp = u;
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR booleans
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_bool(xdrs, bp)
|
|
|
|
register XDR *xdrs;
|
|
|
|
bool_t *bp;
|
|
|
|
{
|
|
|
|
long lb;
|
|
|
|
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
|
|
|
|
case XDR_ENCODE:
|
|
|
|
lb = *bp ? XDR_TRUE : XDR_FALSE;
|
|
|
|
return (XDR_PUTLONG(xdrs, &lb));
|
|
|
|
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (!XDR_GETLONG(xdrs, &lb)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
*bp = (lb == XDR_FALSE) ? FALSE : TRUE;
|
|
|
|
return (TRUE);
|
|
|
|
|
|
|
|
case XDR_FREE:
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR enumerations
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_enum(xdrs, ep)
|
|
|
|
XDR *xdrs;
|
|
|
|
enum_t *ep;
|
|
|
|
{
|
|
|
|
#ifndef lint
|
|
|
|
enum sizecheck { SIZEVAL }; /* used to find the size of an enum */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* enums are treated as ints
|
|
|
|
*/
|
Tue Mar 19 14:18:42 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/unix/bsd/pause.c: Moved to sysdeps/unix/common/pause.c.
Mon Mar 4 20:17:28 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/adjtime.c: Use INT_MAX instead of LONG_MAX.
* sysdeps/unix/sysv/Makefile (sysdep_routines): Don't add s_getdents.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add mount,
umount.
* sysdeps/alpha/__math.h (atan, cabs): New functions.
* sysdeps/unix/sysv/linux/alpha/sigsuspend.S: new file (syscall
expects set-value, not pointer to it).
Sun Feb 25 22:36:10 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/profil-counter.h: New file.
* gmon/gmon.c (__bb_head): new variable.
(write_hist, write_call_graph, write_bb_counts): new functions.
(_mcleanup): modified to call above functions instead of directly
writing out gmon.out.
* gmon/sys/gmon.h (struct __bb): New type.
(struct gmonhdr): Type removed.
(struct gmonparam): New member `log_hashfraction'.
(GMONVERSION): Macro removed.
* gmon/sys/gmon_out.h, gmon/bb_exit_func.c,
sysdeps/generic/bb_init_func.c, sysdeps/alpha/bb_init_func.S: new
files.
* gmon/Makefile (headers): Add sys/gmon_out.h.
(routines): Add bb_init_func, bb_exit_func.
* gmon/mcount.c: Avoid integer division.
Wed Feb 21 23:56:41 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/alpha/setjmp.S: switched order in which sp and fp are
passed to match what __sigsetjmp_aux() expects.
Tue Feb 20 11:33:46 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/syscalls.list (select, bind,
connect, getpeername, getsockname, listen, recv, recvfrom,
recvmsg, send, sendmsg, sendto, setsockopt, shutdown, socketpair):
added to override same-name assembly file in the parent directory.
* stdlib/stdlib.h: add include of sys/types.h in front of random
etc declarations to ensure int32_t is declared.
* stdlib/random.c, stdlib/random_r.c: replaced "long int" by int32_t
where 32 bit integers are required. Also change LONG_MAX into
0x7fffffff since the intent is to turn off the sign bit in a
32 bit integer.
* time/offtime.c (__offtime): Use Paul Eggert's code to deal
with very large values for "days" (e.g., 64 bit values).
Mon Feb 19 22:22:12 1996 David Mosberger-Tang <davidm@azstarnet.com>
* stdlib/stdlib.h (__random, __random_r, random_r, struct
random_data): use int32_t instead of `long int'.
Sat Feb 17 11:29:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c: new file.
* sysdeps/alpha/ffs.S: new file.
* sysdeps/alpha/fabs.c: File removed.
* time/tzfile.c (__tzfile_read): counter variable is i, *not*
num_transitions!
* time/offtime.c: make capable of dealing with very large (64 bit)
time_t values. Use old algorithm until a year is reached that
is an integer multiple of 400, then use DAYS_PER_400_YEARS to
do the remainder in a single division.
* sysdeps/generic/ffs.c (ffs): fix variable declarations to
be unsigned int, not unsigned long.
* string/test-ffs.c (main): add test case with all upper bits
set.
* stdlib/tst-strtol.c: add tests cases for machines where
sizeof(long)==8.
* stdlib/testrand.c (main): disallow rand() to return negative
integers.
* stdlib/testmb.c (main): fix format to use %lx instead of %x.
* stdlib/stdlib.h: on 64 bit machines, declare
struct random_data, __random(), __random_r, and random_r to
return "int" instead of "long int".
* stdlib/random_r.c: 64 bit machines use "int" instead of "long
int". Similarly, use INT_MAX instead of LONG_MAX.
* stdlib/random.c: on 64 bit machines, randtbl[] and __random[]
need to operate on "int" instead of "long int".
* locale/locfile-hash.c (compute_hashval): make shifted constant
a long to avoid loosing bits on 64 bit machines.
* dirent/tst-seekdir.c (main): fix confusing comment; print
a line to mark point where directory is rewound.
Fri Feb 16 15:01:49 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/strftime.c (strftime): any hour > 11 is PM (not > 12!).
Wed Feb 14 00:21:17 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/Makefile,
sysdeps/unix/sysv/linux/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/fpu_control.c,
sysdeps/unix/sysv/linux/alpha/fpu_control.h,
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/pipe.S,
sysdeps/unix/sysv/linux/alpha/setfpucw.c,
sysdeps/unix/sysv/linux/alpha/sigprocmask.c,
sysdeps/unix/sysv/linux/alpha/speed.c,
sysdeps/unix/sysv/linux/alpha/start.S,
sysdeps/unix/sysv/linux/alpha/syscall.S,
sysdeps/unix/sysv/linux/alpha/syscalls.list,
sysdeps/unix/sysv/linux/alpha/alpha/regdef.h,
sysdeps/unix/sysv/linux/alpha/sysdep.S,
sysdeps/unix/sysv/linux/alpha/sysdep.h: New files.
* sysdeps/alpha/setjmp_aux.c (__sigsetjmp_aux): restore return
address register before returning (gcc 2.7.1 doesn't do it,
presumably because $26 is declared as a global variable).
* sysdeps/unix/sysv/linux/sys/mman.h: msync was missing "flags"
argument.
* sysdeps/unix/alarm.c (alarm): do roundup using test & increment
instead of multiplication.
* sysdeps/posix/sleep.c (sleep): initialize sa_mask to mask of
currently blocked signals instead of the empty mask to ensure
that execution of alarm handler occurs with none of the currently
blocked signals enabled.
* sysdeps/unix/alpha/sysdep.h: new file (adapted from OSF/1 version).
* sysdeps/unix/bsd/osf/alpha/sysdep.h: include
sysdeps/unix/alpha/sysdep.h and removed definitions now in that file.
* sysdeps/alpha/divrem.S, sysdeps/alpha/htonl.S,
sysdeps/alpha/htons.S, sysdeps/alpha/machine-gmon.h,
sysdeps/alpha/_mcount.S, sysdeps/alpha/ntohl.s, sysdeps/alpha/ntohs.s,
sysdeps/alpha/strlen.S: New files.
* sysdeps/alpha/divl.S, sysdeps/alpha/divlu.S, sysdeps/alpha/divq.S,
sysdeps/alpha/divqu.S, sysdeps/alpha/divrem.m4,
sysdeps/alpha/macros.m4, sysdeps/alpha/reml.S, sysdeps/alpha/remlu.S,
sysdeps/alpha/remq.S, sysdeps/alpha/remqu.S, sysdeps/alpha/strlen.c:
Removed.
* sysdeps/generic/sbrk.c (__sbrk): argument is of type ptrdiff_t, not
int.
* sysdeps/alpha/__longjmp.c (__longjmp): moved dummy while loop
to end of function to avoid a jump across NOPs.
* sysdeps/alpha/Makefile (sysdep_routines): Removed all rules
pertaining to integer division/remainder routines since new code
doesn't require them.
* sunrpc/xdr_mem.c, sunrpc/xdr_stdio.c: Use 4 instead of sizeof(long)
where 32 bit quantities are consumed/stored. Various other minor
64-bit cleanups (casting).
* sunrpc/xdr.c (xdr_int): test for sizeof(int)==4 to determine
whether xdr_long or xdr_short should be used to encode an int.
Notice that an xdr_long is 4 bytes independent of the architecture
(otherwise no Alpha could interoperate with existing NFS servers,
for example). Ditto for enums.
* sunrpc/svc_udp.c (svcudp_recv): changed test from 4*sizeof(u_long)
to 16 since it really wants 16 bytes.
* sunrpc/svc.c (maskp): changed from u_long* to u_int32*.
* sunrpc/rpc_cmsg.c (xdr_callmsg), sunrpc/svc_authux.c: increment
"buf" pointer by casting it to a char* first since a long* may be 8
bytes or more and oa->oa_length may be any multiple of 4.
* sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): change casts to
u_int32_t (instead of u_long).
* sunrpc/clnt_udp.c (clntudp_call): replaced sizeof(u_long) by 4
since it really is testing for 32 bits. Fixed casts to use
u_int32 instead of u_long.
* sunrpc/xdr_rec.c: Likewise.
* sunrpc/clnt_tcp.c (clnttcp_call): replaced u_long by u_int32.
* sunrpc/rpc/auth.h: Likewise.
* limits.h (LONG_MAX, LONG_MIN, ULONG_MAX): use 64 bit values
for Alpha.
Tue Mar 19 13:27:49 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* sysdeps/i386/fpu/__math.h: New file.
Contributed by John C. Bowman <bowman@hagar.ph.utexas.edu>.
Sun Mar 17 00:28:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/posix/clock.c: Don't multiply the return value by
CLOCKS_PER_SEC or CLK_TCK.
* sysdeps/mach/hurd/getcwd.c: Fail with ENOENT if a parent directory
scan finds no match.
* posix/unistd.h (setpgrp): Declare no-arg version unless __FAVOR_BSD.
* misc/bsd-compat.c (setpgrp): New function, two arg version.
* sysdeps/stub/setpgid.c: Remove setpgrp alias.
* sysdeps/mach/hurd/setpgid.c: Likewise.
* sysdeps/unix/sysv/sysv4/setpgid.c: Likewise.
* sysdeps/unix/common/syscalls.list (setpgid): Remove setpgrp alias.
* sysdeps/unix/sysv/irix4/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/setpgrp.c: Obsolete file removed.
* posix/setpgrp.c (setpgrp): New file.
* posix/Makefile (routines): Add setpgrp.
Tue Feb 6 12:46:29 1996 David Mosberger-Tang <davidm@azstarnet.com>
* libc-symbols.h (weak_alias, weak_symbol): added definitions
for ECOFF (HAVE_ECOFF).
1996-03-19 20:21:54 +00:00
|
|
|
if (sizeof (enum sizecheck) == 4) {
|
1995-02-18 01:27:10 +00:00
|
|
|
return (xdr_long(xdrs, (long *)ep));
|
|
|
|
} else if (sizeof (enum sizecheck) == sizeof (short)) {
|
|
|
|
return (xdr_short(xdrs, (short *)ep));
|
|
|
|
} else {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void) (xdr_short(xdrs, (short *)ep));
|
|
|
|
return (xdr_long(xdrs, (long *)ep));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR opaque data
|
|
|
|
* Allows the specification of a fixed size sequence of opaque bytes.
|
|
|
|
* cp points to the opaque object and cnt gives the byte length.
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_opaque(xdrs, cp, cnt)
|
|
|
|
register XDR *xdrs;
|
|
|
|
caddr_t cp;
|
|
|
|
register u_int cnt;
|
|
|
|
{
|
|
|
|
register u_int rndup;
|
|
|
|
static crud[BYTES_PER_XDR_UNIT];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if no data we are done
|
|
|
|
*/
|
|
|
|
if (cnt == 0)
|
|
|
|
return (TRUE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* round byte count to full xdr units
|
|
|
|
*/
|
|
|
|
rndup = cnt % BYTES_PER_XDR_UNIT;
|
|
|
|
if (rndup > 0)
|
|
|
|
rndup = BYTES_PER_XDR_UNIT - rndup;
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_DECODE) {
|
|
|
|
if (!XDR_GETBYTES(xdrs, cp, cnt)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
if (rndup == 0)
|
|
|
|
return (TRUE);
|
|
|
|
return (XDR_GETBYTES(xdrs, crud, rndup));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_ENCODE) {
|
|
|
|
if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
if (rndup == 0)
|
|
|
|
return (TRUE);
|
|
|
|
return (XDR_PUTBYTES(xdrs, xdr_zero, rndup));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xdrs->x_op == XDR_FREE) {
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR counted bytes
|
|
|
|
* *cpp is a pointer to the bytes, *sizep is the count.
|
|
|
|
* If *cpp is NULL maxsize bytes are allocated
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_bytes(xdrs, cpp, sizep, maxsize)
|
|
|
|
register XDR *xdrs;
|
|
|
|
char **cpp;
|
|
|
|
register u_int *sizep;
|
|
|
|
u_int maxsize;
|
|
|
|
{
|
|
|
|
register char *sp = *cpp; /* sp is the actual string pointer */
|
|
|
|
register u_int nodesize;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* first deal with the length since xdr bytes are counted
|
|
|
|
*/
|
|
|
|
if (! xdr_u_int(xdrs, sizep)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
nodesize = *sizep;
|
|
|
|
if ((nodesize > maxsize) && (xdrs->x_op != XDR_FREE)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* now deal with the actual bytes
|
|
|
|
*/
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (nodesize == 0) {
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
if (sp == NULL) {
|
|
|
|
*cpp = sp = (char *)mem_alloc(nodesize);
|
|
|
|
}
|
|
|
|
if (sp == NULL) {
|
|
|
|
(void) fprintf(stderr, "xdr_bytes: out of memory\n");
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
/* fall into ... */
|
|
|
|
|
|
|
|
case XDR_ENCODE:
|
|
|
|
return (xdr_opaque(xdrs, sp, nodesize));
|
|
|
|
|
|
|
|
case XDR_FREE:
|
|
|
|
if (sp != NULL) {
|
|
|
|
mem_free(sp, nodesize);
|
|
|
|
*cpp = NULL;
|
|
|
|
}
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Implemented here due to commonality of the object.
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_netobj(xdrs, np)
|
|
|
|
XDR *xdrs;
|
|
|
|
struct netobj *np;
|
|
|
|
{
|
|
|
|
|
|
|
|
return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR a descriminated union
|
|
|
|
* Support routine for discriminated unions.
|
|
|
|
* You create an array of xdrdiscrim structures, terminated with
|
|
|
|
* an entry with a null procedure pointer. The routine gets
|
|
|
|
* the discriminant value and then searches the array of xdrdiscrims
|
|
|
|
* looking for that value. It calls the procedure given in the xdrdiscrim
|
|
|
|
* to handle the discriminant. If there is no specific routine a default
|
|
|
|
* routine may be called.
|
|
|
|
* If there is no specific or default routine an error is returned.
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_union(xdrs, dscmp, unp, choices, dfault)
|
|
|
|
register XDR *xdrs;
|
|
|
|
enum_t *dscmp; /* enum to decide which arm to work on */
|
|
|
|
char *unp; /* the union itself */
|
|
|
|
struct xdr_discrim *choices; /* [value, xdr proc] for each arm */
|
|
|
|
xdrproc_t dfault; /* default xdr routine */
|
|
|
|
{
|
|
|
|
register enum_t dscm;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we deal with the discriminator; it's an enum
|
|
|
|
*/
|
|
|
|
if (! xdr_enum(xdrs, dscmp)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
dscm = *dscmp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* search choices for a value that matches the discriminator.
|
|
|
|
* if we find one, execute the xdr routine for that value.
|
|
|
|
*/
|
|
|
|
for (; choices->proc != NULL_xdrproc_t; choices++) {
|
|
|
|
if (choices->value == dscm)
|
|
|
|
return ((*(choices->proc))(xdrs, unp, LASTUNSIGNED));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* no match - execute the default xdr routine if there is one
|
|
|
|
*/
|
|
|
|
return ((dfault == NULL_xdrproc_t) ? FALSE :
|
|
|
|
(*dfault)(xdrs, unp, LASTUNSIGNED));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Non-portable xdr primitives.
|
|
|
|
* Care should be taken when moving these routines to new architectures.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR null terminated ASCII strings
|
|
|
|
* xdr_string deals with "C strings" - arrays of bytes that are
|
|
|
|
* terminated by a NULL character. The parameter cpp references a
|
|
|
|
* pointer to storage; If the pointer is null, then the necessary
|
|
|
|
* storage is allocated. The last parameter is the max allowed length
|
|
|
|
* of the string as specified by a protocol.
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_string(xdrs, cpp, maxsize)
|
|
|
|
register XDR *xdrs;
|
|
|
|
char **cpp;
|
|
|
|
u_int maxsize;
|
|
|
|
{
|
|
|
|
register char *sp = *cpp; /* sp is the actual string pointer */
|
|
|
|
u_int size;
|
|
|
|
u_int nodesize;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* first deal with the length since xdr strings are counted-strings
|
|
|
|
*/
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
case XDR_FREE:
|
|
|
|
if (sp == NULL) {
|
|
|
|
return(TRUE); /* already free */
|
|
|
|
}
|
|
|
|
/* fall through... */
|
|
|
|
case XDR_ENCODE:
|
|
|
|
size = strlen(sp);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (! xdr_u_int(xdrs, &size)) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
if (size > maxsize) {
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
nodesize = size + 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* now deal with the actual bytes
|
|
|
|
*/
|
|
|
|
switch (xdrs->x_op) {
|
|
|
|
|
|
|
|
case XDR_DECODE:
|
|
|
|
if (nodesize == 0) {
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
if (sp == NULL)
|
|
|
|
*cpp = sp = (char *)mem_alloc(nodesize);
|
|
|
|
if (sp == NULL) {
|
|
|
|
(void) fprintf(stderr, "xdr_string: out of memory\n");
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
sp[size] = 0;
|
|
|
|
/* fall into ... */
|
|
|
|
|
|
|
|
case XDR_ENCODE:
|
|
|
|
return (xdr_opaque(xdrs, sp, size));
|
|
|
|
|
|
|
|
case XDR_FREE:
|
|
|
|
mem_free(sp, nodesize);
|
|
|
|
*cpp = NULL;
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wrapper for xdr_string that can be called directly from
|
|
|
|
* routines like clnt_call
|
|
|
|
*/
|
|
|
|
bool_t
|
|
|
|
xdr_wrapstring(xdrs, cpp)
|
|
|
|
XDR *xdrs;
|
|
|
|
char **cpp;
|
|
|
|
{
|
|
|
|
if (xdr_string(xdrs, cpp, LASTUNSIGNED)) {
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|