build-sys: remove obsolete wholedisk.c
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
83b69e409c
commit
62acb047a6
|
@ -53,7 +53,6 @@
|
||||||
#include "nls.h"
|
#include "nls.h"
|
||||||
#include "blkdev.h"
|
#include "blkdev.h"
|
||||||
#include "pathnames.h"
|
#include "pathnames.h"
|
||||||
#include "wholedisk.h"
|
|
||||||
#include "all-io.h"
|
#include "all-io.h"
|
||||||
#include "xalloc.h"
|
#include "xalloc.h"
|
||||||
#include "c.h"
|
#include "c.h"
|
||||||
|
|
|
@ -46,7 +46,6 @@ dist_noinst_HEADERS += \
|
||||||
include/timer.h \
|
include/timer.h \
|
||||||
include/timeutils.h \
|
include/timeutils.h \
|
||||||
include/ttyutils.h \
|
include/ttyutils.h \
|
||||||
include/wholedisk.h \
|
|
||||||
include/widechar.h \
|
include/widechar.h \
|
||||||
include/xalloc.h \
|
include/xalloc.h \
|
||||||
include/xgetpass.h \
|
include/xgetpass.h \
|
||||||
|
|
|
@ -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 */
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ libcommon_la_SOURCES = \
|
||||||
lib/setproctitle.c \
|
lib/setproctitle.c \
|
||||||
lib/strutils.c \
|
lib/strutils.c \
|
||||||
lib/sysfs.c \
|
lib/sysfs.c \
|
||||||
lib/wholedisk.c \
|
|
||||||
lib/timeutils.c \
|
lib/timeutils.c \
|
||||||
lib/ttyutils.c \
|
lib/ttyutils.c \
|
||||||
lib/xgetpass.c \
|
lib/xgetpass.c \
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue