Libinfo-517.30.1.tar.gz

[apple/libinfo.git] / rpc.subproj / xdr_mem.c

diff --git a/rpc.subproj/xdr_mem.c b/rpc.subproj/xdr_mem.c
index 3bec281554c356904c4964a2314a5eb114c9fdc1..fc4dc82b8af860731451ee589d1fd8812723dfab 100644 (file)
--- a/rpc.subproj/xdr_mem.c
+++ b/rpc.subproj/xdr_mem.c
@@ -21,6 +21,9 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

+
+/*     $NetBSD: xdr_mem.c,v 1.15 2000/01/22 22:19:18 mycroft Exp $     */
+

 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape


@@ -28,33 +31,33 @@
  * 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.
  * 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 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 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.
  * 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.
  * 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(LIBC_SCCS) && !defined(lint)
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-/*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
-/*static char *sccsid = "from: @(#)xdr_mem.c   2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_mem.c,v 1.2 1999/10/14 21:56:55 wsanchez Exp $";
+static char *sccsid = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid = "@(#)xdr_mem.c   2.1 88/07/29 4.0 RPCSRC";

 #endif
 #endif

+#include <sys/cdefs.h>

 
 /*
  * xdr_mem.h, XDR implementation using memory buffers.
 
 /*
  * xdr_mem.h, XDR implementation using memory buffers.


@@ -67,147 +70,224 @@ static char *rcsid = "$Id: xdr_mem.c,v 1.2 1999/10/14 21:56:55 wsanchez Exp $";
  *
  */
 
  *
  */
 

+#include <sys/types.h>
+#include <stddef.h>
+
+#include <netinet/in.h>
+
+#include <string.h>

 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>

-#include <netinet/in.h>

 
 

