[PATCH] udev - switch callout part selector to {attribute}

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.

diff --git a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs
index f9333e91c4e9c21db7a951fb5374ae96fc422730..77d3cf5414d8e63f98aaf4aca74fcec1f0156b2c 100644 (file)
--- a/etc/udev/udev.rules.devfs
+++ b/etc/udev/udev.rules.devfs
@@ -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 --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index b3ca04222403d103c2ec051706bed1a16e713c53..7e8966961d0a5a6c30668fd418003b49870754a6 100644 (file)
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -57,7 +57,7 @@ KERNEL="ttyUSB0", NAME="pl2303"
 
 # 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 --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh
index 1cf6f9c9e463aaf3d43be8f2a177aeb05e1098c1..0a9369dff4aa17f74535616823a0d2e171550a0b 100644 (file)
--- a/extras/ide-devfs.sh
+++ b/extras/ide-devfs.sh
@@ -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 --git a/extras/name_cdrom.pl b/extras/name_cdrom.pl
index 3a4772e6d9389d3d82f1fb16b3bc90ddb9a6cbca..766f6f366a6ac756a5e50cf006f3c56bdcf1fbca 100644 (file)
--- a/extras/name_cdrom.pl
+++ b/extras/name_cdrom.pl
@@ -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 --git a/namedev.c b/namedev.c
index 942788b2a2a83519ec785f209eaf589d84b597a4..186a9f5cc25fdec1afa5bb4d51d71c495300d55d 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -219,6 +219,7 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
        char *pos3;
        char *attr;
        int num;
+       int i;
        char c;
        struct sysfs_attribute *tmpattr;
 
@@ -270,11 +271,15 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
                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 --git a/test/udev-test.pl b/test/udev-test.pl
index e238c909fa77358f925faad1e38d7c3171f44615..6e031c4c2c3a7876478984a8d651d0afd4f31f72 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -191,16 +191,6 @@ EOF
                expected => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
                conf     => <<EOF
 BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
-EOF
-       },
-       {
-               desc     => "select sysfs attribute by SYSFS{vendor}",
-               subsys   => "block",
-               devpath  => "block/sda",
-               expected => "disk-IBM-ESXS-sda" ,
-               conf     => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="disk-%s{vendor}-%k"
-KERNEL="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -250,7 +240,7 @@ EOF
                devpath  => "block/sda/sda3",
                expected => "link1" ,
                conf     => <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%1c", SYMLINK="%2c %3c"
+BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
 EOF
        },
        {