Imported from util-linux-2.10m tarball.

2 files changed, 11 insertions, 4 deletions

diff --git a/rescuept/README b/rescuept/README
index 50114d13..f7ce866d 100644
--- a/rescuept/README
+++ b/rescuept/README
@@ -9,7 +9,7 @@ It is in the non-installed part of the e2progs distribution.
 (ii) rescuept is a utility that recognizes ext2 superblocks,
 FAT partitions, swap partitions, and extended partition tables;
 it may also recognize BSD disklabels and Unixware 7 partitions.
-It prints out information that can be used with fdisk or sfdisk
+It prints out information that is suitable as input to sfdisk
 to reconstruct the partition table.
 It is in the non-installed part of the util-linux distribution.
 
diff --git a/rescuept/rescuept.c b/rescuept/rescuept.c
index 8be53538..80c0a469 100644
--- a/rescuept/rescuept.c
+++ b/rescuept/rescuept.c
@@ -24,10 +24,12 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include <linux/fs.h>           /* for BLKGETSIZE */
-
+#ifndef BLKGETSIZE
+#define BLKGETSIZE _IO(0x12,96)
+#endif
 
 char *progname;
 char *device;
@@ -497,9 +499,14 @@ main(int argc, char **argv){
 	}
 
 	if (ioctl(fd, BLKGETSIZE, &size)) {
+		struct stat s;
 		perror("BLKGETSIZE");
 		fprintf(stderr, "%s: could not get device size\n", progname);
-		exit(1);
+		if (stat(device, &s)) {
+			fprintf(stderr, "and also stat fails. Aborting.\n");
+			exit(1);
+		}
+		size = s.st_size / 512;
 	}
 
 	pagesize = getpagesize();