From 6f60c4f99ec0eb7ed942dd089842644ee0cfdc08 Mon Sep 17 00:00:00 2001 From: hannken Date: Tue, 4 Jun 2019 15:07:55 +0000 Subject: [PATCH] Move the basic part of XDR to common/include/rpc and common/lib/libc/rpc. No functional change intended. --- common/include/rpc/Makefile | 8 ++++++++ {include => common/include}/rpc/types.h | 2 +- {include => common/include}/rpc/xdr.h | 2 +- common/lib/libc/Makefile.inc | 4 ++-- {lib => common/lib}/libc/rpc/xdr.c | 4 ++-- {lib => common/lib}/libc/rpc/xdr_array.c | 4 ++-- {lib => common/lib}/libc/rpc/xdr_mem.c | 4 ++-- include/Makefile | 3 ++- include/rpc/Makefile | 4 ++-- 9 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 common/include/rpc/Makefile rename {include => common/include}/rpc/types.h (97%) rename {include => common/include}/rpc/xdr.h (99%) rename {lib => common/lib}/libc/rpc/xdr.c (99%) rename {lib => common/lib}/libc/rpc/xdr_array.c (96%) rename {lib => common/lib}/libc/rpc/xdr_mem.c (97%) diff --git a/common/include/rpc/Makefile b/common/include/rpc/Makefile new file mode 100644 index 000000000000..e6396fe44d2c --- /dev/null +++ b/common/include/rpc/Makefile @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2019/06/04 15:07:55 hannken Exp $ +# + +INCS= types.h xdr.h + +INCSDIR= /usr/include/rpc + +.include diff --git a/include/rpc/types.h b/common/include/rpc/types.h similarity index 97% rename from include/rpc/types.h rename to common/include/rpc/types.h index a5fa568cc832..835d84fff149 100644 --- a/include/rpc/types.h +++ b/common/include/rpc/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.15 2005/12/26 19:01:47 perry Exp $ */ +/* $NetBSD: types.h,v 1.1 2019/06/04 15:07:55 hannken Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for diff --git a/include/rpc/xdr.h b/common/include/rpc/xdr.h similarity index 99% rename from include/rpc/xdr.h rename to common/include/rpc/xdr.h index 0f34b434aa3e..1b028a93e74f 100644 --- a/include/rpc/xdr.h +++ b/common/include/rpc/xdr.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdr.h,v 1.31 2019/06/04 08:44:08 hannken Exp $ */ +/* $NetBSD: xdr.h,v 1.1 2019/06/04 15:07:55 hannken Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for diff --git a/common/lib/libc/Makefile.inc b/common/lib/libc/Makefile.inc index 9e06f6dd50b6..64f8d75dcbf3 100644 --- a/common/lib/libc/Makefile.inc +++ b/common/lib/libc/Makefile.inc @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.18 2018/08/03 03:35:17 kamil Exp $ +# $NetBSD: Makefile.inc,v 1.19 2019/06/04 15:07:55 hannken Exp $ .include COMMON_DIR:=${.PARSEDIR} -COMMON_CODEDIRS=atomic gen gmon inet md misc net stdlib string sys +COMMON_CODEDIRS=atomic gen gmon inet md misc net rpc stdlib string sys COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/sha3 hash/rmd160 hash/murmurhash .if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \ diff --git a/lib/libc/rpc/xdr.c b/common/lib/libc/rpc/xdr.c similarity index 99% rename from lib/libc/rpc/xdr.c rename to common/lib/libc/rpc/xdr.c index c9998b96d2d0..8cf686519a27 100644 --- a/lib/libc/rpc/xdr.c +++ b/common/lib/libc/rpc/xdr.c @@ -1,4 +1,4 @@ -/* $NetBSD: xdr.c,v 1.34 2017/05/03 21:39:27 christos Exp $ */ +/* $NetBSD: xdr.c,v 1.1 2019/06/04 15:07:55 hannken Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -37,7 +37,7 @@ static char *sccsid = "@(#)xdr.c 1.35 87/08/12"; static char *sccsid = "@(#)xdr.c 2.1 88/07/29 4.0 RPCSRC"; #else -__RCSID("$NetBSD: xdr.c,v 1.34 2017/05/03 21:39:27 christos Exp $"); +__RCSID("$NetBSD: xdr.c,v 1.1 2019/06/04 15:07:55 hannken Exp $"); #endif #endif diff --git a/lib/libc/rpc/xdr_array.c b/common/lib/libc/rpc/xdr_array.c similarity index 96% rename from lib/libc/rpc/xdr_array.c rename to common/lib/libc/rpc/xdr_array.c index 643e6e65a09f..8ea4cd4f7d38 100644 --- a/lib/libc/rpc/xdr_array.c +++ b/common/lib/libc/rpc/xdr_array.c @@ -1,4 +1,4 @@ -/* $NetBSD: xdr_array.c,v 1.19 2013/03/11 20:19:29 tron Exp $ */ +/* $NetBSD: xdr_array.c,v 1.1 2019/06/04 15:07:55 hannken Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -37,7 +37,7 @@ static char *sccsid = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #else -__RCSID("$NetBSD: xdr_array.c,v 1.19 2013/03/11 20:19:29 tron Exp $"); +__RCSID("$NetBSD: xdr_array.c,v 1.1 2019/06/04 15:07:55 hannken Exp $"); #endif #endif diff --git a/lib/libc/rpc/xdr_mem.c b/common/lib/libc/rpc/xdr_mem.c similarity index 97% rename from lib/libc/rpc/xdr_mem.c rename to common/lib/libc/rpc/xdr_mem.c index 9d66b51237a0..28b17ed4047d 100644 --- a/lib/libc/rpc/xdr_mem.c +++ b/common/lib/libc/rpc/xdr_mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: xdr_mem.c,v 1.20 2019/06/04 08:44:08 hannken Exp $ */ +/* $NetBSD: xdr_mem.c,v 1.1 2019/06/04 15:07:55 hannken Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -37,7 +37,7 @@ 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"; #else -__RCSID("$NetBSD: xdr_mem.c,v 1.20 2019/06/04 08:44:08 hannken Exp $"); +__RCSID("$NetBSD: xdr_mem.c,v 1.1 2019/06/04 15:07:55 hannken Exp $"); #endif #endif diff --git a/include/Makefile b/include/Makefile index 184661ed9476..c2b7dc0e325b 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.145 2019/04/24 10:26:08 roy Exp $ +# $NetBSD: Makefile,v 1.146 2019/06/04 15:07:55 hannken Exp $ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # Doing a make includes builds /usr/include @@ -47,6 +47,7 @@ INCSDIR= /usr/include SUBDIR= rpc SUBDIR+= ../common/include/prop SUBDIR+= ../common/include/ppath +SUBDIR+= ../common/include/rpc .include .include diff --git a/include/rpc/Makefile b/include/rpc/Makefile index b37d99d96756..50ea9facaac2 100644 --- a/include/rpc/Makefile +++ b/include/rpc/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2003/01/11 13:28:43 tron Exp $ +# $NetBSD: Makefile,v 1.13 2019/06/04 15:07:55 hannken Exp $ # INCS= auth.h auth_unix.h clnt.h clnt_soc.h nettype.h \ pmap_clnt.h pmap_prot.h pmap_rmt.h raw.h rpc.h \ rpc_com.h rpc_msg.h rpcb_clnt.h rpcb_prot.h rpcent.h \ - svc.h svc_auth.h svc_soc.h types.h xdr.h + svc.h svc_auth.h svc_soc.h RPC_INCS= rpcb_prot.h INCSDIR= /usr/include/rpc