fix dependencies of FEATURE_GETOPT_LONG

[oweals/busybox.git] / util-linux / mdev.c

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 7508930f7209f264ae1055119e065714582f11be..2ac15e762f23282b4e26aa483f38aff97a450611 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -303,8 +303,12 @@ static void make_device(char *path, int delete)
                                const char *s = "$@*";
                                const char *s2 = strchr(s, val[0]);
 
-                               if (!s2)
-                                       bb_error_msg_and_die("bad line %u", parser->lineno);
+                               if (!s2) {
+                                       bb_error_msg("bad line %u", parser->lineno);
+                                       if (ENABLE_FEATURE_MDEV_RENAME)
+                                               free(alias);
+                                       continue;
+                               }
 
                                /* Are we running this command now?
                                 * Run $cmd on delete, @cmd on create, *cmd on both
@@ -317,53 +321,53 @@ static void make_device(char *path, int delete)
                /* End of field parsing */
 
                /* "Execute" the line we found */
-
-               if (!delete && major >= 0) {
-                       if (ENABLE_FEATURE_MDEV_RENAME)
-                               unlink(device_name);
-                       if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
-                               bb_perror_msg_and_die("mknod %s", device_name);
-                       if (major == root_major && minor == root_minor)
-                               symlink(device_name, "root");
-                       if (ENABLE_FEATURE_MDEV_CONF) {
-                               chmod(device_name, mode);
-                               chown(device_name, ugid.uid, ugid.gid);
-                       }
-                       if (ENABLE_FEATURE_MDEV_RENAME && alias) {
-                               alias = build_alias(alias, device_name);
-                               /* move the device, and optionally
-                                * make a symlink to moved device node */
-                               if (rename(device_name, alias) == 0 && aliaslink == '>')
-                                       symlink(alias, device_name);
-                               free(alias);
+               {
+                       const char *node_name;
+
+                       node_name = device_name;
+                       if (ENABLE_FEATURE_MDEV_RENAME && alias)
+                               node_name = alias = build_alias(alias, device_name);
+
+                       if (!delete && major >= 0) {
+                               if (mknod(node_name, mode | type, makedev(major, minor)) && errno != EEXIST)
+                                       bb_perror_msg_and_die("mknod %s", node_name);
+                               if (major == root_major && minor == root_minor)
+                                       symlink(node_name, "root");
+                               if (ENABLE_FEATURE_MDEV_CONF) {
+                                       chmod(node_name, mode);
+                                       chown(node_name, ugid.uid, ugid.gid);
+                               }
+                               if (ENABLE_FEATURE_MDEV_RENAME && alias) {
+                                       if (aliaslink == '>')
+                                               symlink(node_name, device_name);
+                               }
                        }
-               }
 
-               if (ENABLE_FEATURE_MDEV_EXEC && command) {
-                       /* setenv will leak memory, use putenv/unsetenv/free */
-                       char *s = xasprintf("%s=%s", "MDEV", device_name);
-                       char *s1 = xasprintf("%s=%s", "SUBSYSTEM", subsystem);
-                       putenv(s);
-                       putenv(s1);
-                       if (system(command) == -1)
-                               bb_perror_msg_and_die("can't run '%s'", command);
-                       unsetenv("SUBSYSTEM");
-                       free(s1);
-                       unsetenv("MDEV");
-                       free(s);
-                       free(command);
-               }
+                       if (ENABLE_FEATURE_MDEV_EXEC && command) {
+                               /* setenv will leak memory, use putenv/unsetenv/free */
+                               char *s = xasprintf("%s=%s", "MDEV", node_name);
+                               char *s1 = xasprintf("%s=%s", "SUBSYSTEM", subsystem);
+                               putenv(s);
+                               putenv(s1);
+                               if (system(command) == -1)
+                                       bb_perror_msg("can't run '%s'", command);
+                               unsetenv("SUBSYSTEM");
+                               free(s1);
+                               unsetenv("MDEV");
+                               free(s);
+                               free(command);
+                       }
 
-               if (delete) {
-                       unlink(device_name);
-                       /* At creation time, device might have been moved
-                        * and a symlink might have been created. Undo that. */
+                       if (delete) {
+                               if (ENABLE_FEATURE_MDEV_RENAME && alias) {
+                                       if (aliaslink == '>')
+                                               unlink(device_name);
+                               }
+                               unlink(node_name);
+                       }
 
-                       if (ENABLE_FEATURE_MDEV_RENAME && alias) {
-                               alias = build_alias(alias, device_name);
-                               unlink(alias);
+                       if (ENABLE_FEATURE_MDEV_RENAME)
                                free(alias);
-                       }
                }
 
                /* We found matching line.