From 7aaedcf21ee4c9eb49d7f1f74500c1b84cef75e7 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 14 Mar 2009 22:57:20 +0000 Subject: mount: support "-O option"; stop trying to mount swap partitions function old new delta mount_main 975 1152 +177 umount_main 640 636 -4 packed_usage 25666 25662 -4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/2 up/down: 177/-8) Total: 169 bytes --- util-linux/umount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util-linux/umount.c') diff --git a/util-linux/umount.c b/util-linux/umount.c index 901c9094f..5b22bfacc 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -73,9 +73,9 @@ int umount_main(int argc UNUSED_PARAM, char **argv) } else { while (getmntent_r(fp, &me, path, PATH_MAX)) { /* Match fstype if passed */ - if (fstype && match_fstype(&me, fstype)) + if (!match_fstype(&me, fstype)) continue; - m = xmalloc(sizeof(struct mtab_list)); + m = xzalloc(sizeof(*m)); m->next = mtl; m->device = xstrdup(me.mnt_fsname); m->dir = xstrdup(me.mnt_dir); -- cgit v1.2.3