update copyright bilerplates also in generated files

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 138d031b8e444cb630eae020d689f91ed3acb1fc..de7fdbdeb0fb28bb7f2ab996e36a9edfb960f598 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -17,6 +17,8 @@ mount-stamp : mount.x
        rm -f $(mount_GENERATED)
        touch mount-stamp
 
        rm -f $(mount_GENERATED)
        touch mount-stamp
 

-compile_rpc:   
-       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-mount.h
-       rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n      buf = NULL;/" > libnfs-raw-mount.c
+compile_rpc:
+       cat mount.x | head -29 >libnfs-raw-mount.h
+       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-mount.h
+       cat mount.x | head -29 >libnfs-raw-mount.c
+       rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n      buf = NULL;/" >> libnfs-raw-mount.c

diff --git a/mount/libnfs-raw-mount.c b/mount/libnfs-raw-mount.c
index 81fae00d39f6e31dda9ec7c2f8279188b8ef2fab..0a70d43e0fd6762803aff9c1d7482f8d8c216c5c 100644 (file)
--- a/mount/libnfs-raw-mount.c
+++ b/mount/libnfs-raw-mount.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h
index 1cb2775c5b5d598e6372dd9ea5e5f25b502fbe49..9f07d31a38c4b9d2d537edd00c3d36bad934671b 100644 (file)
--- a/mount/libnfs-raw-mount.h
+++ b/mount/libnfs-raw-mount.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -6,7 +35,8 @@
 #ifndef _MOUNT_H_RPCGEN
 #define _MOUNT_H_RPCGEN
 
 #ifndef _MOUNT_H_RPCGEN
 #define _MOUNT_H_RPCGEN
 

-#include <nfsc/libnfs-zdr.h>
+
+

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index aad66ce60957ed87e0ffdea7afc945c16b467a47..2177519c8b71576ee5ec72e2a74bb7dd93258e7f 100644 (file)
--- a/nfs/Makefile.am
+++ b/nfs/Makefile.am
@@ -18,5 +18,7 @@ nfs-stamp : nfs.x
        touch nfs-stamp
 
 compile_rpc:   
        touch nfs-stamp
 
 compile_rpc:   

-       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" > libnfs-raw-nfs.h
-       rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" > libnfs-raw-nfs.c
+       cat nfs.x | head -29 >libnfs-raw-nfs.h
+       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" >> libnfs-raw-nfs.h
+       cat nfs.x | head -29 >libnfs-raw-nfs.c
+       rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nfs.c

diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c
index 04e914d74e3b24411cdaa92c6ecc43ef2817636e..30d05a584be7fad86771cd427d4d5e999f7b9389 100644 (file)
--- a/nfs/libnfs-raw-nfs.c
+++ b/nfs/libnfs-raw-nfs.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -17,24 +46,13 @@ zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp)
        return TRUE;
 }
 
        return TRUE;
 }
 

-bool_t
-zdr_uint64 (ZDR *zdrs, uint64 *objp)
-{
-       register int32_t *buf;
-       buf = NULL;
-
-        if (!zdr_u_quad_t (zdrs, objp))
-                return FALSE;
-       return TRUE;
-}
-

 bool_t
 zdr_cookie3 (ZDR *zdrs, cookie3 *objp)
 {
        register int32_t *buf;
        buf = NULL;
 
 bool_t
 zdr_cookie3 (ZDR *zdrs, cookie3 *objp)
 {
        register int32_t *buf;
        buf = NULL;
 

-        if (!zdr_uint64 (zdrs, objp))
+        if (!zdr_u_quad_t (zdrs, objp))

                 return FALSE;
        return TRUE;
 }
                 return FALSE;
        return TRUE;
 }


@@ -124,7 +142,7 @@ zdr_size3 (ZDR *zdrs, size3 *objp)
        register int32_t *buf;
        buf = NULL;
 
        register int32_t *buf;
        buf = NULL;
 

-        if (!zdr_uint64 (zdrs, objp))
+        if (!zdr_u_quad_t (zdrs, objp))

                 return FALSE;
        return TRUE;
 }
                 return FALSE;
        return TRUE;
 }


