X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=02d8a6520c50fe3302cea0055e7a8f2bbfe62136;hp=eabd9c98bb1957f089af68b14e958cf7d22fd009;hb=77313cd0d13ed3682f25c745f71f648292b28215;hpb=5e39f90b14ccf242618086a0242000fc11317a75 diff --git a/namedev_parse.c b/namedev_parse.c index eabd9c98b..02d8a6520 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -153,7 +153,7 @@ static int namedev_parse(const char *filename, void *data) /* skip backslash and newline from multi line rules */ for (i = j = 0; i < count; i++) { - if (bufline[i] == '\\' || bufline[i] == '\n') + if (bufline[i] == '\\' && bufline[i+1] == '\n') continue; line[j++] = bufline[i]; @@ -259,7 +259,10 @@ static int namedev_parse(const char *filename, void *data) dev.ignore_remove = 1; } } - strfieldcpy(dev.name, temp3); + if (temp3[0] != '\0') + strfieldcpy(dev.name, temp3); + else + dev.ignore_device = 1; valid = 1; continue; }