aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util-linux/mdev.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index d5faf432e..a4d6dfdf9 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -46,7 +46,7 @@ static void make_device(char *path, int delete)
char *dev_maj_min = path + strlen(path);
char *command = NULL;
char *alias = NULL;
- int aliaslink;
+ char aliaslink = aliaslink; /* for compiler */
/* Force the configuration file settings exactly. */
umask(0);
@@ -174,7 +174,7 @@ static void make_device(char *path, int delete)
char *s, *p;
unsigned i, n;
- aliaslink = (*next == '>');
+ aliaslink = *next;
val = next;
next = next_field(val);
/* substitute %1..9 with off[1..9], if any */
@@ -200,7 +200,7 @@ static void make_device(char *path, int delete)
s++;
}
#else
- aliaslink = (*next == '>');
+ aliaslink = *next;
val = next;
next = next_field(val);
alias = xstrdup(val + 1);
@@ -271,8 +271,9 @@ static void make_device(char *path, int delete)
}
}
- /* recreate device_name as a symlink to moved device node */
- if (rename(device_name, alias) == 0 && aliaslink)
+ /* 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);