libblkid: Fix bug which could cuase bid_type to be corrupted

[tools/e2fsprogs.git] / lib / blkid / getsize.c

diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index d45e1c2..9e90857 100644 (file)
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -31,7 +31,6 @@
 #endif
 #ifdef HAVE_SYS_DISKLABEL_H
 #include <sys/disklabel.h>
-#include <sys/stat.h>
 #endif
 #ifdef HAVE_SYS_DISK_H
 #ifdef HAVE_SYS_QUEUE_H
@@ -42,6 +41,10 @@
 #ifdef __linux__
 #include <sys/utsname.h>
 #endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
 
 #if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
 #define BLKGETSIZE _IO(0x12,96)        /* return device size */
@@ -67,7 +70,7 @@ static int valid_offset(int fd, blkid_loff_t offset)
 }
 
 /*
- * Returns the number of blocks in a partition
+ * Returns the number of bytes in a partition
  */
 blkid_loff_t blkid_get_dev_size(int fd)
 {
@@ -119,26 +122,46 @@ blkid_loff_t blkid_get_dev_size(int fd)
                return (blkid_loff_t)size << 9;
 #endif
 
+/* tested on FreeBSD 6.1-RELEASE i386 */
+#ifdef DIOCGMEDIASIZE
+       if (ioctl(fd, DIOCGMEDIASIZE, &size64) >= 0)
+               return (off_t)size64;
+#endif /* DIOCGMEDIASIZE */
+
 #ifdef FDGETPRM
        if (ioctl(fd, FDGETPRM, &this_floppy) >= 0)
                return (blkid_loff_t)this_floppy.size << 9;
 #endif
 #ifdef HAVE_SYS_DISKLABEL_H
-#if 0
        /*
-        * This should work in theory but I haven't tested it.  Anyone
-        * on a BSD system want to test this for me?  In the meantime,
-        * binary search mechanism should work just fine.
+        * This code works for FreeBSD 4.11 i386, except for the full device
+        * (such as /dev/ad0). It doesn't work properly for newer FreeBSD
+        * though. FreeBSD >= 5.0 should be covered by the DIOCGMEDIASIZE
+        * above however.
+        *
+        * Note that FreeBSD >= 4.0 has disk devices as unbuffered (raw,
+        * character) devices, so we need to check for S_ISCHR, too.
         */
-       if ((fstat(fd, &st) >= 0) && S_ISBLK(st.st_mode))
+       if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
                part = st.st_rdev & 7;
        if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
                pp = &lab.d_partitions[part];
                if (pp->p_size)
                        return pp->p_size << 9;
        }
-#endif
 #endif /* HAVE_SYS_DISKLABEL_H */
+       {
+#ifdef HAVE_FSTAT64
+               struct stat64   st;
+               if (fstat64(fd, &st) == 0)
+#else
+               struct stat     st;
+               if (fstat(fd, &st) == 0)
+#endif
+                       if (S_ISREG(st.st_mode))
+                               return st.st_size;
+       }
+
 
        /*
         * OK, we couldn't figure it out by using a specialized ioctl,