picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mount: Don't stop the mountinfo parser if one line can't be read

Browse source 
The current behavior of the /proc/self/mountinfo parser
is to stop the parser on parse failures

I'm only changing this behavior to try the next line and adding
a warning if occurs a fail.
This commit is contained in:
Fabiano Fidêncio 2010-10-05 08:41:06 -07:00 committed by Lennart Poettering
parent 1bc5d57ae3
commit 1ddff895f3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mount.c
View file

@ -1408,13 +1408,14 @@ finish:
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
int r;
unsigned i;
char *device, *path, *options, *options2, *fstype, *d, *p, *o;
assert(m);
rewind(m->proc_self_mountinfo);
for (;;) {
for (i = 1;; i++) {
int k;
device = path = options = options2 = fstype = d = p = o = NULL;
@ -1441,8 +1442,8 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
if (k == EOF)
break;
r = -EBADMSG;
goto finish;
log_warning("Failed to parse /proc/self/mountinfo:%u.", i);
goto clean_up;
}
if (asprintf(&o, "%s,%s", options, options2) < 0) {
@ -1459,6 +1460,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
if ((r = mount_add_one(m, d, p, o, fstype, true, set_flags)) < 0)
goto finish;
clean_up:
free(device);
free(path);
free(options);