ioctlent.sh: cleanup regexps that are used to fetch bases

diff --git a/linux/ioctlent.sh b/linux/ioctlent.sh
index 10b7fb9e18cc17cf452e58b60ebd43c8281bbc65..5a56270bbf7c386545d1780b344fb60cf66bb437 100755 (executable)
--- a/linux/ioctlent.sh
+++ b/linux/ioctlent.sh
@@ -105,8 +105,8 @@ sort -u -o ioctls.h ioctls.h
 # Some use a special base to offset their ioctls on. Extract that as well.
 # Some use 2 defines: _IOC(_IOC_NONE,DM_IOCTL,DM_LIST_DEVICES_CMD,....)
 bases=$(sed -n \
-       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]]*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]+,].*/\1\n\2/p' \
-       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]+,].*/\1/p' \
+       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]]*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]]*[+,)].*/\1\n\2/p' \
+       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Za-z0-9_]\+\)[[:space:]]*[+,)].*/\1/p' \
        ioctls.h | sort -u)
 
 for base in $bases; do