build-sys: add --enable-new-mount

 Now we have three versions of the mount(8) utility

 * old mount(8)
   --enable-mount [default]

 * old mount(8) linked with libmount
   This is this is necessary for systems without mtab file.
   --enable-libmount-mount

 - new mount(8)
   This is completely new pure-libmount based mount(8).
   --enable-new-mount

Signed-off-by: Karel Zak <kzak@redhat.com>

5 files changed, 1 insertions, 846 deletions

diff --git a/libmount/Makefile.am b/libmount/Makefile.am
index dbe131789..5f7ca4ca5 100644
--- a/libmount/Makefile.am
+++ b/libmount/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-SUBDIRS = src samples
+SUBDIRS = src
 
 if ENABLE_GTK_DOC
 SUBDIRS += docs
diff --git a/libmount/samples/.gitignore b/libmount/samples/.gitignore
deleted file mode 100644
index 33dbb1785..000000000
--- a/libmount/samples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-mount
-umount
diff --git a/libmount/samples/Makefile.am b/libmount/samples/Makefile.am
deleted file mode 100644
index a8c001f7d..000000000
--- a/libmount/samples/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libmount_incdir)
-AM_LDFLAGS += $(ul_libmount_la)
-
-noinst_PROGRAMS = mount umount
-
-mount_SOURCES = mount.c \
-		$(top_srcdir)/lib/env.c \
-		$(top_srcdir)/lib/xgetpass.c \
-		$(top_srcdir)/lib/strutils.c
-
-umount_SOURCES = umount.c $(top_srcdir)/lib/env.c
-
diff --git a/libmount/samples/mount.c b/libmount/samples/mount.c
deleted file mode 100644
index cdd70b8f6..000000000
--- a/libmount/samples/mount.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * mount(8) -- mount a filesystem
- *
- * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
- * Written by Karel Zak <kzak@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
-#include <libmount.h>
-
-#include "nls.h"
-#include "c.h"
-#include "env.h"
-#include "optutils.h"
-#include "strutils.h"
-#include "xgetpass.h"
-
-/*** TODO: DOCS:
- *
- *  --guess-fstype	is unsupported
- */
-
-/* exit status */
-#define EX_SUCCESS	0
-#define EX_USAGE	1	/* incorrect invocation or permission */
-#define EX_SYSERR	2	/* out of memory, cannot fork, ... */
-#define EX_SOFTWARE	4	/* internal mount bug or wrong version */
-#define EX_USER		8	/* user interrupt */
-#define EX_FILEIO      16	/* problems writing, locking, ... mtab/fstab */
-#define EX_FAIL	       32	/* mount failure */
-#define EX_SOMEOK      64	/* some mount succeeded */
-
-static int passfd = -1;
-
-static void __attribute__((__noreturn__)) exit_non_root(const char *option)
-{
-	const uid_t ruid = getuid();
-	const uid_t euid = geteuid();
-
-	if (ruid == 0 && euid != 0) {
-		/* user is root, but setuid to non-root */
-		if (option)
-			errx(EX_USAGE, _("only root can use \"--%s\" option "
-					 "(effective UID is %u)"),
-					option, euid);
-		errx(EX_USAGE, _("only root can do that "
-				 "(effective UID is %u)"), euid);
-	}
-	if (option)
-		errx(EX_USAGE, _("only root can use \"--%s\" option"), option);
-	errx(EX_USAGE, _("only root can do that"));
-}
-
-static void __attribute__((__noreturn__)) print_version(void)
-{
-	const char *ver = NULL;
-
-	mnt_get_library_version(&ver);
-
-	printf(_("%s from %s (libmount %s)\n"),
-			program_invocation_short_name, PACKAGE_STRING, ver);
-	exit(EX_SUCCESS);
-}
-
-static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
-			const char *filename, int line)
-{
-	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
-	return 0;
-}
-
-static char *encrypt_pass_get(struct libmnt_context *cxt)
-{
-	if (!cxt)
-		return 0;
-
-#ifdef MCL_FUTURE
-	if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
-		warn(_("couldn't lock into memory"));
-		return NULL;
-	}
-#endif
-	return xgetpass(passfd, _("Password: "));
-}
-
-static void encrypt_pass_release(struct libmnt_context *cxt, char *pwd)
-{
-	char *p = pwd;
-
-	while (p && *p)
-		*p++ = '\0';
-
-	free(pwd);
-	munlockall();
-}
-
-static void print_all(struct libmnt_context *cxt, char *pattern, int show_label)
-{
-	struct libmnt_table *tb;
-	struct libmnt_iter *itr = NULL;
-	struct libmnt_fs *fs;
-	struct libmnt_cache *cache = NULL;
-
-	if (mnt_context_get_mtab(cxt, &tb))
-		err(EX_SYSERR, _("failed to read mtab"));
-
-	itr = mnt_new_iter(MNT_ITER_FORWARD);
-	if (!itr)
-		err(EX_SYSERR, _("failed to initialize libmount iterator"));
-	if (show_label)
-		cache = mnt_new_cache();
-
-	while (mnt_table_next_fs(tb, itr, &fs) == 0) {
-		const char *type = mnt_fs_get_fstype(fs);
-		const char *src = mnt_fs_get_source(fs);
-		const char *optstr = mnt_fs_get_options(fs);
-		char *xsrc;
-
-		if (type && pattern && !mnt_match_fstype(type, pattern))
-			continue;
-
-		xsrc = mnt_pretty_path(src, cache);
-		printf ("%s on %s", xsrc, mnt_fs_get_target(fs));
-		if (type)
-			printf (" type %s", type);
-		if (optstr)
-			printf (" (%s)", optstr);
-		if (show_label && src) {
-			char *lb = mnt_cache_find_tag_value(cache, src, "LABEL");
-			if (lb)
-				printf (" [%s]", lb);
-		}
-		fputc('\n', stdout);
-		free(xsrc);
-	}
-
-	mnt_free_cache(cache);
-	mnt_free_iter(itr);
-}
-
-/*
- * mount -a [-F]
- */
-static int mount_all(struct libmnt_context *cxt)
-{
-	struct libmnt_iter *itr;
-	struct libmnt_fs *fs;
-	int mntrc, ignored, rc = EX_SUCCESS;
-
-	itr = mnt_new_iter(MNT_ITER_FORWARD);
-	if (!itr) {
-		warn(_("failed to initialize libmount iterator"));
-		return EX_SYSERR;
-	}
-
-	while (mnt_context_next_mount(cxt, itr, &fs, &mntrc, &ignored) == 0) {
-
-		const char *tgt = mnt_fs_get_target(fs);
-
-		if (ignored) {
-			if (mnt_context_is_verbose(cxt))
-				printf(ignored == 1 ? _("%-25s: ignored\n") :
-						      _("%-25s: already mounted\n"),
-						tgt);
-
-		} else if (mnt_context_is_fork(cxt)) {
-			printf("%-25s: mount successfully forked\n", tgt);
-
-		} else {
-			if (!mnt_context_get_status(cxt)) {
-				if (mntrc > 0) {
-					errno = mntrc;
-					printf(_("%-25s: failed: %s\n"), tgt,
-							strerror(mntrc));
-					rc |= EX_FAIL;
-				} else {
-					printf(_("%-25s: failed\n"), tgt);
-					rc |= EX_SYSERR;
-				}
-			} else {
-				if (mnt_context_is_verbose(cxt))
-					printf("%-25s: successfully mounted\n", tgt);
-
-				rc |= EX_SOMEOK;
-			}
-		}
-	}
-
-	if (mnt_context_is_parent(cxt)) {
-		/* wait for mount --fork children */
-		int nerrs = 0, nchildren = 0;
-
-		rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs);
-		if (!rc && nchildren)
-			rc = nchildren == nerrs ? EX_FAIL : EX_SOMEOK;
-	}
-
-	return rc;
-}
-
-static void __attribute__((__noreturn__)) usage(FILE *out)
-{
-	fputs(USAGE_HEADER, out);
-	fprintf(out, _(
-		" %1$s [-lhV]\n"
-		" %1$s -a [options]\n"
-		" %1$s [options] <source> | <directory>\n"
-		" %1$s [options] <source> <directory>\n"
-		" %1$s <operation> <mountpoint> [<target>]\n"),
-		program_invocation_short_name);
-
-	fputs(USAGE_OPTIONS, out);
-	fprintf(out, _(
-	" -a, --all               mount all filesystems mentioned in fstab\n"
-	" -c, --no-canonicalize   don't canonicalize paths\n"
-	" -f, --fake              dry run; skip the mount(2) syscall\n"
-	" -F, --fork              fork off for each device (use with -a)\n"));
-	fprintf(out, _(
-	" -h, --help              display this help text and exit\n"
-	" -i, --internal-only     don't call the mount.<type> helpers\n"
-	" -l, --show-labels       lists all mounts with LABELs\n"
-	" -n, --no-mtab           don't write to /etc/mtab\n"));
-	fprintf(out, _(
-	" -o, --options <list>    comma-separated list of mount options\n"
-	" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-	" -p, --pass-fd <num>     read the passphrase from file descriptor\n"
-	" -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-	" -t, --types <list>      limit the set of filesystem types\n"));
-	fprintf(out, _(
-	" -v, --verbose           say what is being done\n"
-	" -V, --version           display version information and exit\n"
-	" -w, --read-write        mount the filesystem read-write (default)\n"));
-
-	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
-
-	fprintf(out, _(
-	"\nSource:\n"
-	" -L, --label <label>     synonym for LABEL=<label>\n"
-	" -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
-	" LABEL=<label>           specifies device by filesystem label\n"
-	" UUID=<uuid>             specifies device by filesystem UUID\n"));
-	fprintf(out, _(
-	" <device>                specifies device by path\n"
-	" <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
-	" <file>                  regular file for loopdev setup\n"));
-
-	fprintf(out, _(
-	"\nOperations:\n"
-	" -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
-	" -M, --move              move a subtree to some other place\n"
-	" -R, --rbind             mount a subtree and all submounts somewhere else\n"));
-	fprintf(out, _(
-	" --make-shared           mark a subtree as shared\n"
-	" --make-slave            mark a subtree as slave\n"
-	" --make-private          mark a subtree as private\n"
-	" --make-unbindable       mark a subtree as unbindable\n"));
-	fprintf(out, _(
-	" --make-rshared          recursively mark a whole subtree as shared\n"
-	" --make-rslave           recursively mark a whole subtree as slave\n"
-	" --make-rprivate         recursively mark a whole subtree as private\n"
-	" --make-runbindable      recursively mark a whole subtree as unbindable\n"));
-
-	fprintf(out, USAGE_MAN_TAIL("mount(8)"));
-
-	exit(out == stderr ? EX_USAGE : EX_SUCCESS);
-}
-
-int main(int argc, char **argv)
-{
-	int c, rc = EX_SUCCESS, all = 0, show_labels = 0;
-	struct libmnt_context *cxt;
-	char *source = NULL, *srcbuf = NULL;
-	char *types = NULL;
-	unsigned long oper = 0;
-
-	enum {
-		MOUNT_OPT_SHARED = CHAR_MAX + 1,
-		MOUNT_OPT_SLAVE,
-		MOUNT_OPT_PRIVATE,
-		MOUNT_OPT_UNBINDABLE,
-		MOUNT_OPT_RSHARED,
-		MOUNT_OPT_RSLAVE,
-		MOUNT_OPT_RPRIVATE,
-		MOUNT_OPT_RUNBINDABLE
-	};
-
-	static const struct option longopts[] = {
-		{ "all", 0, 0, 'a' },
-		{ "fake", 0, 0, 'f' },
-		{ "fork", 0, 0, 'F' },
-		{ "help", 0, 0, 'h' },
-		{ "no-mtab", 0, 0, 'n' },
-		{ "read-only", 0, 0, 'r' },
-		{ "ro", 0, 0, 'r' },
-		{ "verbose", 0, 0, 'v' },
-		{ "version", 0, 0, 'V' },
-		{ "read-write", 0, 0, 'w' },
-		{ "rw", 0, 0, 'w' },
-		{ "options", 1, 0, 'o' },
-		{ "test-opts", 1, 0, 'O' },
-		{ "pass-fd", 1, 0, 'p' },
-		{ "types", 1, 0, 't' },
-		{ "uuid", 1, 0, 'U' },
-		{ "label", 1, 0, 'L'},
-		{ "bind", 0, 0, 'B' },
-		{ "move", 0, 0, 'M' },
-		{ "rbind", 0, 0, 'R' },
-		{ "make-shared", 0, 0, MOUNT_OPT_SHARED },
-		{ "make-slave", 0, 0, MOUNT_OPT_SLAVE },
-		{ "make-private", 0, 0, MOUNT_OPT_PRIVATE },
-		{ "make-unbindable", 0, 0, MOUNT_OPT_UNBINDABLE },
-		{ "make-rshared", 0, 0, MOUNT_OPT_RSHARED },
-		{ "make-rslave", 0, 0, MOUNT_OPT_RSLAVE },
-		{ "make-rprivate", 0, 0, MOUNT_OPT_RPRIVATE },
-		{ "make-runbindable", 0, 0, MOUNT_OPT_RUNBINDABLE },
-		{ "no-canonicalize", 0, 0, 'c' },
-		{ "internal-only", 0, 0, 'i' },
-		{ "show-labels", 0, 0, 'l' },
-		{ NULL, 0, 0, 0 }
-	};
-
-	sanitize_env();
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
-	mnt_init_debug(0);
-	cxt = mnt_new_context();
-	if (!cxt)
-		err(EX_SYSERR, _("libmount context allocation failed"));
-
-	mnt_context_set_tables_errcb(cxt, table_parser_errcb);
-
-	while ((c = getopt_long(argc, argv, "aBcfFhilL:Mno:O:p:rRsU:vVwt:",
-					longopts, NULL)) != -1) {
-
-		/* only few options are allowed for non-root users */
-		if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvp", c))
-			exit_non_root(option_to_longopt(c, longopts));
-
-		switch(c) {
-		case 'a':
-			all = 1;
-			break;
-		case 'c':
-			mnt_context_disable_canonicalize(cxt, TRUE);
-			break;
-		case 'f':
-			mnt_context_enable_fake(cxt, TRUE);
-			break;
-		case 'F':
-			mnt_context_enable_fork(cxt, TRUE);
-			break;
-		case 'h':
-			usage(stdout);
-			break;
-		case 'i':
-			mnt_context_disable_helpers(cxt, TRUE);
-			break;
-		case 'n':
-			mnt_context_disable_mtab(cxt, TRUE);
-			break;
-		case 'r':
-			if (mnt_context_append_options(cxt, "ro"))
-				err(EX_SYSERR, _("failed to append options"));
-			break;
-		case 'v':
-			mnt_context_enable_verbose(cxt, TRUE);
-			break;
-		case 'V':
-			print_version();
-			break;
-		case 'w':
-			if (mnt_context_append_options(cxt, "rw"))
-				err(EX_SYSERR, _("failed to append options"));
-			break;
-		case 'o':
-			if (mnt_context_append_options(cxt, optarg))
-				err(EX_SYSERR, _("failed to append options"));
-			break;
-		case 'O':
-			if (mnt_context_set_options_pattern(cxt, optarg))
-				err(EX_SYSERR, _("failed to set options pattern"));
-			break;
-		case 'p':
-			passfd = strtol_or_err(optarg,
-					_("invalid passphrase file descriptor"));
-			break;
-		case 'L':
-		case 'U':
-			if (source)
-				errx(EX_USAGE, _("only one <source> may be specified"));
-			if (asprintf(&srcbuf, "%s=\"%s\"",
-				     c == 'L' ? "LABEL" : "UUID", optarg) <= 0)
-				err(EX_SYSERR, _("failed to allocate source buffer"));
-			source = srcbuf;
-			break;
-		case 'l':
-			show_labels = 1;
-			break;
-		case 't':
-			types = optarg;
-			break;
-		case 's':
-			mnt_context_enable_sloppy(cxt, TRUE);
-			break;
-		case 'B':
-			oper = MS_BIND;
-			break;
-		case 'M':
-			oper = MS_MOVE;
-			break;
-		case 'R':
-			oper = (MS_BIND | MS_REC);
-			break;
-		case MOUNT_OPT_SHARED:
-			oper = MS_SHARED;
-			break;
-		case MOUNT_OPT_SLAVE:
-			oper = MS_SLAVE;
-			break;
-		case MOUNT_OPT_PRIVATE:
-			oper = MS_PRIVATE;
-			break;
-		case MOUNT_OPT_UNBINDABLE:
-			oper = MS_UNBINDABLE;
-			break;
-		case MOUNT_OPT_RSHARED:
-			oper = (MS_SHARED | MS_REC);
-			break;
-		case MOUNT_OPT_RSLAVE:
-			oper = (MS_SLAVE | MS_REC);
-			break;
-		case MOUNT_OPT_RPRIVATE:
-			oper = (MS_PRIVATE | MS_REC);
-			break;
-		case MOUNT_OPT_RUNBINDABLE:
-			oper = (MS_UNBINDABLE | MS_REC);
-			break;
-		default:
-			usage(stderr);
-			break;
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (!source && !argc && !all) {
-		if (oper)
-			usage(stderr);
-		print_all(cxt, types, show_labels);
-		goto done;
-	}
-
-	if (oper && (types || all || source))
-		usage(stderr);
-
-	if (types && (all || strchr(types, ',') ||
-			     strncmp(types, "no", 2) == 0))
-		mnt_context_set_fstype_pattern(cxt, types);
-	else if (types)
-		mnt_context_set_fstype(cxt, types);
-
-	mnt_context_set_passwd_cb(cxt, encrypt_pass_get, encrypt_pass_release);
-
-	if (all) {
-		/*
-		 * A) Mount all
-		 */
-		rc = mount_all(cxt);
-		goto done;
-
-	} else if (argc == 0 && source) {
-		/*
-		 * B) mount -L|-U
-		 */
-		mnt_context_set_source(cxt, source);
-
-	} else if (argc == 1) {
-		/*
-		 * C) mount [-L|-U] <target>
-		 *    mount <source|target>
-		 */
-		if (source) {
-			if (mnt_context_is_restricted(cxt))
-				exit_non_root(NULL);
-			 mnt_context_set_source(cxt, source);
-		}
-		mnt_context_set_target(cxt, argv[0]);
-
-	} else if (argc == 2 && !source) {
-		/*
-		 * D) mount <source> <target>
-		 */
-		if (mnt_context_is_restricted(cxt))
-			exit_non_root(NULL);
-		mnt_context_set_source(cxt, argv[0]);
-		mnt_context_set_target(cxt, argv[1]);
-	} else
-		usage(stderr);
-
-	if (oper)
-		mnt_context_set_mflags(cxt, oper);
-
-	rc = mnt_context_mount(cxt);
-	if (rc) {
-		/* TODO: call mnt_context_strerror() */
-		rc = EX_FAIL;
-	} else
-		rc = EX_SUCCESS;
-done:
-	free(srcbuf);
-	mnt_free_context(cxt);
-	return rc;
-}
-
diff --git a/libmount/samples/umount.c b/libmount/samples/umount.c
deleted file mode 100644
index ddda086ba..000000000
--- a/libmount/samples/umount.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * umount(8) -- mount a filesystem
- *
- * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
- * Written by Karel Zak <kzak@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <libmount.h>
-
-#include "nls.h"
-#include "c.h"
-#include "env.h"
-#include "optutils.h"
-
-static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
-			const char *filename, int line)
-{
-	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
-	return 0;
-}
-
-static void __attribute__((__noreturn__)) print_version(void)
-{
-	const char *ver = NULL;
-
-	mnt_get_library_version(&ver);
-
-	printf(_("%s from %s (libmount %s)\n"),
-			program_invocation_short_name, PACKAGE_STRING, ver);
-	exit(EXIT_SUCCESS);
-}
-
-static void __attribute__((__noreturn__)) usage(FILE *out)
-{
-	fputs(USAGE_HEADER, out);
-	fprintf(out, _(
-		" %1$s [-hV]\n"
-		" %1$s -a [options]\n"
-		" %1$s [options] <source> | <directory>\n"),
-		program_invocation_short_name);
-
-	fputs(USAGE_OPTIONS, out);
-	fprintf(out, _(
-	" -a, --all               mount all filesystems mentioned in fstab\n"
-	" -c, --no-canonicalize   don't canonicalize paths\n"
-	" -d, --detach-loop       if mounted loop device, also free this loop device\n"
-	"     --fake              dry run; skip the umount(2) syscall\n"
-	" -f, --force             force unmount (in case of an unreachable NFS system)\n"));
-	fprintf(out, _(
-	" -i, --internal-only     don't call the umount.<type> helpers\n"
-	" -n, --no-mtab           don't write to /etc/mtab\n"
-	" -l, --lazy              detach the filesystem now, and cleanup all later\n"));
-	fprintf(out, _(
-	" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-	" -r, --read-only         In case unmounting fails, try to remount read-only\n"
-	" -t, --types <list>      limit the set of filesystem types\n"
-	" -v, --verbose           say what is being done\n"));
-
-	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
-	fprintf(out, USAGE_MAN_TAIL("umount(8)"));
-
-	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
-}
-
-static void __attribute__((__noreturn__)) exit_non_root(const char *option)
-{
-	const uid_t ruid = getuid();
-	const uid_t euid = geteuid();
-
-	if (ruid == 0 && euid != 0) {
-		/* user is root, but setuid to non-root */
-		if (option)
-			errx(EXIT_FAILURE,
-				_("only root can use \"--%s\" option "
-				 "(effective UID is %u)"),
-					option, euid);
-		errx(EXIT_FAILURE, _("only root can do that "
-				 "(effective UID is %u)"), euid);
-	}
-	if (option)
-		errx(EXIT_FAILURE, _("only root can use \"--%s\" option"), option);
-	errx(EXIT_FAILURE, _("only root can do that"));
-}
-
-static int umount_all(struct libmnt_context *cxt)
-{
-	struct libmnt_iter *itr;
-	struct libmnt_fs *fs;
-	int mntrc, ignored, rc = 0;
-
-	itr = mnt_new_iter(MNT_ITER_BACKWARD);
-	if (!itr) {
-		warn(_("failed to initialize libmount iterator"));
-		return -ENOMEM;
-	}
-
-	while (mnt_context_next_umount(cxt, itr, &fs, &mntrc, &ignored) == 0) {
-
-		const char *tgt = mnt_fs_get_target(fs);
-
-		if (ignored) {
-			if (mnt_context_is_verbose(cxt))
-				printf(_("%-25s: ignored\n"), tgt);
-		} else if (!mnt_context_get_status(cxt)) {
-			if (mntrc > 0) {
-				errno = mntrc;
-				printf(_("%-25s: failed: %s\n"), tgt,
-						strerror(mntrc));
-			} else
-				printf(_("%-25s: failed\n"), tgt);
-			rc |= 1;
-		} else {
-			if (mnt_context_is_verbose(cxt))
-				printf("%-25s: successfully umounted\n", tgt);
-
-			rc |= 0;
-		}
-	}
-
-	return rc;
-}
-
-static int umount_one(struct libmnt_context *cxt, const char *spec)
-{
-	int rc;
-
-	if (!spec)
-		return -EINVAL;
-
-	if (mnt_context_set_target(cxt, spec))
-		err(EXIT_FAILURE, _("failed to set umount target"));
-
-	rc = mnt_context_umount(cxt);
-	if (rc)
-		/* TODO mnt_context_strerror() */
-		warnx(_("%s: umount failed"), spec);
-
-	mnt_reset_context(cxt);
-	return rc;
-}
-
-int main(int argc, char **argv)
-{
-	int c, rc = 0, all = 0;
-	struct libmnt_context *cxt;
-	char *types = NULL;
-
-	enum {
-		UMOUNT_OPT_FAKE = CHAR_MAX + 1,
-	};
-
-	static const struct option longopts[] = {
-		{ "all", 0, 0, 'a' },
-		{ "detach-loop", 0, 0, 'd' },
-		{ "fake", 0, 0, UMOUNT_OPT_FAKE },
-		{ "force", 0, 0, 'f' },
-		{ "help", 0, 0, 'h' },
-		{ "internal-only", 0, 0, 'i' },
-		{ "lazy", 0, 0, 'l' },
-		{ "no-canonicalize", 0, 0, 'c' },
-		{ "no-mtab", 0, 0, 'n' },
-		{ "read-only", 0, 0, 'r' },
-		{ "test-opts", 1, 0, 'O' },
-		{ "types", 1, 0, 't' },
-		{ "verbose", 0, 0, 'v' },
-		{ "version", 0, 0, 'V' },
-		{ NULL, 0, 0, 0 }
-	};
-
-	sanitize_env();
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
-	mnt_init_debug(0);
-	cxt = mnt_new_context();
-	if (!cxt)
-		err(EXIT_FAILURE, _("libmount context allocation failed"));
-
-	mnt_context_set_tables_errcb(cxt, table_parser_errcb);
-
-	while ((c = getopt_long(argc, argv, "acdfhilnrO:t:vV",
-					longopts, NULL)) != -1) {
-
-
-		/* only few options are allowed for non-root users */
-		if (mnt_context_is_restricted(cxt) && !strchr("hdilVv", c))
-			exit_non_root(option_to_longopt(c, longopts));
-
-		switch(c) {
-		case 'a':
-			all = 1;
-			break;
-		case 'c':
-			mnt_context_disable_canonicalize(cxt, TRUE);
-			break;
-		case 'd':
-			mnt_context_enable_loopdel(cxt, TRUE);
-			break;
-		case UMOUNT_OPT_FAKE:
-			mnt_context_enable_fake(cxt, TRUE);
-			break;
-		case 'f':
-			mnt_context_enable_force(cxt, TRUE);
-			break;
-		case 'h':
-			usage(stdout);
-			break;
-		case 'i':
-			mnt_context_disable_helpers(cxt, TRUE);
-			break;
-		case 'l':
-			mnt_context_enable_lazy(cxt, TRUE);
-			break;
-		case 'n':
-			mnt_context_disable_mtab(cxt, TRUE);
-			break;
-		case 'r':
-			mnt_context_enable_rdonly_umount(cxt, TRUE);
-			break;
-		case 'O':
-			if (mnt_context_set_options_pattern(cxt, optarg))
-				err(EXIT_FAILURE, _("failed to set options pattern"));
-			break;
-		case 't':
-			types = optarg;
-			break;
-		case 'v':
-			mnt_context_enable_verbose(cxt, TRUE);
-			break;
-		case 'V':
-			print_version();
-			break;
-		default:
-			usage(stderr);
-			break;
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (all) {
-		if (!types)
-			types = "noproc,nodevfs,nodevpts,nosysfs,norpc_pipefs,nonfsd";
-
-		mnt_context_set_fstype_pattern(cxt, types);
-		rc = umount_all(cxt);
-
-	} else if (argc < 1) {
-		usage(stderr);
-
-	} else while (argc--) {
-		rc += umount_one(cxt, *argv++);
-	}
-
-	mnt_free_context(cxt);
-	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-