@@ -135,7 +153,7 @@ zdr_fileid3 (ZDR *zdrs, fileid3 *objp)
        register int32_t *buf;
        buf = NULL;
 
        register int32_t *buf;
        buf = NULL;
 

-        if (!zdr_uint64 (zdrs, objp))
+        if (!zdr_u_quad_t (zdrs, objp))

                 return FALSE;
        return TRUE;
 }
                 return FALSE;
        return TRUE;
 }


@@ -188,7 +206,7 @@ zdr_fattr3 (ZDR *zdrs, fattr3 *objp)
                 return FALSE;
         if (!zdr_specdata3 (zdrs, &objp->rdev))
                 return FALSE;
                 return FALSE;
         if (!zdr_specdata3 (zdrs, &objp->rdev))
                 return FALSE;

-        if (!zdr_uint64 (zdrs, &objp->fsid))
+        if (!zdr_u_quad_t (zdrs, &objp->fsid))

                 return FALSE;
         if (!zdr_fileid3 (zdrs, &objp->fileid))
                 return FALSE;
                 return FALSE;
         if (!zdr_fileid3 (zdrs, &objp->fileid))
                 return FALSE;


@@ -250,7 +268,7 @@ zdr_offset3 (ZDR *zdrs, offset3 *objp)
        register int32_t *buf;
        buf = NULL;
 
        register int32_t *buf;
        buf = NULL;
 

-        if (!zdr_uint64 (zdrs, objp))
+        if (!zdr_u_quad_t (zdrs, objp))

                 return FALSE;
        return TRUE;
 }
                 return FALSE;
        return TRUE;
 }

diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h
index 8eb3b2e21fea18701caace016262e6758fcf3867..4b4c87406f4b6b4cb4cb31bc68b833b9eeacc10f 100644 (file)
--- a/nfs/libnfs-raw-nfs.h
+++ b/nfs/libnfs-raw-nfs.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -30,9 +59,7 @@ typedef long long unsigned u_quad_t;
 
 typedef char cookieverf3[NFS3_COOKIEVERFSIZE];
 
 
 typedef char cookieverf3[NFS3_COOKIEVERFSIZE];
 

