Allowing an empty name and coping with it is less confusing
than seeing "/empty" appear.
Signed-off-by: NeilBrown <neilb@suse.de>
fprintf(f, "%s ", mel->metadata);
fprintf(f, "%08x:%08x:%08x:%08x ", mel->uuid[0],
mel->uuid[1], mel->uuid[2], mel->uuid[3]);
fprintf(f, "%s ", mel->metadata);
fprintf(f, "%08x:%08x:%08x:%08x ", mel->uuid[0],
mel->uuid[1], mel->uuid[2], mel->uuid[3]);
- fprintf(f, "%s\n", mel->path);
+ fprintf(f, "%s\n", mel->path?:"");
}
fflush(f);
err = ferror(f);
}
fflush(f);
err = ferror(f);
me->devnum = devnum;
strcpy(me->metadata, metadata);
memcpy(me->uuid, uuid, 16);
me->devnum = devnum;
strcpy(me->metadata, metadata);
memcpy(me->uuid, uuid, 16);
- me->path = strdup(path);
+ me->path = path ? strdup(path) : NULL;
me->next = *melp;
me->bad = 0;
*melp = me;
me->next = *melp;
me->bad = 0;
*melp = me;
return;
while (fgets(buf, sizeof(buf), f)) {
return;
while (fgets(buf, sizeof(buf), f)) {
if (sscanf(buf, " %3[mdp]%d %s %x:%x:%x:%x %200s",
nam, &devnum, metadata, uuid, uuid+1,
if (sscanf(buf, " %3[mdp]%d %s %x:%x:%x:%x %200s",
nam, &devnum, metadata, uuid, uuid+1,
- uuid+2, uuid+3, path) == 8) {
+ uuid+2, uuid+3, path) >= 7) {
if (strncmp(nam, "md", 2) != 0)
continue;
if (nam[2] == 'p')
if (strncmp(nam, "md", 2) != 0)
continue;
if (nam[2] == 'p')
strcpy(mp->metadata, metadata);
memcpy(mp->uuid, uuid, 16);
free(mp->path);
strcpy(mp->metadata, metadata);
memcpy(mp->uuid, uuid, 16);
free(mp->path);
- mp->path = strdup(path);
+ mp->path = path ? strdup(path) : NULL;
map_read(map);
for (mp = *map ; mp ; mp = mp->next) {
map_read(map);
for (mp = *map ; mp ; mp = mp->next) {
+ if (!mp->path)
+ continue;
if (strncmp(mp->path, "/dev/md/", 8) != 0)
continue;
if (strcmp(mp->path+8, name) != 0)
if (strncmp(mp->path, "/dev/md/", 8) != 0)
continue;
if (strcmp(mp->path+8, name) != 0)
path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
map_add(&map, md->devnum,
info.text_version,
path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
map_add(&map, md->devnum,
info.text_version,
- info.uuid, path ? : "/unknown");
st->ss->free_super(st);
break;
}
st->ss->free_super(st);
break;
}
char *name;
struct map_ent *me;
me = map_by_devnum(&map, e->devnum);
char *name;
struct map_ent *me;
me = map_by_devnum(&map, e->devnum);
+ if (me && me->path
+ && strcmp(me->path, "/unknown") != 0)
name = me->path;
else
name = get_md_name(e->devnum);
name = me->path;
else
name = get_md_name(e->devnum);