From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kay Sievers Date: Tue, 17 Feb 2004 01:11:52 +0000 Subject: [PATCH] udev - switch callout part selector to {attribute} Message-Id: <20040217011152.GB5755@vrfy.org> MIME-Version: 1 Content-Type: multipart/mixed; boundary="0eh6TmSyL6TZE2Uz" List-Id: To: linux-hotplug@vger.kernel.org --0eh6TmSyL6TZE2Uz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Here we change the magic callout part number selector to the new atribute syntax. The syntax to select the second part of the callout string: '%2c' is now '%c{2}' I think it's more clear and we no longer misuse the length argument. The old syntax is still supported, but we should remove it some time in the future. thanks, Kay --0eh6TmSyL6TZE2Uz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="02-callout-part-as-attribute.patch" diff -Nru a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs --- a/etc/udev/udev.rules.devfs Tue Feb 17 01:52:32 2004 +++ b/etc/udev/udev.rules.devfs Tue Feb 17 01:52:32 2004 @@ -2,7 +2,7 @@ # fields. See the udev man page for a full description of them. # ide block devices -BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c" +BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}" # md block devices KERNEL="md[0-9]*", NAME="md/%n" diff -Nru a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo --- a/etc/udev/udev.rules.gentoo Tue Feb 17 01:52:32 2004 +++ b/etc/udev/udev.rules.gentoo Tue Feb 17 01:52:32 2004 @@ -57,7 +57,7 @@ # devfs-names for ide-devices (uncomment only one) # /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names -BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%1c", SYMLINK="%2c %3c" +BUS="ide", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", RESULT="hd*", NAME="%c{1}", SYMLINK="%c{2} %c{3}" # fb devices KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k" diff -Nru a/extras/ide-devfs.sh b/extras/ide-devfs.sh --- a/extras/ide-devfs.sh Tue Feb 17 01:52:32 2004 +++ b/extras/ide-devfs.sh Tue Feb 17 01:52:32 2004 @@ -2,7 +2,7 @@ # udev external PROGRAM script # return devfs-names for ide-devices -# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%1c %2c" +# BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}" HOST="${2%\.[0-9]}" TARGET="${2#[0-9]\.}" diff -Nru a/extras/name_cdrom.pl b/extras/name_cdrom.pl --- a/extras/name_cdrom.pl Tue Feb 17 01:52:32 2004 +++ b/extras/name_cdrom.pl Tue Feb 17 01:52:32 2004 @@ -2,7 +2,7 @@ # a horribly funny script that shows how flexible udev can really be # This is to be executed by udev with the following rules: -# KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%1c", SYMLINK="cdrom" +# KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%c{1}", SYMLINK="cdrom" use strict; use warnings; diff -Nru a/namedev.c b/namedev.c --- a/namedev.c Tue Feb 17 01:52:32 2004 +++ b/namedev.c Tue Feb 17 01:52:32 2004 @@ -219,6 +219,7 @@ char *pos3; char *attr; int num; + int i; char c; struct sysfs_attribute *tmpattr; @@ -270,11 +271,15 @@ case 'c': if (strlen(udev->program_result) == 0) break; - if (num > 0) { + /* get part part of the result string */ + i = num; /* num syntax is deprecated and will be removed */ + if (attr != NULL) + i = atoi(attr); + if (i > 0) { strncpy(temp1, udev->program_result, sizeof(temp1)); pos2 = temp1; - while (num) { - num--; + while (i) { + i--; pos3 = strsep(&pos2, " "); if (pos3 == NULL) { dbg("requested part of result string not found"); diff -Nru a/test/udev-test.pl b/test/udev-test.pl --- a/test/udev-test.pl Tue Feb 17 01:52:32 2004 +++ b/test/udev-test.pl Tue Feb 17 01:52:32 2004 @@ -194,16 +194,6 @@ EOF }, { - desc => "select sysfs attribute by SYSFS{vendor}", - subsys => "block", - devpath => "block/sda", - expected => "disk-IBM-ESXS-sda" , - conf => < "sustitution of sysfs value (%s{file})", subsys => "block", devpath => "block/sda", @@ -250,7 +240,7 @@ devpath => "block/sda/sda3", expected => "link1" , conf => <