update from main archive 960807

diff --git a/string/tester.c b/string/tester.c
index 6be3d2d..e57b279 100644 (file)
--- a/string/tester.c
+++ b/string/tester.c
@@ -71,6 +71,19 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
   (void) strcpy(one, "");
   equal(one, "", 7);                   /* Boundary condition. */
 
+  /* stpncpy.  */
+  it = "stpncpy";
+
+  memset(one, 'x', sizeof(one));
+  check(stpncpy(one, "abc", 2) == one + 2, 1);
+  check(stpncpy(one, "abc", 3) == one + 3, 2);
+  check(stpncpy(one, "abc", 4) == one + 3, 3);
+  check(one[3] == '\0' && one[4] == 'x', 4);
+  check(stpncpy(one, "abcd", 5) == one + 4, 5);
+  check(one[4] == '\0' && one[5] == 'x', 6);
+  check(stpncpy(one, "abcd", 6) == one + 4, 7);
+  check(one[4] == '\0' && one[5] == '\0' && one[6] == 'x', 8);
+
   /* strcat.  */
   it = "strcat";
   (void) strcpy(one, "ijk");

diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 11f5541..efad599 100644 (file)
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -75,9 +75,12 @@ extra-objs = $(rpcgen-objs)
 
 all: # Make this the default target; it will be defined in Rules.
 
+# Sun's code is not too clean.
+override +gccwarn := -w
+
 include ../Makeconfig
 
-ifeq (no,$(cross-compile))
+ifeq (no,$(cross-compiling))
 # We can only build this library if we can run the rpcgen we build.
 extra-libs := librpcsvc
 extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
@@ -86,9 +89,6 @@ librpcsvc-inhibit-o = .so # Build no shared rpcsvc library.
 omit-deps = $(librpcsvc-routines)
 endif
 
-# Sun's code is not too clean.
-override +gccwarn := -w
-
 include ../Rules
 
 $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) $(common-objpfx)libc.a

diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
index 4b1319a..8da20c6 100644 (file)
--- a/sunrpc/rpc_prot.c
+++ b/sunrpc/rpc_prot.c
@@ -6,23 +6,23 @@
  * 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
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 
 /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
 
-struct opaque_auth _null_auth;
-
 /*
  * XDR an opaque authentication struct
  * (see auth.h)
@@ -84,9 +82,9 @@ xdr_des_block(xdrs, blkp)
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-bool_t 
+bool_t
 xdr_accepted_reply(xdrs, ar)
-       register XDR *xdrs;   
+       register XDR *xdrs;
        register struct accepted_reply *ar;
 {
 
@@ -111,7 +109,7 @@ xdr_accepted_reply(xdrs, ar)
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-bool_t 
+bool_t
 xdr_rejected_reply(xdrs, rr)
        register XDR *xdrs;
        register struct rejected_reply *rr;
@@ -147,7 +145,7 @@ xdr_replymsg(xdrs, rmsg)
        register struct rpc_msg *rmsg;
 {
        if (
-           xdr_u_long(xdrs, &(rmsg->rm_xid)) && 
+           xdr_u_long(xdrs, &(rmsg->rm_xid)) &&
            xdr_enum(xdrs, (enum_t *)&(rmsg->rm_direction)) &&
            (rmsg->rm_direction == REPLY) )
                return (xdr_union(xdrs, (enum_t *)&(rmsg->rm_reply.rp_stat),
@@ -219,7 +217,7 @@ accepted(acpt_stat, error)
        error->re_lb.s2 = (long)acpt_stat;
 }
 
-static void 
+static void
 rejected(rjct_stat, error)
        register enum reject_stat rjct_stat;
        register struct rpc_err *error;