From e11169a5ba081ca2282a58c6cdb364a7753662e0 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 8 Jan 2015 19:11:05 +0000 Subject: [PATCH] ioctlent.sh: handle linux/aufs_type.h properly Before this change, ioctlent.sh could not recognize unusual constants defined by linux/aufs_type.h, resulting to ioctls.h with references to these constants without appropriate definitions in ioctldefs.h. * linux/ioctlent.sh: Update the regexp that is used to lookup constants referenced by generated ioctls.h. --- linux/ioctlent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/ioctlent.sh b/linux/ioctlent.sh index 5e795104..e2830698 100755 --- a/linux/ioctlent.sh +++ b/linux/ioctlent.sh @@ -106,8 +106,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-Z0-9_]\+\)[[:space:]]*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]+,].*/\1\n\2/p' \ - -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-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 -- 2.40.0