-static bool_t  xdrmem_getlong();
-static bool_t  xdrmem_putlong();
-static bool_t  xdrmem_getbytes();
-static bool_t  xdrmem_putbytes();
-static u_int   xdrmem_getpos();
-static bool_t  xdrmem_setpos();
-static long *  xdrmem_inline();
-static void    xdrmem_destroy();
-
-static struct  xdr_ops xdrmem_ops = {
-       xdrmem_getlong,
-       xdrmem_putlong,
+#ifdef __LP64__
+#define xdrlong_t int
+#else
+#define xdrlong_t long
+#endif
+
+static void xdrmem_destroy(XDR *);
+static bool_t xdrmem_getlong_aligned(XDR *, xdrlong_t *);
+static bool_t xdrmem_putlong_aligned(XDR *, const xdrlong_t *);
+static bool_t xdrmem_getlong_unaligned(XDR *, xdrlong_t *);
+static bool_t xdrmem_putlong_unaligned(XDR *, const xdrlong_t *);
+static bool_t xdrmem_getbytes(XDR *, char *, u_int);
+static bool_t xdrmem_putbytes(XDR *, const char *, u_int);
+/* XXX: w/64-bit pointers, u_int not enough! */
+static u_int xdrmem_getpos(XDR *);
+static bool_t xdrmem_setpos(XDR *, u_int);
+static int32_t *xdrmem_inline_aligned(XDR *, u_int);
+static int32_t *xdrmem_inline_unaligned(XDR *, u_int);
+
+static const struct    xdr_ops xdrmem_ops_aligned = {
+       xdrmem_getlong_aligned,
+       xdrmem_putlong_aligned,
+       xdrmem_getbytes,
+       xdrmem_putbytes,
+       xdrmem_getpos,
+       xdrmem_setpos,
+       xdrmem_inline_aligned,
+       xdrmem_destroy
+};
+
+static const struct    xdr_ops xdrmem_ops_unaligned = {
+       xdrmem_getlong_unaligned,
+       xdrmem_putlong_unaligned,

        xdrmem_getbytes,
        xdrmem_putbytes,
        xdrmem_getpos,
        xdrmem_setpos,
        xdrmem_getbytes,
        xdrmem_putbytes,
        xdrmem_getpos,
        xdrmem_setpos,

-       xdrmem_inline,
+       xdrmem_inline_unaligned,

        xdrmem_destroy
 };
 
 /*
  * The procedure xdrmem_create initializes a stream descriptor for a
        xdrmem_destroy
 };
 
 /*
  * The procedure xdrmem_create initializes a stream descriptor for a

- * memory buffer.  
+ * memory buffer.

  */
 void
 xdrmem_create(xdrs, addr, size, op)
  */
 void
 xdrmem_create(xdrs, addr, size, op)

-       register XDR *xdrs;
-#if defined(__APPLE__)
-       void *addr;
-#else
-       caddr_t addr;
-#endif /* !NeXT */
+       XDR *xdrs;
+       char *addr;

        u_int size;
        enum xdr_op op;
 {
        u_int size;
        enum xdr_op op;
 {

-

        xdrs->x_op = op;
        xdrs->x_op = op;

-       xdrs->x_ops = &xdrmem_ops;
+       xdrs->x_ops = ((unsigned long)addr & (sizeof(int32_t) - 1))
+           ? &xdrmem_ops_unaligned : &xdrmem_ops_aligned;

        xdrs->x_private = xdrs->x_base = addr;
        xdrs->x_handy = size;
 }
 
        xdrs->x_private = xdrs->x_base = addr;
        xdrs->x_handy = size;
 }
 

+/*ARGSUSED*/

 static void
 static void

-xdrmem_destroy(/*xdrs*/)
-       /*XDR *xdrs;*/
+xdrmem_destroy(xdrs)
+       XDR *xdrs;

 {
 }
 
 static bool_t
 {
 }
 
 static bool_t

-xdrmem_getlong(xdrs, lp)
-       register XDR *xdrs;
-       long *lp;
+xdrmem_getlong_aligned(xdrs, lp)
+       XDR *xdrs;
+       xdrlong_t *lp;

 {
 {

+       if (xdrs->x_handy < sizeof(int32_t))
+               return (FALSE);
+       xdrs->x_handy -= sizeof(int32_t);
+       *lp = ntohl(*(u_int32_t *)xdrs->x_private);
+       xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
+       return (TRUE);
+}

 
 

-       if ((xdrs->x_handy -= sizeof(long)) < 0)
+static bool_t
+xdrmem_putlong_aligned(xdrs, lp)
+       XDR *xdrs;
+       const xdrlong_t *lp;
+{
+       if (xdrs->x_handy < sizeof(int32_t))

                return (FALSE);
                return (FALSE);

-       *lp = (long)ntohl((u_long)(*((long *)(xdrs->x_private))));
-       xdrs->x_private += sizeof(long);
+       xdrs->x_handy -= sizeof(int32_t);
+       *(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp);
+       xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);

        return (TRUE);
 }
 
 static bool_t
        return (TRUE);
 }
 
 static bool_t

-xdrmem_putlong(xdrs, lp)
-       register XDR *xdrs;
-       long *lp;
+xdrmem_getlong_unaligned(xdrs, lp)
+       XDR *xdrs;
+       xdrlong_t *lp;

 {
 {

+       u_int32_t l;

 
 

-       if ((xdrs->x_handy -= sizeof(long)) < 0)
+       if (xdrs->x_handy < sizeof(int32_t))

                return (FALSE);
                return (FALSE);

-       *(long *)xdrs->x_private = (long)htonl((u_long)(*lp));
-       xdrs->x_private += sizeof(long);
+       xdrs->x_handy -= sizeof(int32_t);
+       memmove(&l, xdrs->x_private, sizeof(int32_t));
+       *lp = ntohl(l);
+       xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);

        return (TRUE);
 }
 
 static bool_t
        return (TRUE);
 }
 
 static bool_t

-xdrmem_getbytes(xdrs, addr, len)
-       register XDR *xdrs;
-       caddr_t addr;
-       register u_int len;
+xdrmem_putlong_unaligned(xdrs, lp)
+       XDR *xdrs;
+       const xdrlong_t *lp;

 {
 {

+       u_int32_t l;

 
 

-       if ((xdrs->x_handy -= len) < 0)
+       if (xdrs->x_handy < sizeof(int32_t))

                return (FALSE);
                return (FALSE);

-       bcopy(xdrs->x_private, addr, len);
-       xdrs->x_private += len;
+       xdrs->x_handy -= sizeof(int32_t);
+       l = htonl((u_int32_t)*lp);
+       memmove(xdrs->x_private, &l, sizeof(int32_t));
+       xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);

        return (TRUE);
 }
 
 static bool_t
        return (TRUE);
 }
 
 static bool_t

