build-sys: move partx to disk-utils/

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

9 files changed, 0 insertions, 1321 deletions

diff --git a/partx/.gitignore b/partx/.gitignore
deleted file mode 100644
index 9767d23d6..000000000
--- a/partx/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-addpart
-delpart
-partx
diff --git a/partx/Makefile.am b/partx/Makefile.am
deleted file mode 100644
index 1f418903b..000000000
--- a/partx/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-usrsbin_exec_PROGRAMS = addpart delpart
-dist_man_MANS = addpart.8 delpart.8
-
-usrsbin_exec_PROGRAMS += partx
-addpart_SOURCES = addpart.c $(top_srcdir)/lib/strutils.c
-delpart_SOURCES = delpart.c $(top_srcdir)/lib/strutils.c
-partx_SOURCES = \
-	partx.c \
-	partx.h \
-	$(top_srcdir)/lib/at.c \
-	$(top_srcdir)/lib/blkdev.c \
-	$(top_srcdir)/lib/canonicalize.c \
-	$(top_srcdir)/lib/linux_version.c \
-	$(top_srcdir)/lib/loopdev.c \
-	$(top_srcdir)/lib/mbsalign.c \
-	$(top_srcdir)/lib/strutils.c \
-	$(top_srcdir)/lib/sysfs.c \
-	$(top_srcdir)/lib/tt.c
-
-partx_CFLAGS = -I$(ul_libblkid_incdir)
-partx_LDADD = $(ul_libblkid_la)
-dist_man_MANS += partx.8
diff --git a/partx/addpart.8 b/partx/addpart.8
deleted file mode 100644
index 9dcd0a324..000000000
--- a/partx/addpart.8
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" addpart.8 --
-.\" Copyright 2007 Karel Zak <kzak@redhat.com>
-.\" Copyright 2007 Red Hat, Inc.
-.\" May be distributed under the GNU General Public License
-.TH ADDPART 8 "January 2007" "util-linux" "System Administration"
-.SH NAME
-addpart \-
-simple wrapper around the "add partition" ioctl
-.SH SYNOPSIS
-.B addpart
-.I device partition start length
-.SH DESCRIPTION
-.B addpart
-is a program that informs the Linux kernel of new partition.
-
-This command doesn't manipulate partitions on hard drive.
-
-.SH PARAMETERS
-.TP
-.I device
-Specify the disk device.
-.TP
-.I partition
-Specify the partition number.
-.TP
-.I start
-Specify the begin of the partition (in 512-byte sectors).
-.TP
-.I length
-Specify the length of the partition (in 512-byte sectors).
-
-.SH SEE ALSO
-.BR delpart (8),
-.BR fdisk (8),
-.BR parted (8),
-.BR partprobe (8),
-.BR partx (8)
-.SH AVAILABILITY
-The addpart command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/partx/addpart.c b/partx/addpart.c
deleted file mode 100644
index 0d814bf3e..000000000
--- a/partx/addpart.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include "c.h"
-#include "nls.h"
-#include "partx.h"
-#include "strutils.h"
-
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
-{
-	fputs(USAGE_HEADER, out);
-	fprintf(out, _(" %s <disk device> <partition number> <start> <length>\n"),
-		program_invocation_short_name);
-	fputs(USAGE_OPTIONS, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
-	fprintf(out, USAGE_MAN_TAIL("addpart(8)"));
-	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
-}
-
-int main(int argc, char **argv)
-{
-	int c, fd;
-
-	static const struct option longopts[] = {
-		{"help", no_argument, 0, 'h'},
-		{"version", no_argument, 0, 'V'},
-		{NULL, no_argument, 0, '0'},
-	};
-
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
-	while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
-		switch (c) {
-		case 'V':
-			printf(UTIL_LINUX_VERSION);
-			return EXIT_SUCCESS;
-		case 'h':
-			usage(stdout);
-		default:
-			usage(stderr);
-		}
-
-	if (argc != 5)
-		usage(stderr);
-
-	if ((fd = open(argv[1], O_RDONLY)) < 0)
-		err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
-
-	if (partx_add_partition(fd,
-			strtou32_or_err(argv[2], _("invalid partition number argument")),
-			strtou64_or_err(argv[3], _("invalid start argument")),
-			strtou64_or_err(argv[4], _("invalid length argument"))))
-		err(EXIT_FAILURE, _("failed to add partition"));
-
-	return EXIT_SUCCESS;
-}
diff --git a/partx/delpart.8 b/partx/delpart.8
deleted file mode 100644
index 433582f14..000000000
--- a/partx/delpart.8
+++ /dev/null
@@ -1,34 +0,0 @@
-.\" delpart.8 --
-.\" Copyright 2007 Karel Zak <kzak@redhat.com>
-.\" Copyright 2007 Red Hat, Inc.
-.\" May be distributed under the GNU General Public License
-.TH DELPART 8 "January 2007" "util-linux" "System Administration"
-.SH NAME
-delpart \-
-simple wrapper around the "del partition" ioctl
-.SH SYNOPSIS
-.B delpart
-.I device partition
-.SH DESCRIPTION
-.B delpart
-is a program that asks the Linux kernel to remove a partition.
-
-This command doesn't manipulate partitions on hard drive.
-
-.SH OPTIONS
-.TP
-.I device
-Specify the disk device.
-.TP
-.I partition
-Specify the partition number.
-
-.SH SEE ALSO
-.BR addpart (8),
-.BR fdisk (8),
-.BR parted (8),
-.BR partprobe (8),
-.BR partx (8)
-.SH AVAILABILITY
-The delpart command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/partx/delpart.c b/partx/delpart.c
deleted file mode 100644
index 79925db89..000000000
--- a/partx/delpart.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include "c.h"
-#include "nls.h"
-#include "partx.h"
-#include "strutils.h"
-
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
-{
-	fputs(USAGE_HEADER, out);
-	fprintf(out, _(" %s <disk device> <partition number>\n"),
-		program_invocation_short_name);
-	fputs(USAGE_OPTIONS, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
-	fprintf(out, USAGE_MAN_TAIL("delpart(8)"));
-	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
-}
-
-int main(int argc, char **argv)
-{
-	int c, fd;
-
-	static const struct option longopts[] = {
-		{"help", no_argument, 0, 'h'},
-		{"version", no_argument, 0, 'V'},
-		{NULL, no_argument, 0, '0'},
-	};
-
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
-	while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
-		switch (c) {
-		case 'V':
-			printf(UTIL_LINUX_VERSION);
-			return EXIT_SUCCESS;
-		case 'h':
-			usage(stdout);
-		default:
-			usage(stderr);
-		}
-
-	if (argc != 3)
-		usage(stderr);
-
-
-	if ((fd = open(argv[1], O_RDONLY)) < 0)
-		err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
-
-	if (partx_del_partition(fd,
-			strtou32_or_err(argv[2], _("invalid partition number argument"))))
-		err(EXIT_FAILURE, _("failed to remove partition"));
-
-	return EXIT_SUCCESS;
-}
diff --git a/partx/partx.8 b/partx/partx.8
deleted file mode 100644
index 86350c412..000000000
--- a/partx/partx.8
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" partx.8 --
-.\" Copyright 2007 Karel Zak <kzak@redhat.com>
-.\" Copyright 2007 Red Hat, Inc.
-.\" Copyright 2010 Davidlohr Bueso <dave@gnu.org>
-.\" May be distributed under the GNU General Public License
-.TH PARTX "8" "June 2012" "util-linux" "System Administration"
-.SH NAME
-partx \- tell the Linux kernel about the presence and numbering of
-on-disk partitions
-.SH SYNOPSIS
-partx [\-a|\-d|\-s] [\-t TYPE] [\-n M:N] [\-] disk
-.br
-partx [\-a|\-d|\-s] [\-t TYPE] partition [disk]
-.SH DESCRIPTION
-Given a device or disk-image,
-.B partx
-tries to parse the partition table and list its contents.  It
-optionally adds or removes partitions.
-.PP
-The
-.I disk
-argument is optional when a
-.I partition
-argument is provided.  To force scanning a partition as if it were a
-whole disk (for example to list nested subpartitions), use the argument
-"-".  For example:
-.RS 7
-.TP
-partx \-\-show \- /dev/sda3
-.RE
-.PP
-This will see sda3 as a whole-disk rather than a partition.
-.PP
-The
-.B partx is not an fdisk program
-\-\- adding and removing partitions does not change the disk, it just
-tells the kernel about the presence and numbering of on-disk
-partitions.
-.SH OPTIONS
-.IP "\fB\-a\fR, \fB\-\-add\fP"
-Add the specified partitions, or read the disk and add all partitions.
-.IP "\fB\-b\fR, \fB\-\-bytes\fP"
-Print the SIZE column in bytes rather than in human-readable format.
-.IP "\fB\-d\fR, \fB\-\-delete\fP"
-Delete the specified partitions or all partitions.
-.IP "\fB\-g\fR, \fB\-\-noheadings\fP"
-Do not print a header line.
-.IP "\fB\-h\fR, \fB\-\-help\fP"
-Print a help text and exit.
-.IP "\fB\-l\fR, \fB\-\-list\fP"
-List the partitions.  Note that all numbers are in 512-byte sectors.
-This output format is DEPRECATED in favour of
-.BR \-\-show .
-Do not use it in newly written scripts.
-.IP "\fB\-o\fR, \fB\-\-output \fIlist\fP"
-Define the output columns to use for
-.B \-\-show
-and
-.B \-\-raw
-output.  If no output arrangement is specified, then a default set is
-used.  Use
-.B \-\-help
-to get
-.I list
-of all supported columns.  This option cannot be combined with
-.BR \-\-add ,
-.B \-\-delete
-or
-.B \-\-list
-options.
-.IP "\fB\-P\fR, \fB\-\-pairs\fP"
-Output using key="value" format.
-.IP "\fB\-n\fR, \fB\-\-nr \fIM:N\fP"
-Specify the range of partitions.  For backward compatibility also the
-format
-.I M-N
-is supported.  The range may contain negative numbers, for example
-.BI \-\-nr \ :\-1
-means the last partition, and
-.BI \-\-nr \ \-2:\-1
-means the last two partitions.  Supported range specifications are:
-.RS 14
-.TP
-.I M
-Specifies just one partition (e.g. \fB\-\-nr\fR
-.IR 3 ).
-.TP
-.I M:
-Specifies lower limit only (e.g. \fB\-\-nr\fR
-.IR 2: ).
-.TP
-.I :N
-Specifies upper limit only (e.g. \fB\-\-nr\fR
-.IR :4 ).
-.TP
-.IR M:N \ or
-.TQ
-.I M-N
-Specifies lower and upper limits (e.g. \fB--nr\fR
-.IR 2:4 ).
-.RE
-.IP "\fB\-r\fR, \fB\-\-raw\fP"
-Use the raw output format.
-.IP "\fB\-s\fR, \fB\-\-show\fP"
-List the partitions.  All numbers (except SIZE) are in 512-byte
-sectors.  The output columns can be rearranged with the
-.B \-\-output
-option.
-.IP "\fB\-t\fR, \fB\-\-type \fItype\fP"
-Specify the partition table type
-.IR aix ,
-.IR bsd ,
-.IR dos ,
-.IR gpt ,
-.IR mac ,
-.IR minix ,
-.IR sgi ,
-.IR solaris_x86 ,
-.IR sun ,
-.I ultrix
-or
-.IR unixware .
-.IP "\fB\-v\fR, \fB\-\-verbose\fP"
-Verbose mode.
-.SH EXAMPLES
-.TP
-partx \-\-show /dev/sdb3
-.TQ
-partx \-\-show --nr 3 /dev/sdb
-.TQ
-partx \-\-show /dev/sdb3 /dev/sdb
-All three commands list partition 3 of /dev/sdb.
-.TP
-partx \-\-show \- /dev/sdb3
-Lists all subpartitions on /dev/sdb3 (the device is used as
-whole-disk).
-.TP
-partx \-o START -g --nr 5 /dev/sdb
-Prints the start sector of partition 5 on /dev/sdb without header.
-.TP
-partx \-o SECTORS,SIZE /dev/sda5 /dev/sda
-Lists the length in sectors and human-readable size of partition 5 on
-/dev/sda.
-.TP
-partx \-\-add --nr 3:5 /dev/sdd
-Adds all available partitions from 3 to 5 (inclusive) on /dev/sdd.
-.TP
-partx \-d --nr :-1 /dev/sdd
-Removes the last partition on /dev/sdd.
-.SH SEE ALSO
-.BR addpart (8),
-.BR delpart (8),
-.BR fdisk (8),
-.BR parted (8),
-.BR partprobe (8)
-.SH AUTHORS
-.MT dave@gnu.org
-Davidlohr Bueso
-.ME
-.br
-.MT kzak@redhat.com
-Karel Zak
-.ME
-.PP
-The original version was written by
-.MT aeb@cwi.nl
-Andries E. Brouwer
-.ME .
-.SH AVAILABILITY
-The partx command is part of the util-linux package and is available from
-.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
-Linux Kernel Archive
-.UE .
diff --git a/partx/partx.c b/partx/partx.c
deleted file mode 100644
index 0c3f8f980..000000000
--- a/partx/partx.c
+++ /dev/null
@@ -1,882 +0,0 @@
-/*
- * partx: tell the kernel about your disk's partitions
- * [This is not an fdisk - adding and removing partitions
- * is not a change of the disk, but just telling the kernel
- * about presence and numbering of on-disk partitions.]
- *
- * aeb, 2000-03-21 -- sah is 42 now
- *
- * Copyright (C) 2010 Davidlohr Bueso <dave@gnu.org>
- *      Rewritten to use libblkid for util-linux
- *      based on ideas from Karel Zak <kzak@redhat.com>
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <assert.h>
-#include <dirent.h>
-
-#include <blkid.h>
-
-#include "c.h"
-#include "pathnames.h"
-#include "nls.h"
-#include "tt.h"
-#include "blkdev.h"
-#include "strutils.h"
-#include "xalloc.h"
-#include "partx.h"
-#include "sysfs.h"
-#include "loopdev.h"
-#include "at.h"
-#include "closestream.h"
-#include "optutils.h"
-
-/* this is the default upper limit, could be modified by --nr */
-#define SLICES_MAX	256
-
-/* all the columns (-o option) */
-enum {
-	COL_PARTNO,
-	COL_START,
-	COL_END,
-	COL_SECTORS,
-	COL_SIZE,
-	COL_NAME,
-	COL_UUID,
-	COL_TYPE,
-	COL_FLAGS,
-	COL_SCHEME,
-};
-
-#define ACT_ERROR "--{add,delete,show,list,raw,pairs}"
-enum {
-	ACT_NONE,
-	ACT_LIST,
-	ACT_SHOW,
-	ACT_ADD,
-	ACT_DELETE
-};
-
-enum {
-	FL_BYTES = (1 << 1)
-};
-
-/* column names */
-struct colinfo {
-	const char	*name;	/* header */
-	double		whint;	/* width hint (N < 1 is in percent of termwidth) */
-	int		flags;	/* TT_FL_* */
-	const char      *help;
-};
-
-/* columns descriptions */
-struct colinfo infos[] = {
-	[COL_PARTNO]   = { "NR",    0.25, TT_FL_RIGHT, N_("partition number") },
-	[COL_START]    = { "START",   0.30, TT_FL_RIGHT, N_("start of the partition in sectors") },
-	[COL_END]      = { "END",     0.30, TT_FL_RIGHT, N_("end of the partition in sectors") },
-	[COL_SECTORS]  = { "SECTORS", 0.30, TT_FL_RIGHT, N_("number of sectors") },
-	[COL_SIZE]     = { "SIZE",    0.30, TT_FL_RIGHT, N_("human readable size") },
-	[COL_NAME]     = { "NAME",    0.30, TT_FL_TRUNC, N_("partition name") },
-	[COL_UUID]     = { "UUID",    36, 0, N_("partition UUID")},
-	[COL_SCHEME]   = { "SCHEME",  0.1, TT_FL_TRUNC, N_("partition table type (dos, gpt, ...)")},
-	[COL_FLAGS]    = { "FLAGS",   0.1, TT_FL_TRUNC, N_("partition flags")},
-	[COL_TYPE]     = { "TYPE",    1, TT_FL_RIGHT, N_("partition type hex or uuid")},
-};
-
-#define NCOLS ARRAY_SIZE(infos)
-
-/* array with IDs of enabled columns */
-static int columns[NCOLS], ncolumns;
-
-static int verbose;
-static int partx_flags;
-static struct loopdev_cxt lc;
-static int loopdev;
-
-static void assoc_loopdev(const char *fname)
-{
-	int rc;
-
-	if (loopcxt_init(&lc, 0))
-		err(EXIT_FAILURE, _("failed to initialize loopcxt"));
-
-	rc = loopcxt_find_unused(&lc);
-	if (rc)
-		err(EXIT_FAILURE, _("%s: failed to find unused loop device"),
-		    fname);
-
-	if (verbose)
-		printf(_("Trying to use '%s' for the loop device\n"),
-		       loopcxt_get_device(&lc));
-
-	if (loopcxt_set_backing_file(&lc, fname))
-		err(EXIT_FAILURE, _("%s: failed to set backing file"), fname);
-
-	rc = loopcxt_setup_device(&lc);
-
-	if (rc == -EBUSY)
-		err(EXIT_FAILURE, _("%s: failed to setup loop device"), fname);
-
-	loopdev = 1;
-}
-
-static inline int get_column_id(int num)
-{
-	assert(ARRAY_SIZE(columns) == NCOLS);
-	assert(num < ncolumns);
-	assert(columns[num] < (int) NCOLS);
-	return columns[num];
-}
-
-static inline struct colinfo *get_column_info(int num)
-{
-	return &infos[ get_column_id(num) ];
-}
-
-static int column_name_to_id(const char *name, size_t namesz)
-{
-	size_t i;
-
-	assert(name);
-
-	for (i = 0; i < NCOLS; i++) {
-		const char *cn = infos[i].name;
-
-		if (!strncasecmp(name, cn, namesz) && !*(cn + namesz))
-			return i;
-	}
-	warnx(_("unknown column: %s"), name);
-	return -1;
-}
-
-/*
- * Given a partition return the corresponding partition number.
- *
- * Note that this function tries to use sysfs, otherwise it assumes that the
- * last characters are always numeric (sda1, sdc20, etc).
- */
-static int get_partno_from_device(char *partition, dev_t devno)
-{
-	int partno = 0;
-	size_t sz;
-	char *p, *end = NULL;
-
-	assert(partition);
-
-	if (devno) {
-		struct sysfs_cxt cxt;
-		int rc;
-
-		if (sysfs_init(&cxt, devno, NULL))
-			goto err;
-
-		rc = sysfs_read_int(&cxt, "partition", &partno);
-		sysfs_deinit(&cxt);
-
-		if (rc == 0)
-			return partno;
-	}
-
-	sz = strlen(partition);
-	p = partition + sz - 1;
-
-	if (!isdigit((unsigned int) *p))
-		goto err;
-
-	while (isdigit((unsigned int) *(p - 1))) p--;
-
-	errno = 0;
-	partno = strtol(p, &end, 10);
-	if (errno || !end || *end || p == end)
-		goto err;
-
-	return partno;
-err:
-	errx(EXIT_FAILURE, _("%s: failed to get partition number"), partition);
-}
-
-static int get_max_partno(const char *disk, dev_t devno)
-{
-	char path[PATH_MAX], *parent, *dirname = NULL;
-	struct stat st;
-	DIR *dir;
-	struct dirent *d;
-	int partno = 0;
-
-	if (!devno && !stat(disk, &st))
-		devno = st.st_rdev;
-	if (!devno)
-		goto dflt;
-	parent = strrchr(disk, '/');
-	if (!parent)
-		goto dflt;
-	parent++;
-
-	snprintf(path, sizeof(path), _PATH_SYS_DEVBLOCK "/%d:%d/",
-			major(devno), minor(devno));
-
-	dir = opendir(path);
-	if (!dir)
-		goto dflt;
-
-	dirname = xstrdup(path);
-
-	while ((d = readdir(dir))) {
-		int fd;
-
-		if (!strcmp(d->d_name, ".") ||
-		    !strcmp(d->d_name, ".."))
-			continue;
-#ifdef _DIRENT_HAVE_D_TYPE
-		if (d->d_type != DT_DIR)
-			continue;
-#endif
-		if (strncmp(parent, d->d_name, strlen(parent)))
-			continue;
-		snprintf(path, sizeof(path), "%s/partition", d->d_name);
-
-		fd = open_at(dirfd(dir), dirname, path, O_RDONLY);
-		if (fd) {
-			int x = 0;
-			FILE *f = fdopen(fd, "r");
-			if (f) {
-				if (fscanf(f, "%d", &x) == 1 && x > partno)
-					partno = x;
-				fclose(f);
-			}
-		}
-	}
-
-	free(dirname);
-	closedir(dir);
-	return partno;
-dflt:
-	return SLICES_MAX;
-}
-
-static void del_parts_warnx(const char *device, int first, int last)
-{
-	if (first == last)
-		warnx(_("%s: error deleting partition %d"), device, first);
-	else
-		warnx(_("%s: error deleting partitions %d-%d"),
-				device, first, last);
-}
-
-static int del_parts(int fd, const char *device, dev_t devno,
-		     int lower, int upper)
-{
-	int rc = 0, i, errfirst = 0, errlast = 0;
-
-	assert(fd >= 0);
-	assert(device);
-
-	if (!lower)
-		lower = 1;
-	if (!upper || lower < 0 || upper < 0) {
-		int n = get_max_partno(device, devno);
-		if (!upper)
-			upper = n;
-		else if (upper < 0)
-			upper = n + upper + 1;
-		if (lower < 0)
-			lower = n + lower + 1;
-	}
-	if (lower > upper) {
-		warnx(_("specified range <%d:%d> "
-			"does not make sense"), lower, upper);
-		return -1;
-	}
-
-	for (i = lower; i <= upper; i++) {
-		rc = partx_del_partition(fd, i);
-		if (rc == 0) {
-			if (verbose)
-				printf(_("%s: partition #%d removed\n"), device, i);
-			continue;
-		} else if (errno == ENXIO) {
-			if (verbose)
-				printf(_("%s: partition #%d already doesn't exist\n"), device, i);
-			continue;
-		}
-		rc = -1;
-		if (verbose)
-			warn(_("%s: deleting partition #%d failed"), device, i);
-		if (!errfirst)
-			errlast = errfirst = i;
-		else if (errlast + 1 == i)
-			errlast++;
-		else {
-			del_parts_warnx(device, errfirst, errlast);
-			errlast = errfirst = i;
-		}
-	}
-
-	if (errfirst)
-		del_parts_warnx(device, errfirst, errlast);
-	return rc;
-}
-
-
-static void add_parts_warnx(const char *device, int first, int last)
-{
-	if (first == last)
-		warnx(_("%s: error adding partition %d"), device, first);
-	else
-		warnx(_("%s: error adding partitions %d-%d"),
-				device, first, last);
-}
-
-static int add_parts(int fd, const char *device,
-		     blkid_partlist ls, int lower, int upper)
-{
-	int i, nparts, rc = 0, errfirst = 0, errlast = 0;
-
-	assert(fd >= 0);
-	assert(device);
-	assert(ls);
-
-	nparts = blkid_partlist_numof_partitions(ls);
-
-	for (i = 0; i < nparts; i++) {
-		blkid_partition par = blkid_partlist_get_partition(ls, i);
-		int n = blkid_partition_get_partno(par);
-		uintmax_t start, size;
-
-		if (lower && n < lower)
-			continue;
-		if (upper && n > upper)
-			continue;
-
-		start = blkid_partition_get_start(par);
-		size =  blkid_partition_get_size(par);
-
-		if (blkid_partition_is_extended(par))
-			/*
-			 * Let's follow the Linux kernel and reduce
-			 * DOS extended partition to 1 or 2 sectors.
-			 */
-			size = min(size, (uintmax_t) 2);
-
-		if (partx_add_partition(fd, n, start, size) == 0) {
-			if (verbose)
-				printf(_("%s: partition #%d added\n"), device, n);
-			continue;
-		}
-		rc = -1;
-		if (verbose)
-			warn(_("%s: adding partition #%d failed"), device, n);
-		if (!errfirst)
-			errlast = errfirst = n;
-		else if (errlast + 1 == n)
-			errlast++;
-		else {
-			add_parts_warnx(device, errfirst, errlast);
-			errlast = errfirst = n;
-		}
-	}
-
-	if (errfirst)
-		add_parts_warnx(device, errfirst, errlast);
-
-	/*
-	 * The kernel with enabled partitions scanner for loop devices add *all*
-	 * partitions, so we should delete any extra, unwanted ones, when the -n
-	 * option is passed.
-	 */
-	if (loopdev && loopcxt_is_partscan(&lc) && (lower || upper)) {
-		for (i = 0; i < nparts; i++) {
-			blkid_partition par = blkid_partlist_get_partition(ls, i);
-			int n = blkid_partition_get_partno(par);
-
-			if (n < lower || n > upper)
-				partx_del_partition(fd, n);
-		}
-	}
-
-	return rc;
-}
-
-static int list_parts(blkid_partlist ls, int lower, int upper)
-{
-	int i, nparts;
-
-	assert(ls);
-
-	nparts = blkid_partlist_numof_partitions(ls);
-
-	for (i = 0; i < nparts; i++) {
-		blkid_partition par = blkid_partlist_get_partition(ls, i);
-		int n = blkid_partition_get_partno(par);
-		uintmax_t start, size;
-
-		if (lower && n < lower)
-			continue;
-		if (upper && n > upper)
-			continue;
-
-		start = blkid_partition_get_start(par);
-		size =  blkid_partition_get_size(par);
-
-		printf(_("#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"),
-		       n, start, start + size -1,
-		       size, (size << 9) / 1000000);
-	}
-	return 0;
-}
-
-static void add_tt_line(struct tt *tt, blkid_partition par)
-{
-	struct tt_line *line;
-	int i;
-
-	assert(tt);
-	assert(par);
-
-	line = tt_add_line(tt, NULL);
-	if (!line) {
-		warn(_("failed to add line to output"));
-		return;
-	}
-
-	for (i = 0; i < ncolumns; i++) {
-		char *str = NULL;
-		int rc = 0;
-
-		switch (get_column_id(i)) {
-		case COL_PARTNO:
-			rc = xasprintf(&str, "%d",
-					blkid_partition_get_partno(par));
-			break;
-		case COL_START:
-			rc = xasprintf(&str, "%ju",
-					blkid_partition_get_start(par));
-			break;
-		case COL_END:
-			rc = xasprintf(&str, "%ju",
-					blkid_partition_get_start(par) +
-					blkid_partition_get_size(par) - 1);
-			break;
-		case COL_SECTORS:
-			rc = xasprintf(&str, "%ju",
-					blkid_partition_get_size(par));
-			break;
-		case COL_SIZE:
-			if (partx_flags & FL_BYTES)
-				rc = xasprintf(&str, "%ju", (uintmax_t)
-					blkid_partition_get_size(par) << 9);
-			else
-				str = size_to_human_string(SIZE_SUFFIX_1LETTER,
-					blkid_partition_get_size(par) << 9);
-			break;
-		case COL_NAME:
-			str = (char *) blkid_partition_get_name(par);
-			if (str)
-				str = xstrdup(str);
-			break;
-		case COL_UUID:
-			str = (char *) blkid_partition_get_uuid(par);
-			if (str)
-				str = xstrdup(str);
-			break;
-		case COL_TYPE:
-			str = (char *) blkid_partition_get_type_string(par);
-			if (str)
-				str = xstrdup(str);
-			else
-				rc = xasprintf(&str, "0x%x",
-					blkid_partition_get_type(par));
-			break;
-		case COL_FLAGS:
-			rc = xasprintf(&str, "0x%llx", blkid_partition_get_flags(par));
-			break;
-		case COL_SCHEME:
-		{
-			blkid_parttable tab = blkid_partition_get_table(par);
-			if (tab) {
-				str = (char *) blkid_parttable_get_type(tab);
-				if (str)
-					str = xstrdup(str);
-			}
-			break;
-		}
-		default:
-			break;
-		}
-
-		if (rc || str)
-			tt_line_set_data(line, i, str);
-	}
-}
-
-static int show_parts(blkid_partlist ls, int tt_flags, int lower, int upper)
-{
-	int i, rc = -1;
-	struct tt *tt;
-	int nparts;
-
-	assert(ls);
-
-	nparts = blkid_partlist_numof_partitions(ls);
-	if (!nparts)
-		return 0;
-
-	tt = tt_new_table(tt_flags);
-	if (!tt) {
-		warn(_("failed to initialize output table"));
-		return -1;
-	}
-
-	for (i = 0; i < ncolumns; i++) {
-		struct colinfo *col = get_column_info(i);
-
-		if (!tt_define_column(tt, col->name, col->whint, col->flags)) {
-			warnx(_("failed to initialize output column"));
-			goto done;
-		}
-	}
-
-	for (i = 0; i < nparts; i++) {
-		blkid_partition par = blkid_partlist_get_partition(ls, i);
-		int n = blkid_partition_get_partno(par);
-
-		if (lower && n < lower)
-			continue;
-		if (upper && n > upper)
-			continue;
-
-		add_tt_line(tt, par);
-	}
-
-	rc = 0;
-	tt_print_table(tt);
-done:
-	tt_free_table(tt);
-	return rc;
-}
-
-static blkid_partlist get_partlist(blkid_probe pr,
-			const char *device, char *type)
-{
-	blkid_partlist ls;
-	blkid_parttable tab;
-
-	assert(pr);
-	assert(device);
-
-	if (type) {
-		char *name[] = { type, NULL };
-
-		if (blkid_probe_filter_partitions_type(pr,
-				BLKID_FLTR_ONLYIN, name)) {
-			warnx(_("failed to initialize blkid "
-				"filter for '%s'"), type);
-			return NULL;
-		}
-	}
-
-	ls = blkid_probe_get_partitions(pr);
-	if (!ls) {
-		warnx(_("%s: failed to read partition table"), device);
-		return NULL;
-	}
-
-	tab = blkid_partlist_get_table(ls);
-	if (verbose && tab) {
-		printf(_("%s: partition table type '%s' detected\n"),
-			       device, blkid_parttable_get_type(tab));
-
-		if (!blkid_partlist_numof_partitions(ls))
-			printf(_("%s: partition table with no partitions"), device);
-	}
-
-	return ls;
-}
-
-static void __attribute__((__noreturn__)) usage(FILE *out)
-{
-	size_t i;
-
-	fputs(USAGE_HEADER, out);
-	fprintf(out,
-	      _(" %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"),
-		program_invocation_short_name);
-
-	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --add            add specified partitions or all of them\n"
-		" -d, --delete         delete specified partitions or all of them\n"
-		" -l, --list           list partitions (DEPRECATED)\n"
-		" -s, --show           list partitions\n\n"
-
-		" -b, --bytes          print SIZE in bytes rather than in human readable format\n"
-		" -g, --noheadings     don't print headings for --show\n"
-		" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
-		" -o, --output <type>  define which output columns to use\n"
-		" -P, --pairs          use key=\"value\" output format\n"
-		" -r, --raw            use raw output format\n"
-		" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
-		" -v, --verbose        verbose mode\n"), out);
-
-	fputs(USAGE_SEPARATOR, out);
-	fputs(USAGE_HELP, out);
-	fputs(USAGE_VERSION, out);
-
-	fputs(_("\nAvailable columns (for --show, --raw or --pairs):\n"), out);
-
-	for (i = 0; i < NCOLS; i++)
-		fprintf(out, " %10s  %s\n", infos[i].name, _(infos[i].help));
-
-	fprintf(out, USAGE_MAN_TAIL("partx(8)"));
-
-	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
-}
-
-int main(int argc, char **argv)
-{
-	int fd, c, what = ACT_NONE, lower = 0, upper = 0, rc = 0;
-	int tt_flags = 0;
-	char *type = NULL;
-	char *device = NULL; /* pointer to argv[], ie: /dev/sda1 */
-	char *wholedisk = NULL; /* allocated, ie: /dev/sda */
-	dev_t disk_devno = 0, part_devno = 0;
-
-	static const struct option long_opts[] = {
-		{ "bytes",	no_argument,       NULL, 'b' },
-		{ "noheadings",	no_argument,       NULL, 'g' },
-		{ "raw",	no_argument,       NULL, 'r' },
-		{ "list",	no_argument,	   NULL, 'l' },
-		{ "show",	no_argument,       NULL, 's' },
-		{ "add",	no_argument,       NULL, 'a' },
-		{ "delete",	no_argument,	   NULL, 'd' },
-		{ "type",	required_argument, NULL, 't' },
-		{ "nr",		required_argument, NULL, 'n' },
-		{ "output",	required_argument, NULL, 'o' },
-		{ "pairs",      no_argument,       NULL, 'P' },
-		{ "help",	no_argument,       NULL, 'h' },
-		{ "version",    no_argument,       NULL, 'V' },
-		{ "verbose",	no_argument,       NULL, 'v' },
-		{ NULL, 0, NULL, 0 }
-	};
-
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-	atexit(close_stdout);
-
-	while ((c = getopt_long(argc, argv,
-				"abdglrsvn:t:o:PhV", long_opts, NULL)) != -1) {
-		switch(c) {
-		case 'a':
-			exclusive_option(&what, ACT_ADD, ACT_ERROR);
-			break;
-		case 'b':
-			partx_flags |= FL_BYTES;
-			break;
-		case 'd':
-			exclusive_option(&what, ACT_DELETE, ACT_ERROR);
-			break;
-		case 'g':
-			tt_flags |= TT_FL_NOHEADINGS;
-			break;
-		case 'l':
-			exclusive_option(&what, ACT_LIST, ACT_ERROR);
-			break;
-		case 'n':
-			if (parse_range(optarg, &lower, &upper, 0))
-				errx(EXIT_FAILURE, _("failed to parse --nr <M-N> range"));
-			break;
-		case 'o':
-			ncolumns = string_to_idarray(optarg,
-						columns, ARRAY_SIZE(columns),
-						column_name_to_id);
-			if (ncolumns < 0)
-				return EXIT_FAILURE;
-			exclusive_option(&what, ACT_SHOW, ACT_ERROR);
-			break;
-		case 'P':
-			tt_flags |= TT_FL_EXPORT;
-			exclusive_option(&what, ACT_SHOW, ACT_ERROR);
-			break;
-		case 'r':
-			tt_flags |= TT_FL_RAW;
-			exclusive_option(&what, ACT_SHOW, ACT_ERROR);
-			break;
-		case 's':
-			exclusive_option(&what, ACT_SHOW, ACT_ERROR);
-			break;
-		case 't':
-			type = optarg;
-			break;
-		case 'v':
-			verbose = 1;
-			break;
-		case 'h':
-			usage(stdout);
-		case 'V':
-			printf(UTIL_LINUX_VERSION);
-			return EXIT_SUCCESS;
-		case '?':
-		default:
-			usage(stderr);
-		}
-	}
-
-	if (what == ACT_NONE)
-		what = ACT_SHOW;
-
-	/* --show default, could by modified by -o  */
-	if (what == ACT_SHOW && !ncolumns) {
-		columns[ncolumns++] = COL_PARTNO;
-		columns[ncolumns++] = COL_START;
-		columns[ncolumns++] = COL_END;
-		columns[ncolumns++] = COL_SECTORS;
-		columns[ncolumns++] = COL_SIZE;
-		columns[ncolumns++] = COL_NAME;
-		columns[ncolumns++] = COL_UUID;
-	}
-
-	/*
-	 * Note that 'partx /dev/sda1' == 'partx /dev/sda1 /dev/sda'
-	 * so assume that the device and/or disk are always the last
-	 * arguments to be passed to partx.
-	 */
-	if (optind == argc - 2) {
-		/* passed 2 arguments:
-		 *   /dev/sda1 /dev/sda  : partition + whole-disk
-		 *   -- /dev/sda1	 : partition that should be used as a whole-disk
-		 */
-		device = argv[optind];
-
-		if (strcmp(device, "-") == 0) {
-			device = NULL;
-			wholedisk = xstrdup(argv[optind + 1]);
-		} else {
-			device = argv[optind];
-			wholedisk = xstrdup(argv[optind + 1]);
-		}
-	} else if (optind == argc - 1) {
-		/* passed only one arg (ie: /dev/sda3 or /dev/sda) */
-		struct stat sb;
-
-		device = argv[optind];
-
-		if (stat(device, &sb))
-			err(EXIT_FAILURE, _("%s: stat failed"), device);
-
-		part_devno = sb.st_rdev;
-
-		if (blkid_devno_to_wholedisk(part_devno,
-					     NULL, 0, &disk_devno) == 0 &&
-		    part_devno != disk_devno)
-			wholedisk = blkid_devno_to_devname(disk_devno);
-
-		if (!wholedisk) {
-			wholedisk = xstrdup(device);
-			disk_devno = part_devno;
-			device = NULL;
-			part_devno = 0;
-		}
-	} else
-		usage(stderr);
-
-	if (device && (upper || lower))
-		errx(EXIT_FAILURE, _("--nr and <partition> are mutually exclusive"));
-
-	assert(wholedisk);
-
-	if (device) {
-		/* use partno from given partition instead of --nr range, e.g:
-		 *   partx -d /dev/sda3
-		 * is the same like:
-		 *   partx -d --nr 3 /dev/sda
-		 */
-		struct stat sb;
-
-		if (!part_devno && !stat(device, &sb))
-			part_devno = sb.st_rdev;
-
-		lower = upper = get_partno_from_device(device, part_devno);
-	}
-
-	if (verbose)
-		printf(_("partition: %s, disk: %s, lower: %d, upper: %d\n"),
-		       device ? device : "none", wholedisk, lower, upper);
-
-	if (what == ACT_ADD || what == ACT_DELETE) {
-		struct stat x;
-
-		if (stat(wholedisk, &x))
-			errx(EXIT_FAILURE, "%s", wholedisk);
-
-		if  (S_ISREG(x.st_mode)) {
-			/* not a blkdev, try to associate it to a loop device */
-			if (what == ACT_DELETE)
-				errx(EXIT_FAILURE, _("%s: cannot delete partitions"),
-				     wholedisk);
-			if (!loopmod_supports_partscan())
-				errx(EXIT_FAILURE, _("%s: partitioned loop devices unsupported"),
-				     wholedisk);
-			assoc_loopdev(wholedisk);
-			wholedisk = xstrdup(lc.device);
-		} else if (!S_ISBLK(x.st_mode))
-			errx(EXIT_FAILURE, _("%s: not a block device"), wholedisk);
-	}
-	if ((fd = open(wholedisk, O_RDONLY)) == -1)
-		err(EXIT_FAILURE, _("%s: open failed"), wholedisk);
-
-	if (what == ACT_DELETE)
-		rc = del_parts(fd, wholedisk, disk_devno, lower, upper);
-	else {
-		blkid_probe pr = blkid_new_probe();
-		blkid_partlist ls = NULL;
-
-		if (!pr || blkid_probe_set_device(pr, fd, 0, 0))
-			warnx(_("%s: failed to initialize blkid prober"),
-					wholedisk);
-		else
-			ls = get_partlist(pr, wholedisk, type);
-
-		if (ls) {
-			int n = blkid_partlist_numof_partitions(ls);
-
-			if (lower < 0)
-				lower = n + lower + 1;
-			if (upper < 0)
-				upper = n + upper + 1;
-			if (lower > upper) {
-				warnx(_("specified range <%d:%d> "
-					"does not make sense"), lower, upper);
-				rc = -1, what = ACT_NONE;
-			}
-
-			switch (what) {
-			case ACT_SHOW:
-				rc = show_parts(ls, tt_flags, lower, upper);
-				break;
-			case ACT_LIST:
-				rc = list_parts(ls, lower, upper);
-				break;
-			case ACT_ADD:
-				rc = add_parts(fd, wholedisk, ls, lower, upper);
-				break;
-			case ACT_NONE:
-				break;
-			default:
-				abort();
-			}
-		}
-		blkid_free_probe(pr);
-	}
-
-	if (loopdev)
-		loopcxt_deinit(&lc);
-
-	close(fd);
-	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
diff --git a/partx/partx.h b/partx/partx.h
deleted file mode 100644
index ed0fd0aa4..000000000
--- a/partx/partx.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef UTIL_LINUX_PARTX_H
-#define UTIL_LINUX_PARTX_H
-
-#include <sys/ioctl.h>
-#include <linux/blkpg.h>
-
-static inline int partx_del_partition(int fd, unsigned int partno)
-{
-	struct blkpg_ioctl_arg a;
-	struct blkpg_partition p;
-
-	p.pno = partno;
-	p.start = 0;
-	p.length = 0;
-	p.devname[0] = 0;
-	p.volname[0] = 0;
-	a.op = BLKPG_DEL_PARTITION;
-	a.flags = 0;
-	a.datalen = sizeof(p);
-	a.data = &p;
-
-	return ioctl(fd, BLKPG, &a);
-}
-
-static inline int partx_add_partition(int fd, int partno,
-			uint64_t start, uint64_t size)
-{
-	struct blkpg_ioctl_arg a;
-	struct blkpg_partition p;
-
-	p.pno = partno;
-	p.start = start << 9;
-	p.length = size << 9;
-	p.devname[0] = 0;
-	p.volname[0] = 0;
-	a.op = BLKPG_ADD_PARTITION;
-	a.flags = 0;
-	a.datalen = sizeof(p);
-	a.data = &p;
-
-	return ioctl(fd, BLKPG, &a);
-}
-
-#endif /*  UTIL_LINUX_PARTX_H */