chiark / gitweb /
replace_chars: replace % character
authorKay Sievers <kay.sievers@vrfy.org>
Mon, 21 May 2007 05:59:40 +0000 (07:59 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Mon, 21 May 2007 05:59:40 +0000 (07:59 +0200)
test/udev-test.pl
udev.h

index 36cbe8a..10d87ed 100755 (executable)
@@ -302,7 +302,7 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node12345678",
                rules           => <<EOF
-SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678  \\n  TEST_key2=98765 \'", NAME="node\$env{TEST_KEY}"
+SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678\\n  TEST_key2=98765\'", NAME="node\$env{TEST_KEY}"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
@@ -1018,26 +1018,6 @@ KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%3s{dev}"
 EOF
        },
        {
-               desc            => "symlink with '%' in name",
-               subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "percent%sign",
-               exp_target      => "ttyUSB0",
-               rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="percent%%sign"
-EOF
-       },
-       {
-               desc            => "symlink with '%' in name",
-               subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "%ttyUSB0_name",
-               exp_target      => "ttyUSB0",
-               rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%%%k_name"
-EOF
-       },
-       {
                desc            => "program result substitution (numbered part of)",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
diff --git a/udev.h b/udev.h
index 454ea42..94d054f 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -34,9 +34,9 @@
 #define NAME_SIZE                              256
 #define VALUE_SIZE                             128
 
-#define ALLOWED_CHARS                          "#+-.:=@_%"
+#define ALLOWED_CHARS                          "#+-.:=@_"
 #define ALLOWED_CHARS_FILE                     ALLOWED_CHARS "/"
-#define ALLOWED_CHARS_INPUT                    ALLOWED_CHARS " $/?,"
+#define ALLOWED_CHARS_INPUT                    ALLOWED_CHARS_FILE " $%?,"
 
 #define DEFAULT_PARTITIONS_COUNT               15
 #define UDEV_ALARM_TIMEOUT                     180