[PATCH] v011 release

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 266fa35a1945939ab5f384d70980dfcd3b2c089e..aec87d27713c0ee2fbba1807c39efb80a7d9c7f1 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -176,7 +176,7 @@ int namedev_init_rules(void)
                        ++temp;
 
                /* empty line? */
-               if (*temp == 0x00)
+               if ((*temp == 0x00) || (*temp == 0x0a))
                        continue;
 
                /* see if this is a comment */
@@ -289,7 +289,6 @@ keys:
                                  dev.name, dev.bus, dev.sysfs_pair[0].file,
                                  dev.sysfs_pair[0].value, dev.symlink);
                        if ((*dev.name == '\0') ||
-                           (*dev.bus == '\0') ||
                            (*dev.sysfs_pair[0].file == '\0') ||
                            (*dev.sysfs_pair[0].value == '\0'))
                                goto error;
@@ -324,7 +323,6 @@ keys:
                                  dev.name, dev.bus, dev.exec_program,
                                  dev.id, dev.symlink);
                        if ((*dev.name == '\0') ||
-                           (*dev.bus == '\0') ||
                            (*dev.id == '\0') ||
                            (*dev.exec_program == '\0'))
                                goto error;
@@ -378,7 +376,7 @@ int namedev_init_permissions(void)
                        ++temp;
 
                /* empty line? */
-               if (*temp == 0x00)
+               if ((*temp == 0x00) || (*temp == 0x0a))
                        continue;
 
                /* see if this is a comment */