From a0f187d9c99e6f16f56293eaaf8f3c1488c0c1f3 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 29 Jun 2017 18:02:56 +1000 Subject: [PATCH] Remove the leading emacs-comment in nfs4.x as rpcgen does not like it. Signed-off-by: Ronnie Sahlberg --- nfs4/Makefile.am | 18 ++++++++++++++++-- nfs4/libnfs-raw-nfs4.c | 12 ++++++------ nfs4/libnfs-raw-nfs4.h | 11 +++++------ nfs4/nfs4.x | 7 +------ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/nfs4/Makefile.am b/nfs4/Makefile.am index 9026c61..1511494 100644 --- a/nfs4/Makefile.am +++ b/nfs4/Makefile.am @@ -20,6 +20,20 @@ nfs4-stamp : nfs4.x compile_rpc: cat nfs4.x | head -29 >libnfs-raw-nfs4.h - rpcgen -h nfs4.x | sed -e "s/#include /#include /" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs4.h + rpcgen -h nfs4.x | sed \ +-e "s/#include /#include /" \ +-e "s/xdr/zdr/g" \ +-e "s/XDR/ZDR/g" \ +-e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" \ +-e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n/g" \ +-e "s/ CLIENT / void /g" \ +-e "s/SVCXPRT /void /g" \ +-e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs4.h cat nfs4.x | head -29 >libnfs-raw-nfs4.c - rpcgen -c nfs4.x | sed -e "s/#include \".*nfs4.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs4.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;//" -e "s/bool_t/uint32_t/g" -e "s/int i;//" >> libnfs-raw-nfs4.c + rpcgen -c nfs4.x | sed \ +-e "s/#include \".*nfs4.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs4.h\"/" \ +-e "s/xdr/zdr/g" \ +-e "s/XDR/ZDR/g" \ +-e "s/bool_t/uint32_t/g" \ +-e "s/register int32_t \*buf;//" \ +-e "s/int i;//" >> libnfs-raw-nfs4.c diff --git a/nfs4/libnfs-raw-nfs4.c b/nfs4/libnfs-raw-nfs4.c index b534be0..84f00da 100644 --- a/nfs4/libnfs-raw-nfs4.c +++ b/nfs4/libnfs-raw-nfs4.c @@ -1,9 +1,4 @@ -/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ -/* - * The definitions in this file are based on RFC3530. - */ - -/* RFC3530 contains the following copyright statement: +/* This is based on RFC3530 which contains the following copyright statement: Copyright (C) The Internet Society (2003). All Rights Reserved. @@ -27,6 +22,11 @@ This document and the information contained herein is provided on an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION + HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. +*/ /* * Please do not edit this file. * It was generated using rpcgen. diff --git a/nfs4/libnfs-raw-nfs4.h b/nfs4/libnfs-raw-nfs4.h index cde8468..9f70753 100644 --- a/nfs4/libnfs-raw-nfs4.h +++ b/nfs4/libnfs-raw-nfs4.h @@ -1,9 +1,4 @@ -/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ -/* - * The definitions in this file are based on RFC3530. - */ - -/* RFC3530 contains the following copyright statement: +/* This is based on RFC3530 which contains the following copyright statement: Copyright (C) The Internet Society (2003). All Rights Reserved. @@ -27,6 +22,10 @@ This document and the information contained herein is provided on an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION + HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. */ /* * Please do not edit this file. diff --git a/nfs4/nfs4.x b/nfs4/nfs4.x index 9560e89..c6eaeec 100644 --- a/nfs4/nfs4.x +++ b/nfs4/nfs4.x @@ -1,9 +1,4 @@ -/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ -/* - * The definitions in this file are based on RFC3530. - */ - -/* RFC3530 contains the following copyright statement: +/* This is based on RFC3530 which contains the following copyright statement: Copyright (C) The Internet Society (2003). All Rights Reserved.