diff options
Diffstat (limited to 'util-linux/mdev.c')
-rw-r--r-- | util-linux/mdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index f6440b190..d0d010382 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -107,10 +107,7 @@ static void make_device(char *path, int delete) | |||
107 | parser = config_open2("/etc/mdev.conf", fopen_for_read); | 107 | parser = config_open2("/etc/mdev.conf", fopen_for_read); |
108 | 108 | ||
109 | /* If we have config file, look up user settings */ | 109 | /* If we have config file, look up user settings */ |
110 | if (!parser) | 110 | while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) { |
111 | goto end_parse; | ||
112 | |||
113 | while (config_read(parser, tokens, 4, 3, "# \t", PARSE_LAST_IS_GREEDY)) { | ||
114 | regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; | 111 | regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; |
115 | char *val; | 112 | char *val; |
116 | 113 | ||
@@ -244,7 +241,6 @@ static void make_device(char *path, int delete) | |||
244 | } /* end of "while line is read from /etc/mdev.conf" */ | 241 | } /* end of "while line is read from /etc/mdev.conf" */ |
245 | 242 | ||
246 | config_close(parser); | 243 | config_close(parser); |
247 | end_parse: | ||
248 | #endif /* ENABLE_FEATURE_MDEV_CONF */ | 244 | #endif /* ENABLE_FEATURE_MDEV_CONF */ |
249 | 245 | ||
250 | if (!delete && sscanf(dev_maj_min, "%u:%u", &major, &minor) == 2) { | 246 | if (!delete && sscanf(dev_maj_min, "%u:%u", &major, &minor) == 2) { |