From 62acb047a625059e77dc429ea83ef96786d3b228 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Jun 2014 12:16:29 +0200
Subject: [PATCH] build-sys: remove obsolete wholedisk.c

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 disk-utils/mkswap.c   |  1 -
 include/Makemodule.am |  1 -
 include/wholedisk.h   |  8 ------
 lib/Makemodule.am     |  1 -
 lib/wholedisk.c       | 62 -------------------------------------------
 5 files changed, 73 deletions(-)
 delete mode 100644 include/wholedisk.h
 delete mode 100644 lib/wholedisk.c

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 06ec15aee..5eb4e6a51 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -53,7 +53,6 @@
 #include "nls.h"
 #include "blkdev.h"
 #include "pathnames.h"
-#include "wholedisk.h"
 #include "all-io.h"
 #include "xalloc.h"
 #include "c.h"
diff --git a/include/Makemodule.am b/include/Makemodule.am
index 08479fa0f..993738d7a 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -46,7 +46,6 @@ dist_noinst_HEADERS += \
 	include/timer.h \
 	include/timeutils.h \
 	include/ttyutils.h \
-	include/wholedisk.h \
 	include/widechar.h \
 	include/xalloc.h \
 	include/xgetpass.h \
diff --git a/include/wholedisk.h b/include/wholedisk.h
deleted file mode 100644
index 251479e76..000000000
--- a/include/wholedisk.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef WHOLEDISK_H
-#define WHOLEDISK_H
-
-extern int is_whole_disk(const char *name);
-extern int is_whole_disk_fd(int fd, const char *name);
-
-#endif /* WHOLEDISK_H */
-
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index a16509670..a31aef471 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -22,7 +22,6 @@ libcommon_la_SOURCES = \
 	lib/setproctitle.c \
 	lib/strutils.c \
 	lib/sysfs.c \
-	lib/wholedisk.c \
 	lib/timeutils.c \
 	lib/ttyutils.c \
 	lib/xgetpass.c \
diff --git a/lib/wholedisk.c b/lib/wholedisk.c
deleted file mode 100644
index 5161a1e98..000000000
--- a/lib/wholedisk.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * No copyright is claimed.  This code is in the public domain; do with
- * it what you wish.
- *
- * Written by Karel Zak <kzak@redhat.com>
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "blkdev.h"
-#include "wholedisk.h"
-
-int is_whole_disk_fd(int fd, const char *name)
-{
-#ifdef HDIO_GETGEO
-	if (fd != -1) {
-		struct hd_geometry geometry;
-		int i = ioctl(fd, HDIO_GETGEO, &geometry);
-		if (i == 0)
-			return geometry.start == 0;
-	}
-#endif
-	/*
-	 * The "silly heuristic" is still sexy for us, because
-	 * for example Xen doesn't implement HDIO_GETGEO for virtual
-	 * block devices (/dev/xvda).
-	 *
-	 * -- kzak@redhat.com (23-Feb-2006)
-	 */
-	while (*name)
-		name++;
-	return !isdigit(name[-1]);
-}
-
-int is_whole_disk(const char *name)
-{
-	int fd = -1, res = 0;
-#ifdef HDIO_GETGEO
-	fd = open(name, O_RDONLY|O_CLOEXEC);
-	if (fd != -1)
-#endif
-		res = is_whole_disk_fd(fd, name);
-
-	if (fd != -1)
-		close(fd);
-	return res;
-}
-
-#ifdef TEST_PROGRAM
-int main(int argc, char **argv)
-{
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <device>\n", argv[0]);
-		exit(EXIT_FAILURE);
-	}
-
-	printf("%s: is%s whole disk\n", argv[1],
-			is_whole_disk(argv[1]) ? "" : " NOT");
-	exit(EXIT_SUCCESS);
-}
-#endif