-xdrmem_putbytes(xdrs, addr, len)
-       register XDR *xdrs;
-       caddr_t addr;
-       register u_int len;
+xdrmem_getbytes(xdrs, addr, len)
+       XDR *xdrs;
+       char *addr;
+       u_int len;

 {
 {

+       if (xdrs->x_handy < len)
+               return (FALSE);
+       xdrs->x_handy -= len;
+       memmove(addr, xdrs->x_private, len);
+       xdrs->x_private = (char *)xdrs->x_private + len;
+       return (TRUE);
+}

 
 

-       if ((xdrs->x_handy -= len) < 0)
+static bool_t
+xdrmem_putbytes(xdrs, addr, len)
+       XDR *xdrs;
+       const char *addr;
+       u_int len;
+{
+       if (xdrs->x_handy < len)

                return (FALSE);
                return (FALSE);

-       bcopy(addr, xdrs->x_private, len);
-       xdrs->x_private += len;
+       xdrs->x_handy -= len;
+       memmove(xdrs->x_private, addr, len);
+       xdrs->x_private = (char *)xdrs->x_private + len;

        return (TRUE);
 }
 
 static u_int
 xdrmem_getpos(xdrs)
        return (TRUE);
 }
 
 static u_int
 xdrmem_getpos(xdrs)

-       register XDR *xdrs;
+       XDR *xdrs;

 {
 {

+       ptrdiff_t delta;
+       u_int val;

 
 

-       return ((u_int)xdrs->x_private - (u_int)xdrs->x_base);
+       delta = xdrs->x_private - (void *)(xdrs->x_base);
+#ifdef __LP64__
+       if (delta > UINT32_MAX) return -1;
+#endif
+       
+       val = delta;
+       return val;

 }
 
 static bool_t
 xdrmem_setpos(xdrs, pos)
 }
 
 static bool_t
 xdrmem_setpos(xdrs, pos)

-       register XDR *xdrs;
+       XDR *xdrs;

        u_int pos;
 {
        u_int pos;
 {

-       register caddr_t newaddr = xdrs->x_base + pos;
-       register caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
+       ptrdiff_t delta;
+       char *newaddr = xdrs->x_base + pos;
+       char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy;

 
 

-       if ((long)newaddr > (long)lastaddr)
+       if (newaddr > lastaddr)

                return (FALSE);
        xdrs->x_private = newaddr;
                return (FALSE);
        xdrs->x_private = newaddr;

-       xdrs->x_handy = (int)lastaddr - (int)newaddr;
+       delta = lastaddr - newaddr;
+#ifdef __LP64__
+       if (delta > UINT32_MAX) return (FALSE);
+#endif
+       xdrs->x_handy = delta;

        return (TRUE);
 }
 
        return (TRUE);
 }
 

-static long *
-xdrmem_inline(xdrs, len)
-       register XDR *xdrs;
-       int len;
+static int32_t *
+xdrmem_inline_aligned(xdrs, len)
+       XDR *xdrs;
+       u_int len;

 {
 {

-       long *buf = 0;
+       int32_t *buf = 0;

 
        if (xdrs->x_handy >= len) {
                xdrs->x_handy -= len;
 
        if (xdrs->x_handy >= len) {
                xdrs->x_handy -= len;

-               buf = (long *) xdrs->x_private;
-               xdrs->x_private += len;
+               buf = (int32_t *)xdrs->x_private;
+               xdrs->x_private = (char *)xdrs->x_private + len;

        }
        return (buf);
 }
        }
        return (buf);
 }

+
+/* ARGSUSED */
+static int32_t *
+xdrmem_inline_unaligned(xdrs, len)
+       XDR *xdrs;
+       u_int len;
+{
+       return (0);
+}