projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
close file pointer before exiting function
[project/ubox.git]
/
block.c
diff --git
a/block.c
b/block.c
index
d4cf089
..
2289b77
100644
(file)
--- a/
block.c
+++ b/
block.c
@@
-302,7
+302,13
@@
static int swap_add(struct uci_section *s)
/* store complete swap path */
if (tb[SWAP_DEVICE])
m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]);
/* store complete swap path */
if (tb[SWAP_DEVICE])
m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]);
- vlist_add(&mounts, &m->node, (m->uuid) ? (m->uuid) : (m->device));
+
+ if (m->uuid)
+ vlist_add(&mounts, &m->node, m->uuid);
+ else if (m->label)
+ vlist_add(&mounts, &m->node, m->label);
+ else if (m->device)
+ vlist_add(&mounts, &m->node, m->device);
}
return 0;
}
return 0;
@@
-539,8
+545,10
@@
static char* find_mount_point(char *block)
char *p = &line[len + 1];
char *t = strstr(p, " ");
char *p = &line[len + 1];
char *t = strstr(p, " ");
- if (!t)
+ if (!t) {
+ fclose(fp);
return NULL;
return NULL;
+ }
*t = '\0';
point = p;
break;
*t = '\0';
point = p;
break;