diff options
| author | manu <manu@NetBSD.org> | 2011-07-04 07:54:38 +0000 |
|---|---|---|
| committer | manu <manu@NetBSD.org> | 2011-07-04 07:54:38 +0000 |
| commit | 9bfdaef20c6f3e5aacf80a7ca3d20409c43aee47 (patch) | |
| tree | 61333282e00539fe594881771dd02425d7d1f28c | |
| parent | b05531f2bf68a781df83b11c6b8307a63e5f43bc (diff) | |
Import xdr_sizeof() from FreeBSD
| -rw-r--r-- | include/rpc/xdr.h | 3 | ||||
| -rw-r--r-- | lib/libc/include/namespace.h | 3 | ||||
| -rw-r--r-- | lib/libc/rpc/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libc/rpc/xdr_sizeof.c | 183 |
4 files changed, 189 insertions, 4 deletions
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index e506f6a6890..6685d3ee12f 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdr.h,v 1.25 2005/12/28 15:26:06 yamt Exp $ */ +/* $NetBSD: xdr.h,v 1.26 2011/07/04 07:54:38 manu Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -313,6 +313,7 @@ extern bool_t xdr_hyper(XDR *, longlong_t *); extern bool_t xdr_u_hyper(XDR *, u_longlong_t *); extern bool_t xdr_longlong_t(XDR *, longlong_t *); extern bool_t xdr_u_longlong_t(XDR *, u_longlong_t *); +extern unsigned long xdr_sizeof(xdrproc_t, void *); __END_DECLS /* diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h index 80928ec7094..74b02cef05d 100644 --- a/lib/libc/include/namespace.h +++ b/lib/libc/include/namespace.h @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.148 2011/03/26 19:51:42 christos Exp $ */ +/* $NetBSD: namespace.h,v 1.149 2011/07/04 07:54:38 manu Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -747,6 +747,7 @@ #define xdr_rpcbs _xdr_rpcbs #define xdr_rpcbs _xdr_rpcbs #define xdr_short _xdr_short +#define xdr_sizeof _xdr_sizeof #define xdr_string _xdr_string #define xdr_u_char _xdr_u_char #define xdr_u_hyper _xdr_u_hyper diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index e4bd421e722..4c65dfc167e 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.18 2011/06/22 02:49:43 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.19 2011/07/04 07:54:38 manu Exp $ # librpc sources .PATH: ${.CURDIR}/rpc @@ -14,7 +14,7 @@ SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c \ svc_run.c svc_simple.c svc_vc.c \ xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \ - xdr_stdio.c __rpc_getxid.c + xdr_stdio.c xdr_sizeof.c __rpc_getxid.c CPPFLAGS+= -DPORTMAP diff --git a/lib/libc/rpc/xdr_sizeof.c b/lib/libc/rpc/xdr_sizeof.c new file mode 100644 index 00000000000..24ec46780f2 --- /dev/null +++ b/lib/libc/rpc/xdr_sizeof.c @@ -0,0 +1,183 @@ +/* + * 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 + */ +/* + * xdr_sizeof.c + * + * Copyright 1990 Sun Microsystems, Inc. + * + * General purpose routine to see how much space something will use + * when serialized using XDR. + */ + +#include <sys/cdefs.h> +#if 0 +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5.38.1 2010/12/21 17:10:29 kensmith Exp $"); +#else +__RCSID("$NetBSD: xdr_sizeof.c,v 1.1 2011/07/04 07:54:38 manu Exp $"); +#endif + +#include "namespace.h" +#include <rpc/types.h> +#include <rpc/xdr.h> +#include <sys/types.h> +#include <stdlib.h> + +#ifdef __weak_alias +__weak_alias(xdr_sizeof,_xdr_sizeof) +#endif + +static bool_t x_putlong(XDR *, const long *); +static bool_t x_putbytes(XDR *, const char *, u_int); +static u_int x_getpostn(XDR *); +static bool_t x_setpostn(XDR *, u_int); +static int32_t *x_inline(XDR *, u_int); +static int harmless(void); +static void x_destroy(XDR *); + +/* ARGSUSED */ +static bool_t +x_putlong(xdrs, longp) + XDR *xdrs; + const long *longp; +{ + xdrs->x_handy += BYTES_PER_XDR_UNIT; + return (TRUE); +} + +/* ARGSUSED */ +static bool_t +x_putbytes(xdrs, bp, len) + XDR *xdrs; + const char *bp; + u_int len; +{ + xdrs->x_handy += len; + return (TRUE); +} + +static u_int +x_getpostn(xdrs) + XDR *xdrs; +{ + return (xdrs->x_handy); +} + +/* ARGSUSED */ +static bool_t +x_setpostn(xdrs, pos) + XDR *xdrs; + u_int pos; +{ + /* This is not allowed */ + return (FALSE); +} + +static int32_t * +x_inline(xdrs, len) + XDR *xdrs; + u_int len; +{ + if (len == 0) { + return (NULL); + } + if (xdrs->x_op != XDR_ENCODE) { + return (NULL); + } + if (len < (u_int)xdrs->x_base) { + /* x_private was already allocated */ + xdrs->x_handy += len; + return ((int32_t *) xdrs->x_private); + } else { + /* Free the earlier space and allocate new area */ + if (xdrs->x_private) + free(xdrs->x_private); + if ((xdrs->x_private = (caddr_t) malloc(len)) == NULL) { + xdrs->x_base = 0; + return (NULL); + } + xdrs->x_base = (caddr_t) len; + xdrs->x_handy += len; + return ((int32_t *) xdrs->x_private); + } +} + +static int +harmless() +{ + /* Always return FALSE/NULL, as the case may be */ + return (0); +} + +static void +x_destroy(xdrs) + XDR *xdrs; +{ + xdrs->x_handy = 0; + xdrs->x_base = 0; + if (xdrs->x_private) { + free(xdrs->x_private); + xdrs->x_private = NULL; + } + return; +} + +unsigned long +xdr_sizeof(func, data) + xdrproc_t func; + void *data; +{ + XDR x; + struct xdr_ops ops; + bool_t stat; + /* to stop ANSI-C compiler from complaining */ + typedef bool_t (* dummyfunc1)(XDR *, long *); + typedef bool_t (* dummyfunc2)(XDR *, caddr_t, u_int); + + ops.x_putlong = x_putlong; + ops.x_putbytes = x_putbytes; + ops.x_inline = x_inline; + ops.x_getpostn = x_getpostn; + ops.x_setpostn = x_setpostn; + ops.x_destroy = x_destroy; + + /* the other harmless ones */ + ops.x_getlong = (dummyfunc1) harmless; + ops.x_getbytes = (dummyfunc2) harmless; + + x.x_op = XDR_ENCODE; + x.x_ops = &ops; + x.x_handy = 0; + x.x_private = (caddr_t) NULL; + x.x_base = (caddr_t) 0; + + stat = func(&x, data); + if (x.x_private) + free(x.x_private); + return (stat == TRUE ? (unsigned) x.x_handy: 0); +} |
