Module Name:    src
Committed By:   christos
Date:           Tue Aug 21 11:45:23 UTC 2018

Modified Files:
        src/sys/rump/include/rump: makerumpdefs.sh

Log Message:
Unlike gnu sed our sed does not recognize inline labels (separated by
semi-colons) so split the lines, and make sure that command lists end
with a semi-colon.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/makerumpdefs.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.30 src/sys/rump/include/rump/makerumpdefs.sh:1.31
--- src/sys/rump/include/rump/makerumpdefs.sh:1.30	Tue Aug 21 04:22:33 2018
+++ src/sys/rump/include/rump/makerumpdefs.sh	Tue Aug 21 07:45:23 2018
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
 rm -f rumpdefs.h
 exec 3>&1 > rumpdefs.h
 
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $	*/\n\n'
 printf '/*\n *\tAUTOMATICALLY GENERATED.  DO NOT EDIT.\n */\n\n'
 printf '#ifndef _RUMP_RUMPDEFS_H_\n'
 printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -57,7 +57,13 @@ sed -n '/#define	F_[A-Z_]*	*0x/s/F_/RUMP
     < ../../../sys/fcntl.h
 sed -n '/#define	F_[A-Z_]*	*(/s/F_/RUMP_F_/gp' \
     < ../../../sys/fcntl.h
-sed -n '/#define[ 	]*_FCN/{:t;N;/\\$/bt;s/_FCN/RUMP__FCN/g;s/F_[A-Z]/RUMP_&/gp}' <../../../sys/fcntl.h | sed 's,/\*.*$,,'
+sed -n '/#define[ 	]*_FCN/{
+:t
+N
+/\\$/bt
+s/_FCN/RUMP__FCN/g
+s/F_[A-Z]/RUMP_&/gp
+}' <../../../sys/fcntl.h | sed 's,/\*.*$,,'
 
 fromvers ../../../sys/vnode.h
 sed -n '/enum vtype.*{/{s/vtype/rump_&/;s/ V/ RUMP_V/gp;}' <../../../sys/vnode.h
@@ -104,9 +110,15 @@ sed -n '/#define[ 	]*MNT_[A-Z].*[^\]$/s/
 
 fromvers ../../../sys/ioccom.h
 sed -n '/#define[ 	]*IOC[A-Z_].*[^\\]$/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,'
-sed -n '/#define[ 	]*_IO.*\\$/{:t;N;/\\$/bt;s/_IOC/_RUMP_IOC/g;s/IOC[A-Z]/RUMP_&/gp}' <../../../sys/ioccom.h \
+sed -n '/#define[ 	]*_IO.*\\$/{
+:t
+N
+/\\$/bt
+s/_IOC/_RUMP_IOC/g
+s/IOC[A-Z]/RUMP_&/gp
+}' <../../../sys/ioccom.h \
     | sed 's,/\*.*$,,'
-sed -n '/#define[ 	]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' <../../../sys/ioccom.h \
+sed -n '/#define[ 	]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp;}' <../../../sys/ioccom.h \
     | sed 's,/\*.*$,,'
 
 fromvers ../../../sys/ktrace.h
@@ -135,7 +147,7 @@ exec 1>&3
 echo Generating rumperr.h
 rm -f rumperr.h
 exec > rumperr.h
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $	*/\n\n'
 printf '/*\n *\tAUTOMATICALLY GENERATED.  DO NOT EDIT.\n */\n'
 
 fromvers ../../../sys/errno.h
@@ -176,7 +188,7 @@ fi
 echo Generating rumperrno2host.h 1>&3
 rm -f rumperrno2host.h
 exec > rumperrno2host.h
-printf '/*	$NetBSD: makerumpdefs.sh,v 1.30 2018/08/21 08:22:33 msaitoh Exp $	*/\n\n'
+printf '/*	$NetBSD: makerumpdefs.sh,v 1.31 2018/08/21 11:45:23 christos Exp $	*/\n\n'
 printf '/*\n *\tAUTOMATICALLY GENERATED.  DO NOT EDIT.\n */\n'
 
 fromvers ../../../sys/errno.h

Reply via email to