X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.c;h=dcf0a434744483a6a9944a22a7347c711c646d0d;hb=1ddff895f3ad85ec79c4923ba8c882a283826f42;hp=b17fe2a7d3df371ea658cd9c347672d44e5559cb;hpb=1bc5d57ae3bd2c49aca3bba10c4ed87c62213e39;p=elogind.git diff --git a/src/mount.c b/src/mount.c index b17fe2a7d..dcf0a4347 100644 --- a/src/mount.c +++ b/src/mount.c @@ -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);