X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fumount.c;h=cffa45327be531784ac64cc9864c82ff622e4fe4;hb=f1f00dbb7f3741b30d4a26b1a8b65ec46ff1fde3;hp=e7460cb6bffd14dfaab1cc845ce5182ead92ab56;hpb=71fda00f320379f5cbee8e118848de98caaa229d;p=elogind.git diff --git a/src/core/umount.c b/src/core/umount.c index e7460cb6b..cffa45327 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -61,52 +61,46 @@ static void mount_points_list_free(MountPoint **head) { } static int mount_points_list_get(MountPoint **head) { - FILE *proc_self_mountinfo; - char *path, *p; + _cleanup_fclose_ FILE *proc_self_mountinfo = NULL; unsigned int i; - int r; assert(head); - if (!(proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"))) + proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"); + if (!proc_self_mountinfo) return -errno; for (i = 1;; i++) { - int k; + _cleanup_free_ char *path = NULL; + char *p = NULL; MountPoint *m; + int k; - path = p = NULL; - - if ((k = fscanf(proc_self_mountinfo, - "%*s " /* (1) mount id */ - "%*s " /* (2) parent id */ - "%*s " /* (3) major:minor */ - "%*s " /* (4) root */ - "%ms " /* (5) mount point */ - "%*s" /* (6) mount options */ - "%*[^-]" /* (7) optional fields */ - "- " /* (8) separator */ - "%*s " /* (9) file system type */ - "%*s" /* (10) mount source */ - "%*s" /* (11) mount options 2 */ - "%*[^\n]", /* some rubbish at the end */ - &path)) != 1) { + k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ + "%ms " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ + "%*s " /* (9) file system type */ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ + &path); + if (k != 1) { if (k == EOF) break; log_warning("Failed to parse /proc/self/mountinfo:%u.", i); - - free(path); continue; } p = cunescape(path); - free(path); - - if (!p) { - r = -ENOMEM; - goto finish; - } + if (!p) + return -ENOMEM; /* Ignore mount points we can't unmount because they * are API or because we are keeping them open (like @@ -118,28 +112,22 @@ static int mount_points_list_get(MountPoint **head) { continue; } - if (!(m = new0(MountPoint, 1))) { + m = new0(MountPoint, 1); + if (!m) { free(p); - r = -ENOMEM; - goto finish; + return -ENOMEM; } m->path = p; LIST_PREPEND(mount_point, *head, m); } - r = 0; - -finish: - fclose(proc_self_mountinfo); - - return r; + return 0; } static int swap_list_get(MountPoint **head) { - FILE *proc_swaps; + _cleanup_fclose_ FILE *proc_swaps = NULL; unsigned int i; - int r; assert(head); @@ -170,7 +158,7 @@ static int swap_list_get(MountPoint **head) { continue; } - if (endswith(dev, "(deleted)")) { + if (endswith(dev, " (deleted)")) { free(dev); continue; } @@ -179,32 +167,26 @@ static int swap_list_get(MountPoint **head) { free(dev); if (!d) { - r = -ENOMEM; - goto finish; + return -ENOMEM; } if (!(swap = new0(MountPoint, 1))) { free(d); - r = -ENOMEM; - goto finish; + return -ENOMEM; } swap->path = d; LIST_PREPEND(mount_point, *head, swap); } - r = 0; - -finish: - fclose(proc_swaps); - - return r; + return 0; } static int loopback_list_get(MountPoint **head) { - _cleanup_udev_unref_ struct udev *udev; _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; + int r; assert(head); @@ -216,13 +198,21 @@ static int loopback_list_get(MountPoint **head) { if (!e) return -ENOMEM; - if (udev_enumerate_add_match_subsystem(e, "block") < 0 || - udev_enumerate_add_match_sysname(e, "loop*") < 0 || - udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL) < 0) - return -EIO; + r = udev_enumerate_add_match_subsystem(e, "block"); + if (r < 0) + return r; - if (udev_enumerate_scan_devices(e) < 0) - return -EIO; + r = udev_enumerate_add_match_sysname(e, "loop*"); + if (r < 0) + return r; + + r = udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL); + if (r < 0) + return r; + + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { @@ -257,9 +247,10 @@ static int loopback_list_get(MountPoint **head) { } static int dm_list_get(MountPoint **head) { - _cleanup_udev_unref_ struct udev *udev; _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; + int r; assert(head); @@ -271,15 +262,19 @@ static int dm_list_get(MountPoint **head) { if (!e) return -ENOMEM; - if (udev_enumerate_add_match_subsystem(e, "block") < 0 || - udev_enumerate_add_match_sysname(e, "dm-*") < 0) - return -EIO; + r = udev_enumerate_add_match_subsystem(e, "block"); + if (r < 0) + return r; - if (udev_enumerate_scan_devices(e) < 0) - return -EIO; + r = udev_enumerate_add_match_sysname(e, "dm-*"); + if (r < 0) + return r; - first = udev_enumerate_get_list_entry(e); + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; + first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { MountPoint *m; _cleanup_udev_device_unref_ struct udev_device *d; @@ -315,14 +310,14 @@ static int dm_list_get(MountPoint **head) { } static int delete_loopback(const char *device) { - int fd, r; + _cleanup_close_ int fd = -1; + int r; - if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0) + fd = open(device, O_RDONLY|O_CLOEXEC); + if (fd < 0) return errno == ENOENT ? 0 : -errno; r = ioctl(fd, LOOP_CLR_FD, 0); - close_nointr_nofail(fd); - if (r >= 0) return 1;