[PATCH 1/3] udev_rules_apply_format(): fix handling of unknown format

[Sergey Vlasov <vsu@altlinux.ru>]

udev_rules_apply_format() was not handling unknown format elements
(both "$var" variables and "%c" chars) properly:

 - it did not give any error messages for them;

 - after finding an unknown element the '\0' written into the string
   at its start was not removed, therefore subsequent normal
   characters were not really added to the output string.

Fix udev_rules_apply_format() to give error messages for unknown
format elements and pass such elements to the output string
unmodified.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
---
 udev_rules.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index edaaa71..44b41e9 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -364,6 +364,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 						goto found;
 					}
 				}
+				head[0] = '$';
+				err("unknown format variable '%s'", head);
 			} else if (head[0] = '%') {
 				/* substitute format char */
 				if (head[1] = '\0')
@@ -385,6 +387,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 						goto found;
 					}
 				}
+				head[0] = '%';
+				err("unknown format char '%c'", tail[0]);
 			}
 			head++;
 		}
-- 
1.5.0.rc2.gd894fb


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid\x120709&bid&3057&dat\x121642
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel