From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 21 May 2007 05:59:40 +0000 (+0200)
Subject: replace_chars: replace % character
X-Git-Tag: 174~1936
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c19870519d0a23bbf7f5cf206cefab6418a9f4be;ds=sidebyside

replace_chars: replace % character
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 36cbe8ac7..10d87ed54 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -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
 	},
@@ -1015,26 +1015,6 @@ EOF
 		exp_target	=> "ttyUSB0",
 		rules		=> <<EOF
 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
 	},
 	{
diff --git a/udev.h b/udev.h
index 454ea4280..94d054f76 100644
--- 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