shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

mount: properly handle LABEL="" in fstab

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-20 02:46:15 +02:00
parent 049f86421b
commit 11ce342724
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixme
View File

@ -60,8 +60,6 @@
* bash completion a la gdbus
* fstab mit tüdelchen
* api mounts gegen fstab mergen und remounten
External:

18
src/mount.c
View File

@ -1175,7 +1175,7 @@ fail:
}
static char *fstab_node_to_udev_node(char *p) {
char *dn, *t;
char *dn, *t, *u;
int r;
/* FIXME: to follow udev's logic 100% we need to leave valid
@ -1183,7 +1183,13 @@ static char *fstab_node_to_udev_node(char *p) {
if (startswith(p, "LABEL=")) {
if (!(t = xescape(p+6, "/ ")))
if (!(u = unquote(p+6, '"')))
return NULL;
t = xescape(u, "/ ");
free(u);
if (!t)
return NULL;
r = asprintf(&dn, "/dev/disk/by-label/%s", t);
@ -1197,7 +1203,13 @@ static char *fstab_node_to_udev_node(char *p) {
if (startswith(p, "UUID=")) {
if (!(t = xescape(p+5, "/ ")))
if (!(u = unquote(p+5, '"')))
return NULL;
t = xescape(u, "/ ");
free(u);
if (!t)
return NULL;
r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t));

13
src/util.c
View File

@ -3004,6 +3004,19 @@ int touch(const char *path) {
return 0;
}
char *unquote(const char *s, const char quote) {
size_t l;
assert(s);
if ((l = strlen(s)) < 2)
return strdup(s);
if (s[0] == quote && s[l-1] == quote)
return strndup(s+1, l-2);
return strdup(s);
}
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",

2
src/util.h
View File

@ -339,6 +339,8 @@ char *ellipsize(const char *s, unsigned length, unsigned percent);
int touch(const char *path);
char *unquote(const char *s, const char quote);
#define NULSTR_FOREACH(i, l) \
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)