-typedef u_quad_t uint64;
-
-typedef uint64 cookie3;
+typedef u_quad_t cookie3;

 
 struct nfs_fh3 {
        struct {
 
 struct nfs_fh3 {
        struct {


@@ -67,9 +94,9 @@ typedef u_int uid3;
 
 typedef u_int gid3;
 
 
 typedef u_int gid3;
 

-typedef uint64 size3;
+typedef u_quad_t size3;

 
 

-typedef uint64 fileid3;
+typedef u_quad_t fileid3;

 
 struct specdata3 {
        u_int specdata1;
 
 struct specdata3 {
        u_int specdata1;


@@ -92,7 +119,7 @@ struct fattr3 {
        size3 size;
        size3 used;
        specdata3 rdev;
        size3 size;
        size3 used;
        specdata3 rdev;

-       uint64 fsid;
+       u_quad_t fsid;

        fileid3 fileid;
        nfstime3 atime;
        nfstime3 mtime;
        fileid3 fileid;
        nfstime3 atime;
        nfstime3 mtime;


@@ -148,7 +175,7 @@ enum stable_how {
 };
 typedef enum stable_how stable_how;
 
 };
 typedef enum stable_how stable_how;
 

-typedef uint64 offset3;
+typedef u_quad_t offset3;

 
 typedef u_int count3;
 
 
 typedef u_int count3;
 


@@ -1611,7 +1638,6 @@ extern int nfsacl_program_3_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 extern  bool_t zdr_cookieverf3 (ZDR *, cookieverf3);
 
 #if defined(__STDC__) || defined(__cplusplus)
 extern  bool_t zdr_cookieverf3 (ZDR *, cookieverf3);

-extern  bool_t zdr_uint64 (ZDR *, uint64*);

 extern  bool_t zdr_cookie3 (ZDR *, cookie3*);
 extern  bool_t zdr_nfs_fh3 (ZDR *, nfs_fh3*);
 extern  bool_t zdr_filename3 (ZDR *, filename3*);
 extern  bool_t zdr_cookie3 (ZDR *, cookie3*);
 extern  bool_t zdr_nfs_fh3 (ZDR *, nfs_fh3*);
 extern  bool_t zdr_filename3 (ZDR *, filename3*);


@@ -1799,7 +1825,6 @@ extern  bool_t zdr_SETACL3res (ZDR *, SETACL3res*);
 
 #else /* K&R C */
 extern bool_t zdr_cookieverf3 ();
 
 #else /* K&R C */
 extern bool_t zdr_cookieverf3 ();

-extern bool_t zdr_uint64 ();

 extern bool_t zdr_cookie3 ();
 extern bool_t zdr_nfs_fh3 ();
 extern bool_t zdr_filename3 ();
 extern bool_t zdr_cookie3 ();
 extern bool_t zdr_nfs_fh3 ();
 extern bool_t zdr_filename3 ();

diff --git a/nfs/nfs.x b/nfs/nfs.x
index 579eef636e8334b943502e136c9d0ae06accfaff..ca48c0305886d7cbf6ab25fccc5c59a52eee2fca 100644 (file)
--- a/nfs/nfs.x
+++ b/nfs/nfs.x
@@ -37,16 +37,7 @@ const NFS3_COOKIEVERFSIZE = 8;
 
 typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
 
 
 typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
 

-/*unsigned hyper can be overridden by giving rpcgen -DU_INT64_PLATTFORM_TYPE="
-  where rpcgen doesn't know anything about hyper
-  default to unsigned hyper as of rfc 1813 */
-#ifndef U_INT64_PLATTFORM_TYPE
-#define U_INT64_PLATTFORM_TYPE unsigned hyper
-#endif/*U_INT64_PLATTFORM_TYPE*/
-
-typedef U_INT64_PLATTFORM_TYPE uint64;
-
-typedef uint64 cookie3;
+typedef u_quad_t cookie3;

 
 struct nfs_fh3 {
        opaque       data<NFS3_FHSIZE>;
 
 struct nfs_fh3 {
        opaque       data<NFS3_FHSIZE>;


@@ -75,9 +66,9 @@ typedef unsigned int uid3;
 
 typedef unsigned int gid3;
 
 
 typedef unsigned int gid3;
 

-typedef uint64 size3;
+typedef u_quad_t size3;

 
 

-typedef uint64 fileid3;
+typedef u_quad_t fileid3;

 
 struct specdata3 {
        unsigned int specdata1;
 
 struct specdata3 {
        unsigned int specdata1;


@@ -98,7 +89,7 @@ struct fattr3 {
        size3        size;
        size3        used;
        specdata3    rdev;
        size3        size;
        size3        used;
        specdata3    rdev;

-       uint64       fsid;
+       u_quad_t       fsid;

        fileid3      fileid;
        nfstime3     atime;
        nfstime3     mtime;
        fileid3      fileid;
        nfstime3     atime;
        nfstime3     mtime;


@@ -151,7 +142,7 @@ enum stable_how {
        FILE_SYNC = 2
 };
 
        FILE_SYNC = 2
 };
 

-typedef uint64 offset3;
+typedef u_quad_t offset3;

 
 typedef unsigned int count3;
 
 
 typedef unsigned int count3;
 

diff --git a/nlm/Makefile.am b/nlm/Makefile.am
index 5b6d02fbc0d81a7c5b3a15ed40fff8d58154616e..0cc563dbf5b327c92010b6adace537c80ed5ded8 100644 (file)
--- a/nlm/Makefile.am
+++ b/nlm/Makefile.am
@@ -18,5 +18,7 @@ nlm-stamp : nlm.x
        touch nlm-stamp
 
 compile_rpc:   
        touch nlm-stamp
 
 compile_rpc:   

-       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nlm.h
-       rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" > libnfs-raw-nlm.c
+       cat nlm.x | head -29 >libnfs-raw-nlm.h
+       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nlm.h
+       cat nlm.x | head -29 >libnfs-raw-nlm.c
+       rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nlm.c

diff --git a/nlm/libnfs-raw-nlm.c b/nlm/libnfs-raw-nlm.c
index 808924af6063c9806b9c9eb15cae610f51b97cd3..79302615eafc4d31b1f06283cc47bb1ca4fa7976 100644 (file)
--- a/nlm/libnfs-raw-nlm.c
+++ b/nlm/libnfs-raw-nlm.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h
index 6437aa4ddbbacde76f7606c466d867cce9c187d7..eb73c1ac99bb3712bc4d5166336828c14feb58c0 100644 (file)
--- a/nlm/libnfs-raw-nlm.h
+++ b/nlm/libnfs-raw-nlm.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -6,20 +35,13 @@
 #ifndef _NLM_H_RPCGEN
 #define _NLM_H_RPCGEN
 
 #ifndef _NLM_H_RPCGEN
 #define _NLM_H_RPCGEN
 

-#include <nfsc/libnfs-zdr.h>
+
+

 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 

-#if defined(ANDROID)
-typedef long long int quad_t;
-typedef long long unsigned u_quad_t;
-#endif
-#if defined(WIN32)
-typedef long long int quad_t;
-typedef long long unsigned u_quad_t;
-#endif

 
 struct nlm_fh4 {
        struct {
 
 struct nlm_fh4 {
        struct {

diff --git a/nlm/nlm.x b/nlm/nlm.x
index 0f934212281f62dba21cad3d2d9d814ad015e011..6cd39c2b6c8d29c0364dbbe624c92021e6b2cb80 100644 (file)
--- a/nlm/nlm.x
+++ b/nlm/nlm.x
@@ -27,8 +27,6 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
 either expressed or implied, of the FreeBSD Project.
 */
 

-typedef unsigned hyper uint64;
-

 struct nlm_fh4 {
        opaque       data<>;
 };
 struct nlm_fh4 {
        opaque       data<>;
 };


@@ -56,8 +54,8 @@ struct nlm4_holder {
        bool           exclusive;
        unsigned int   svid;
        nlm4_oh        oh;
        bool           exclusive;
        unsigned int   svid;
        nlm4_oh        oh;

-       uint64         l_offset;
-       uint64         l_len;
+       u_quad_t       l_offset;
+       u_quad_t       l_len;

 };
 
 const NLM_MAXNAME = 256;
 };
 
 const NLM_MAXNAME = 256;


@@ -66,8 +64,8 @@ struct nlm4_lock {
        struct nlm_fh4 fh;
        nlm4_oh        oh;
        unsigned int   svid;
        struct nlm_fh4 fh;
        nlm4_oh        oh;
        unsigned int   svid;

-       uint64         l_offset;
-       uint64         l_len;
+       u_quad_t       l_offset;
+       u_quad_t       l_len;

 };
 
 struct nlm4_share {
 };
 
 struct nlm4_share {

diff --git a/nsm/Makefile.am b/nsm/Makefile.am
index 6362ddb938a14918327f245123fe83a6ef38617b..3bf06a84ed83051b931fbedd2f269eb9bba5d3bf 100644 (file)
--- a/nsm/Makefile.am
+++ b/nsm/Makefile.am
@@ -18,5 +18,7 @@ nsm-stamp : nsm.x
        touch nsm-stamp
 
 compile_rpc:   
        touch nsm-stamp
 
 compile_rpc:   

-       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-nsm.h
-       rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" > libnfs-raw-nsm.c
+       cat nsm.x | head -29 >libnfs-raw-nsm.h
+       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nsm.h
+       cat nsm.x | head -29 >libnfs-raw-nsm.c
+       rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nsm.c

diff --git a/nsm/libnfs-raw-nsm.c b/nsm/libnfs-raw-nsm.c
index cee4d8910ee41ed702b4ce683e3d267fb8a0a679..d3be8328abcbab3a46f73fc5a81d32b041319185 100644 (file)
--- a/nsm/libnfs-raw-nsm.c
+++ b/nsm/libnfs-raw-nsm.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -90,6 +119,7 @@ zdr_NSM1_MONargs (ZDR *zdrs, NSM1_MONargs *objp)
        register int32_t *buf;
        buf = NULL;
 
        register int32_t *buf;
        buf = NULL;
 

+       int i;

         if (!zdr_nsm_mon_id (zdrs, &objp->mon_id))
                 return FALSE;
         if (!zdr_opaque (zdrs, objp->priv, 16))
         if (!zdr_nsm_mon_id (zdrs, &objp->mon_id))
                 return FALSE;
         if (!zdr_opaque (zdrs, objp->priv, 16))

diff --git a/nsm/libnfs-raw-nsm.h b/nsm/libnfs-raw-nsm.h
index b68a1bd11832123cdfe35e40f65d1f3cf1beb79b..d656f3f560817c9e22c5163c90996de960dabbcc 100644 (file)
--- a/nsm/libnfs-raw-nsm.h
+++ b/nsm/libnfs-raw-nsm.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index 4d486fc3f79d451eade9ac3d829a7ca6065efdd3..682ca2ac5a6695fbe6a0aae59f5b567c2e365880 100644 (file)
--- a/portmap/Makefile.am
+++ b/portmap/Makefile.am
@@ -18,5 +18,7 @@ portmap-stamp : portmap.x
        touch portmap-stamp
 
 compile_rpc:   
        touch portmap-stamp
 
 compile_rpc:   

-       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-portmap.h
-       rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n        buf = NULL;/" > libnfs-raw-portmap.c
+       cat portmap.x | head -29 >libnfs-raw-portmap.h
+       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-portmap.h
+       cat portmap.x | head -29 >libnfs-raw-portmap.c
+       rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n        buf = NULL;/" >> libnfs-raw-portmap.c

diff --git a/portmap/libnfs-raw-portmap.c b/portmap/libnfs-raw-portmap.c
index 1afcd63d375c8e34c4cae4cb64ad6c47d54069fd..12b919d33a709c86369177f1ab1d3f9971c80fc0 100644 (file)
--- a/portmap/libnfs-raw-portmap.c
+++ b/portmap/libnfs-raw-portmap.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h
index ae0d06789fe3588e74bcb1682999f62a8c3c56ae..676be5e8d4d08932630464fc8463eaf11577a546 100644 (file)
--- a/portmap/libnfs-raw-portmap.h
+++ b/portmap/libnfs-raw-portmap.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index 02f86f7f42bfd69834340ee0545304d5d121442b..5a604a8cc2ae9656ec388a65c4c99193a03e8449 100644 (file)
--- a/rquota/Makefile.am
+++ b/rquota/Makefile.am
@@ -16,7 +16,9 @@ $(rquota_GENERATED) : rquota-stamp
 rquota-stamp : rquota.x
        rm -f $(rquota_GENERATED)
        touch rquota-stamp
 rquota-stamp : rquota.x
        rm -f $(rquota_GENERATED)
        touch rquota-stamp

-       
+

 compile_rpc:
 compile_rpc:

-       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" > libnfs-raw-rquota.h
-       rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n   buf = NULL;/" > libnfs-raw-rquota.c
+       cat rquota.x | head -29 >libnfs-raw-rquota.h
+       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-rquota.h
+       cat rquota.x | head -29 >libnfs-raw-rquota.c
+       rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n   buf = NULL;/" >> libnfs-raw-rquota.c

diff --git a/rquota/libnfs-raw-rquota.c b/rquota/libnfs-raw-rquota.c
index 4b0e33019bf9127032f5c63e7a0c1bcdf6614797..482645f2dc3f51541e2fc182fa6c1e076994a21f 100644 (file)
--- a/rquota/libnfs-raw-rquota.c
+++ b/rquota/libnfs-raw-rquota.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.

diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h
index 4690da6b035dd879f475734dbeea147178c23f32..ed5fcb9c9712f5ea10292032d4a0a478df3297f7 100644 (file)
--- a/rquota/libnfs-raw-rquota.h
+++ b/rquota/libnfs-raw-rquota.h
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
+

 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.


@@ -6,7 +35,8 @@
 #ifndef _RQUOTA_H_RPCGEN
 #define _RQUOTA_H_RPCGEN
 
 #ifndef _RQUOTA_H_RPCGEN
 #define _RQUOTA_H_RPCGEN
 

-#include <nfsc/libnfs-zdr.h>
+
+

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/win32/win32_errnowrapper.h b/win32/win32_errnowrapper.h
index 8f02251d969f7756b94ceb8c83a39833e5300362..1699d5e1f33496cc202970f79e39307d226719bc 100644 (file)
--- a/win32/win32_errnowrapper.h
+++ b/win32/win32_errnowrapper.h
@@ -1,4 +1,6 @@
 /*
 /*

+Copyright (c) 2014, Ronnie Sahlberg
+

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights