]> git.ipfire.org Git - thirdparty/util-linux.git/blobdiff - shlibs/blkid/src/probe.c
build-sys: include <uuid.h> rather than <uuid/uuid.h>
[thirdparty/util-linux.git] / shlibs / blkid / src / probe.c
index 834259290a88a9619b40c5ce80f7e7876b827c54..8b8982509553b55eae78c53a448f1f6af2e0348b 100644 (file)
  * the selected (see blkid_probe_set_device()) device.
  *
  * The probing routines are grouped together into separate chains. Currently,
- * the librray provides superblocks, partitions and topology chains.
+ * the library provides superblocks, partitions and topology chains.
  *
  * The probing routines is possible to filter (enable/disable) by type (e.g.
  * fstype "vfat" or partype "gpt") or by usage flags (e.g. BLKID_USAGE_RAID).
- * These filters are per-chain. For more details see the chain specific
- * documenation.
+ * These filters are per-chain. Note that always when you touch the chain
+ * filter the current probing position is reseted and probing starts from
+ * scratch.  It means that the chain filter should not be modified during
+ * probing, for example in loop where you call blkid_do_probe().
+ *
+ * For more details see the chain specific documentation.
  *
  * The low-level API provides two ways how access to probing results.
  *
  *
  *   2. The binary interfaces. These interfaces return data in the native formats.
  *      The interface is always specific to the probing chain.
+ *
+ *  Note that the previous probing result (binary or NAME=value) is always
+ *  zeroized when a chain probing function is called. For example
+ *
+ * <informalexample>
+ *   <programlisting>
+ *     blkid_probe_enable_partitions(pr, TRUE);
+ *     blkid_probe_enable_superblocks(pr, FALSE);
+ *
+ *     blkid_do_safeprobe(pr);
+ *   </programlisting>
+ * </informalexample>
+ *
+ * overwrites the previous probing result for the partitions chain, the superblocks
+ * result is not modified.
  */
 
 /**
@@ -44,7 +63,7 @@
  *
  * The SUPERBLOCKS chain is enabled by default. The all others chains is
  * necessary to enable by blkid_probe_enable_'CHAINNAME'(). See chains specific
- * documenation.
+ * documentation.
  *
  * The blkid_do_probe() function returns a result from only one probing
  * routine, and the next call from the next probing routine. It means you need
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/types.h>
+#ifdef HAVE_LINUX_CDROM_H
+#include <linux/cdrom.h>
+#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
 
 #ifdef HAVE_LIBUUID
-# ifdef HAVE_UUID_UUID_H
-#  include <uuid/uuid.h>
-# else
-#  include <uuid.h>
-# endif
+# include <uuid.h>
 #endif
 
-#include "blkdev.h"
 #include "blkidP.h"
 
 /* chains */
@@ -110,6 +125,7 @@ static const struct blkid_chaindrv *chains_drvs[] = {
 };
 
 static void blkid_probe_reset_vals(blkid_probe pr);
+static void blkid_probe_reset_buffer(blkid_probe pr);
 
 /**
  * blkid_new_probe:
@@ -132,9 +148,51 @@ blkid_probe blkid_new_probe(void)
                pr->chains[i].flags = chains_drvs[i]->dflt_flags;
                pr->chains[i].enabled = chains_drvs[i]->dflt_enabled;
        }
+       INIT_LIST_HEAD(&pr->buffers);
        return pr;
 }
 
+/**
+ * blkid_new_probe_from_filename:
+ * @filename: device or regular file
+ *
+ * This function is same as call open(filename), blkid_new_probe() and
+ * blkid_probe_set_device(pr, fd, 0, 0).
+ *
+ * The @filename is closed by blkid_free_probe() or by the
+ * blkid_probe_set_device() call.
+ *
+ * Returns: a pointer to the newly allocated probe struct or NULL in case of
+ * error.
+ */
+blkid_probe blkid_new_probe_from_filename(const char *filename)
+{
+       int fd = -1;
+       blkid_probe pr = NULL;
+
+       if (!filename)
+               return NULL;
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0)
+               return NULL;
+
+       pr = blkid_new_probe();
+       if (!pr)
+               goto err;
+
+       if (blkid_probe_set_device(pr, fd, 0, 0))
+               goto err;
+
+       pr->flags |= BLKID_PRIVATE_FD;
+       return pr;
+err:
+       if (fd >= 0)
+               close(fd);
+       blkid_free_probe(pr);
+       return NULL;
+}
+
 /**
  * blkid_free_probe:
  * @pr: probe
@@ -156,21 +214,11 @@ void blkid_free_probe(blkid_probe pr)
                        ch->driver->free_data(pr, ch->data);
                free(ch->fltr);
        }
-       free(pr->buf);
-       free(pr->sbbuf);
-       free(pr);
-}
 
-static void blkid_probe_reset_buffer(blkid_probe pr)
-{
-       DBG(DEBUG_LOWPROBE, printf("reseting blkid probe buffer\n"));
-       if (pr->buf)
-               memset(pr->buf, 0, pr->buf_max);
-       pr->buf_off = 0;
-       pr->buf_len = 0;
-       if (pr->sbbuf)
-               memset(pr->sbbuf, 0, BLKID_SB_BUFSIZ);
-       pr->sbbuf_len = 0;
+       if ((pr->flags & BLKID_PRIVATE_FD) && pr->fd >= 0)
+               close(pr->fd);
+       blkid_probe_reset_buffer(pr);
+       free(pr);
 }
 
 
@@ -198,6 +246,12 @@ void blkid_probe_chain_reset_vals(blkid_probe pr, struct blkid_chain *chn)
        pr->nvals = nvals;
 }
 
+static void blkid_probe_chain_reset_position(struct blkid_chain *chn)
+{
+       if (chn)
+               chn->idx = -1;
+}
+
 /*
  * Copies chain values from probing result to @vals, the max size of @vals is
  * @nvals and returns real number of values.
@@ -243,20 +297,34 @@ struct blkid_chain *blkid_probe_get_chain(blkid_probe pr)
 
 void *blkid_probe_get_binary_data(blkid_probe pr, struct blkid_chain *chn)
 {
-       int rc;
+       int rc, org_prob_flags;
+       struct blkid_chain *org_chn;
 
-       if (!pr && !chn)
+       if (!pr || !chn)
                return NULL;
 
+       /* save the current setting -- the binary API has to be completely
+        * independent on the current probing status
+        */
+       org_chn = pr->cur_chain;
+       org_prob_flags = pr->prob_flags;
+
        pr->cur_chain = chn;
+       pr->prob_flags = 0;
        chn->binary = TRUE;
+       blkid_probe_chain_reset_position(chn);
 
        rc = chn->driver->probe(pr, chn);
 
        chn->binary = FALSE;
-       pr->cur_chain = NULL;
+       blkid_probe_chain_reset_position(chn);
 
-       if (rc < 0)
+       /* restore the original setting
+        */
+       pr->cur_chain = org_chn;
+       pr->prob_flags = org_prob_flags;
+
+       if (rc != 0)
                return NULL;
 
        DBG(DEBUG_LOWPROBE,
@@ -269,8 +337,9 @@ void *blkid_probe_get_binary_data(blkid_probe pr, struct blkid_chain *chn)
  * blkid_reset_probe:
  * @pr: probe
  *
- * Cleanup probing result. This function does not touch probing filters
- * and keeps assigned device.
+ * Zeroize probing results and resets the current probing (this has impact to
+ * blkid_do_probe() only). This function does not touch probing filters and
+ * keeps assigned device.
  */
 void blkid_reset_probe(blkid_probe pr)
 {
@@ -282,8 +351,10 @@ void blkid_reset_probe(blkid_probe pr)
        blkid_probe_reset_buffer(pr);
        blkid_probe_reset_vals(pr);
 
+       pr->cur_chain = NULL;
+
        for (i = 0; i < BLKID_NCHAINS; i++)
-               pr->chains[i].idx = -1;
+               blkid_probe_chain_reset_position(&pr->chains[i]);
 }
 
 /***
@@ -328,7 +399,7 @@ unsigned long *blkid_probe_get_filter(blkid_probe pr, int chain, int create)
        /* always when you touch the chain filter all indexes are reseted and
         * probing starts from scratch
         */
-       chn->idx = -1;
+       blkid_probe_chain_reset_position(chn);
        pr->cur_chain = NULL;
 
        if (!chn->driver->has_fltr || (!chn->fltr && !create))
@@ -350,16 +421,14 @@ int __blkid_probe_invert_filter(blkid_probe pr, int chain)
 {
        int i;
        struct blkid_chain *chn;
-       unsigned long *fltr;
-
-       fltr = blkid_probe_get_filter(pr, chain, FALSE);
-       if (!fltr)
-               return -1;
 
        chn = &pr->chains[chain];
 
+       if (!chn->driver->has_fltr || !chn->fltr)
+               return -1;
+
        for (i = 0; i < blkid_bmp_nwords(chn->driver->nidinfos); i++)
-               fltr[i] = ~fltr[i];
+               chn->fltr[i] = ~chn->fltr[i];
 
        DBG(DEBUG_LOWPROBE, printf("probing filter inverted\n"));
        /* blkid_probe_dump_filter(pr, chain); */
@@ -410,73 +479,99 @@ int __blkid_probe_filter_types(blkid_probe pr, int chain, int flag, char *names[
        return 0;
 }
 
-/*
- * Note that we have two offsets:
- *
- *     1/ general device offset (pr->off), that's useful for example when we
- *        probe a partition from whole disk image:
- *                    blkid-low --offset  <partition_position> disk.img
- *
- *     2/ buffer offset (the 'off' argument), that useful for offsets in
- *        superbloks, ...
- *
- *     That means never use lseek(fd, 0, SEEK_SET), the zero position is always
- *     pr->off, so lseek(fd, pr->off, SEEK_SET).
- *
- */
 unsigned char *blkid_probe_get_buffer(blkid_probe pr,
                                blkid_loff_t off, blkid_loff_t len)
 {
-       ssize_t ret_read = 0;
+       struct list_head *p;
+       struct blkid_bufinfo *bf = NULL;
 
-       if (off < 0 || len < 0) {
-               DBG(DEBUG_LOWPROBE,
-                       printf("unexpected offset or length of buffer requested\n"));
+       if (pr->size <= 0)
                return NULL;
-       }
-       if (off + len <= BLKID_SB_BUFSIZ) {
-               if (!pr->sbbuf) {
-                       pr->sbbuf = malloc(BLKID_SB_BUFSIZ);
-                       if (!pr->sbbuf)
-                               return NULL;
-               }
-               if (!pr->sbbuf_len) {
-                       if (lseek(pr->fd, pr->off, SEEK_SET) < 0)
-                               return NULL;
-                       ret_read = read(pr->fd, pr->sbbuf, BLKID_SB_BUFSIZ);
-                       if (ret_read < 0)
-                               ret_read = 0;
-                       pr->sbbuf_len = ret_read;
+
+       list_for_each(p, &pr->buffers) {
+               struct blkid_bufinfo *x =
+                               list_entry(p, struct blkid_bufinfo, bufs);
+
+               if (x->off <= off && off + len <= x->off + x->len) {
+                       DBG(DEBUG_LOWPROBE,
+                               printf("\treuse buffer: off=%jd len=%jd\n",
+                                                       x->off, x->len));
+                       bf = x;
+                       break;
                }
-               if (off + len > pr->sbbuf_len)
+       }
+       if (!bf) {
+               ssize_t ret;
+
+               if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0)
+                       return NULL;
+
+               /* allocate info and space for data by why call */
+               bf = calloc(1, sizeof(struct blkid_bufinfo) + len);
+               if (!bf)
                        return NULL;
-               return pr->sbbuf + off;
-       } else {
-               unsigned char *newbuf = NULL;
-
-               if (len > pr->buf_max) {
-                       newbuf = realloc(pr->buf, len);
-                       if (!newbuf)
-                               return NULL;
-                       pr->buf = newbuf;
-                       pr->buf_max = len;
-                       pr->buf_off = 0;
-                       pr->buf_len = 0;
-               }
-               if (newbuf || off < pr->buf_off ||
-                   off + len > pr->buf_off + pr->buf_len) {
 
-                       if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0)
-                               return NULL;
+               bf->data = ((unsigned char *) bf) + sizeof(struct blkid_bufinfo);
+               bf->len = len;
+               bf->off = off;
+               INIT_LIST_HEAD(&bf->bufs);
 
-                       ret_read = read(pr->fd, pr->buf, len);
-                       if (ret_read != (ssize_t) len)
-                               return NULL;
-                       pr->buf_off = off;
-                       pr->buf_len = len;
+               DBG(DEBUG_LOWPROBE,
+                       printf("\tbuffer read: off=%jd len=%jd\n", off, len));
+
+               ret = read(pr->fd, bf->data, len);
+               if (ret != (ssize_t) len) {
+                       free(bf);
+                       return NULL;
                }
-               return off ? pr->buf + (off - pr->buf_off) : pr->buf;
+               list_add_tail(&bf->bufs, &pr->buffers);
+       }
+
+       return off ? bf->data + (off - bf->off) : bf->data;
+}
+
+
+static void blkid_probe_reset_buffer(blkid_probe pr)
+{
+       uint64_t read_ct = 0, len_ct = 0;
+
+       if (!pr || list_empty(&pr->buffers))
+               return;
+
+       DBG(DEBUG_LOWPROBE, printf("reseting probing buffers\n"));
+
+       while (!list_empty(&pr->buffers)) {
+               struct blkid_bufinfo *bf = list_entry(pr->buffers.next,
+                                               struct blkid_bufinfo, bufs);
+
+               read_ct++;
+               len_ct += bf->len;
+               list_del(&bf->bufs);
+               free(bf);
        }
+
+       DBG(DEBUG_LOWPROBE,
+               printf("buffers summary: %"PRIu64" bytes "
+                       "by %"PRIu64" read() call(s)\n",
+                       len_ct, read_ct));
+
+       INIT_LIST_HEAD(&pr->buffers);
+}
+
+/*
+ * Small devices need a special care.
+ */
+int blkid_probe_is_tiny(blkid_probe pr)
+{
+       return pr && (pr->flags & BLKID_TINY_DEV);
+}
+
+/*
+ * CDROMs may fail when probed for RAID (last sector problem)
+ */
+int blkid_probe_is_cdrom(blkid_probe pr)
+{
+       return pr && (pr->flags & BLKID_CDROM_DEV);
 }
 
 /**
@@ -484,21 +579,29 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
  * @pr: probe
  * @fd: device file descriptor
  * @off: begin of probing area
- * @size: size of probing area
+ * @size: size of probing area (zero means whole device/file)
  *
  * Assigns the device to probe control struct, resets internal buffers and
- * reads 512 bytes from device to the buffers.
+ * resets the current probing.
  *
  * Returns: -1 in case of failure, or 0 on success.
  */
 int blkid_probe_set_device(blkid_probe pr, int fd,
                blkid_loff_t off, blkid_loff_t size)
 {
+       struct stat sb;
+
        if (!pr)
                return -1;
 
        blkid_reset_probe(pr);
 
+       if ((pr->flags & BLKID_PRIVATE_FD) && pr->fd >= 0)
+               close(pr->fd);
+
+       pr->flags &= ~BLKID_PRIVATE_FD;
+       pr->flags &= ~BLKID_TINY_DEV;
+       pr->flags &= ~BLKID_CDROM_DEV;
        pr->fd = fd;
        pr->off = off;
        pr->size = 0;
@@ -506,35 +609,62 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
        pr->mode = 0;
        pr->blkssz = 0;
 
+#if defined(POSIX_FADV_RANDOM) && defined(HAVE_POSIX_FADVISE)
+       /* Disable read-ahead */
+       posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM);
+#endif
+       if (fstat(fd, &sb))
+               goto err;
+
+       if (!S_ISBLK(sb.st_mode) && !S_ISCHR(sb.st_mode) && !S_ISREG(sb.st_mode))
+               goto err;
+
+       pr->mode = sb.st_mode;
+       if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode))
+               pr->devno = sb.st_rdev;
+
        if (size)
                pr->size = size;
        else {
-               struct stat sb;
-
-               if (fstat(fd, &sb))
-                       return -1;
+               if (S_ISBLK(sb.st_mode)) {
+                       if (blkdev_get_size(fd, (unsigned long long *) &pr->size)) {
+                               DBG(DEBUG_LOWPROBE, printf(
+                                       "failed to get device size\n"));
+                               goto err;
+                       }
+               } else if (S_ISCHR(sb.st_mode))
+                       pr->size = 1;           /* UBI devices are char... */
+               else if (S_ISREG(sb.st_mode))
+                       pr->size = sb.st_size;  /* regular file */
 
-               pr->mode = sb.st_mode;
+               if (pr->off > pr->size)
+                       goto err;
 
-               if (S_ISBLK(sb.st_mode)) {
-                       blkdev_get_size(fd, (unsigned long long *) &pr->size);
-                       pr->devno = sb.st_rdev;
-               } else
-                       pr->size = sb.st_size;
+               /* The probing area cannot be larger than whole device, pr->off
+                * is offset within the device */
+               pr->size -= pr->off;
        }
-       if (!pr->size)
-               return -1;
 
-       /* read SB to test if the device is readable */
-       if (!blkid_probe_get_buffer(pr, 0, 0x200)) {
-               DBG(DEBUG_LOWPROBE,
-                       printf("failed to prepare a device for low-probing\n"));
-               return -1;
-       }
+       if (pr->size <= 1440 * 1024 && !S_ISCHR(sb.st_mode))
+               pr->flags |= BLKID_TINY_DEV;
+
+#ifdef CDROM_GET_CAPABILITY
+       if (S_ISBLK(sb.st_mode) && ioctl(fd, CDROM_GET_CAPABILITY, NULL) >= 0)
+               pr->flags |= BLKID_CDROM_DEV;
+#endif
 
-       DBG(DEBUG_LOWPROBE, printf("ready for low-probing, offset=%zd, size=%zd\n",
+       DBG(DEBUG_LOWPROBE, printf("ready for low-probing, offset=%jd, size=%jd\n",
                                pr->off, pr->size));
+       DBG(DEBUG_LOWPROBE, printf("whole-disk: %s, regfile: %s\n",
+               blkid_probe_is_wholedisk(pr) ?"YES" : "NO",
+               S_ISREG(pr->mode) ? "YES" : "NO"));
+
        return 0;
+err:
+       DBG(DEBUG_LOWPROBE,
+               printf("failed to prepare a device for low-probing\n"));
+       return -1;
+
 }
 
 int blkid_probe_get_dimension(blkid_probe pr,
@@ -564,12 +694,73 @@ int blkid_probe_set_dimension(blkid_probe pr,
 
        pr->off = off;
        pr->size = size;
+       pr->flags &= ~BLKID_TINY_DEV;
+
+       if (pr->size <= 1440 * 1024 && !S_ISCHR(pr->mode))
+               pr->flags |= BLKID_TINY_DEV;
 
        blkid_probe_reset_buffer(pr);
 
        return 0;
 }
 
+int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
+                       blkid_loff_t *offset, const struct blkid_idmag **res)
+{
+       const struct blkid_idmag *mag = NULL;
+       blkid_loff_t off = 0;
+
+       if (id)
+               mag = id->magics ? &id->magics[0] : NULL;
+       if (res)
+               *res = NULL;
+
+       /* try to detect by magic string */
+       while(mag && mag->magic) {
+               unsigned char *buf;
+
+               off = (mag->kboff + (mag->sboff >> 10)) << 10;
+               buf = blkid_probe_get_buffer(pr, off, 1024);
+
+               if (buf && !memcmp(mag->magic,
+                               buf + (mag->sboff & 0x3ff), mag->len)) {
+                       DBG(DEBUG_LOWPROBE, printf(
+                               "\tmagic sboff=%u, kboff=%ld\n",
+                               mag->sboff, mag->kboff));
+                       if (offset)
+                               *offset = off + (mag->sboff & 0x3ff);
+                       if (res)
+                               *res = mag;
+                       return 0;
+               }
+               mag++;
+       }
+
+       if (id->magics && id->magics[0].magic)
+               /* magic string(s) defined, but not found */
+               return 1;
+
+       return 0;
+}
+
+static inline void blkid_probe_start(blkid_probe pr)
+{
+       if (pr) {
+               pr->cur_chain = NULL;
+               pr->prob_flags = 0;
+               blkid_probe_set_wiper(pr, 0, 0);
+       }
+}
+
+static inline void blkid_probe_end(blkid_probe pr)
+{
+       if (pr) {
+               pr->cur_chain = NULL;
+               pr->prob_flags = 0;
+               blkid_probe_set_wiper(pr, 0, 0);
+       }
+}
+
 /**
  * blkid_do_probe:
  * @pr: prober
@@ -577,7 +768,8 @@ int blkid_probe_set_dimension(blkid_probe pr,
  * Calls probing functions in all enabled chains. The superblocks chain is
  * enabled by default. The blkid_do_probe() stores result from only one
  * probing function. It's necessary to call this routine in a loop to get
- * resuluts from all probing functions in all chains.
+ * results from all probing functions in all chains. The probing is reseted
+ * by blkid_reset_probe() or by filter functions.
  *
  * This is string-based NAME=value interface only.
  *
@@ -618,21 +810,38 @@ int blkid_do_probe(blkid_probe pr)
                return -1;
 
        do {
-               struct blkid_chain *chn;
+               struct blkid_chain *chn = pr->cur_chain;
 
-               if (!pr->cur_chain)
-                       pr->cur_chain = &pr->chains[0];
-               else if (pr->cur_chain < &pr->chains[BLKID_NCHAINS - 1])
-                       pr->cur_chain += sizeof(struct blkid_chain);
-               else
-                       return 1;       /* all chains already probed */
+               if (!chn) {
+                       blkid_probe_start(pr);
+                       chn = pr->cur_chain = &pr->chains[0];
+               }
+               /* we go to the next chain only when the previous probing
+                * result was nothing (rc == 1) and when the current chain is
+                * disabled or we are at end of the current chain (chain->idx +
+                * 1 == sizeof chain) or the current chain bailed out right at
+                * the start (chain->idx == -1)
+                */
+               else if (rc == 1 && (chn->enabled == FALSE ||
+                                    chn->idx + 1 == chn->driver->nidinfos ||
+                                    chn->idx == -1)) {
+
+                       int idx = chn->driver->id + 1;
+
+                       if (idx < BLKID_NCHAINS)
+                               chn = pr->cur_chain = &pr->chains[idx];
+                       else {
+                               blkid_probe_end(pr);
+                               return 1;       /* all chains already probed */
+                       }
+               }
 
-               chn = pr->cur_chain;
                chn->binary = FALSE;            /* for sure... */
 
-               DBG(DEBUG_LOWPROBE, printf("chain probe %s %s\n",
+               DBG(DEBUG_LOWPROBE, printf("chain probe %s %s (idx=%d)\n",
                                chn->driver->name,
-                               chn->enabled? "ENABLED" : "DISABLED"));
+                               chn->enabled? "ENABLED" : "DISABLED",
+                               chn->idx));
 
                if (!chn->enabled)
                        continue;
@@ -656,7 +865,9 @@ int blkid_do_probe(blkid_probe pr)
  *
  * Note about suberblocks chain -- the function does not check for filesystems
  * when a RAID signature is detected.  The function also does not check for
- * collision between RAIDs. The first detected RAID is returned.
+ * collision between RAIDs. The first detected RAID is returned. The function
+ * checks for collision between partition table and RAID signature -- it's
+ * recommended to enable partitions chain together with superblocks chain.
  *
  * Returns: 0 on success, 1 if nothing is detected, -2 if ambivalen result is
  * detected and -1 on case of error.
@@ -668,6 +879,8 @@ int blkid_do_safeprobe(blkid_probe pr)
        if (!pr)
                return -1;
 
+       blkid_probe_start(pr);
+
        for (i = 0; i < BLKID_NCHAINS; i++) {
                struct blkid_chain *chn;
 
@@ -681,10 +894,13 @@ int blkid_do_safeprobe(blkid_probe pr)
                if (!chn->enabled)
                        continue;
 
-               chn->idx = - 1;
+               blkid_probe_chain_reset_position(chn);
 
-               /* rc: -2 ambivalent, -1 = error, 0 = success, 1 = no result */
                rc = chn->driver->safeprobe(pr, chn);
+
+               blkid_probe_chain_reset_position(chn);
+
+               /* rc: -2 ambivalent, -1 = error, 0 = success, 1 = no result */
                if (rc < 0)
                        goto done;      /* error */
                if (rc == 0)
@@ -692,7 +908,7 @@ int blkid_do_safeprobe(blkid_probe pr)
        }
 
 done:
-       pr->cur_chain = NULL;
+       blkid_probe_end(pr);
        if (rc < 0)
                return rc;
        return count ? 0 : 1;
@@ -717,6 +933,8 @@ int blkid_do_fullprobe(blkid_probe pr)
        if (!pr)
                return -1;
 
+       blkid_probe_start(pr);
+
        for (i = 0; i < BLKID_NCHAINS; i++) {
                int rc;
                struct blkid_chain *chn;
@@ -731,10 +949,13 @@ int blkid_do_fullprobe(blkid_probe pr)
                if (!chn->enabled)
                        continue;
 
-               chn->idx = - 1;
+               blkid_probe_chain_reset_position(chn);
 
-               /* rc: -1 = error, 0 = success, 1 = no result */
                rc = chn->driver->probe(pr, chn);
+
+               blkid_probe_chain_reset_position(chn);
+
+               /* rc: -1 = error, 0 = success, 1 = no result */
                if (rc < 0)
                        goto done;      /* error */
                if (rc == 0)
@@ -742,7 +963,7 @@ int blkid_do_fullprobe(blkid_probe pr)
        }
 
 done:
-       pr->cur_chain = NULL;
+       blkid_probe_end(pr);
        if (rc < 0)
                return rc;
        return count ? 0 : 1;
@@ -775,6 +996,25 @@ struct blkid_prval *blkid_probe_assign_value(
        return v;
 }
 
+int blkid_probe_reset_last_value(blkid_probe pr)
+{
+       struct blkid_prval *v;
+
+       if (pr == NULL || pr->nvals == 0)
+               return -1;
+
+       v = &pr->vals[pr->nvals - 1];
+
+       DBG(DEBUG_LOWPROBE,
+               printf("un-assigning %s [%s]\n", v->name, v->chain->driver->name));
+
+       memset(v, 0, sizeof(struct blkid_prval));
+       pr->nvals--;
+
+       return 0;
+
+}
+
 int blkid_probe_set_value(blkid_probe pr, const char *name,
                unsigned char *data, size_t len)
 {
@@ -805,7 +1045,7 @@ int blkid_probe_vsprintf_value(blkid_probe pr, const char *name,
        len = vsnprintf((char *) v->data, sizeof(v->data), fmt, ap);
 
        if (len <= 0) {
-               pr->nvals--; /* reset the latest assigned value */
+               blkid_probe_reset_last_value(pr);
                return -1;
        }
        v->len = len + 1;
@@ -833,20 +1073,60 @@ int blkid_probe_sprintf_value(blkid_probe pr, const char *name,
  */
 dev_t blkid_probe_get_devno(blkid_probe pr)
 {
-       if (!pr->devno) {
-               struct stat sb;
+       return pr->devno;
+}
+
+/**
+ * blkid_probe_get_wholedisk_devno:
+ * @pr: probe
+ *
+ * Returns: device number of the wholedisk, or 0 for regilar files.
+ */
+dev_t blkid_probe_get_wholedisk_devno(blkid_probe pr)
+{
+       if (!pr->disk_devno) {
+               dev_t devno, disk_devno = 0;
 
-               if (fstat(pr->fd, &sb) == 0 && S_ISBLK(sb.st_mode))
-                       pr->devno = sb.st_rdev;
+               devno = blkid_probe_get_devno(pr);
+               if (!devno)
+                       return 0;
+
+                if (blkid_devno_to_wholedisk(devno, NULL, 0, &disk_devno) == 0)
+                       pr->disk_devno = disk_devno;
        }
-       return pr->devno;
+       return pr->disk_devno;
+}
+
+/**
+ * blkid_probe_is_wholedisk:
+ * @pr: probe
+ *
+ * Returns: 1 if the device is whole-disk or 0.
+ */
+int blkid_probe_is_wholedisk(blkid_probe pr)
+{
+       dev_t devno, disk_devno;
+
+       devno = blkid_probe_get_devno(pr);
+       if (!devno)
+               return 0;
+
+       disk_devno = blkid_probe_get_wholedisk_devno(pr);
+       if (!disk_devno)
+               return 0;
+
+       return devno == disk_devno;
 }
 
 /**
  * blkid_probe_get_size:
  * @pr: probe
  *
- * Returns: block device (or file) size in bytes or -1 in case of error.
+ * This function returns size of probing area as defined by blkid_probe_set_device().
+ * If the size of the probing area is unrestricted then this function returns
+ * the real size of device. See also blkid_get_dev_size().
+ *
+ * Returns: size in bytes or -1 in case of error.
  */
 blkid_loff_t blkid_probe_get_size(blkid_probe pr)
 {
@@ -854,36 +1134,62 @@ blkid_loff_t blkid_probe_get_size(blkid_probe pr)
 }
 
 /**
- * blkid_probe_get_sectorsize:
+ * blkid_probe_get_offset:
+ * @pr: probe
+ *
+ * This function returns offset of probing area as defined by blkid_probe_set_device().
+ *
+ * Returns: offset in bytes or -1 in case of error.
+ */
+blkid_loff_t blkid_probe_get_offset(blkid_probe pr)
+{
+       return pr ? pr->off : -1;
+}
+
+/**
+ * blkid_probe_get_fd:
  * @pr: probe
  *
- * Returns: block device hardware sector size (BLKSSZGET ioctl, default 512).
+ * Returns: file descriptor for assigned device/file.
+ */
+int blkid_probe_get_fd(blkid_probe pr)
+{
+       return pr ? pr->fd : -1;
+}
+
+/**
+ * blkid_probe_get_sectorsize:
+ * @pr: probe or NULL (for NULL returns 512)
+ *
+ * Returns: block device logical sector size (BLKSSZGET ioctl, default 512).
  */
 unsigned int blkid_probe_get_sectorsize(blkid_probe pr)
 {
        if (!pr)
                return DEFAULT_SECTOR_SIZE;  /*... and good luck! */
+
        if (pr->blkssz)
                return pr->blkssz;
-       if (!pr->mode) {
-               struct stat st;
 
-               if (fstat(pr->fd, &st))
-                       goto fallback;
-               pr->mode = st.st_mode;
-       }
-       if (S_ISBLK(pr->mode)) {
-           if (blkdev_get_sector_size(pr->fd, (int *) &pr->blkssz))
-               goto fallback;
-
-           return pr->blkssz;
-       }
+       if (S_ISBLK(pr->mode) &&
+           blkdev_get_sector_size(pr->fd, (int *) &pr->blkssz) == 0)
+               return pr->blkssz;
 
-fallback:
        pr->blkssz = DEFAULT_SECTOR_SIZE;
        return pr->blkssz;
 }
 
+/**
+ * blkid_probe_get_sectors:
+ * @pr: probe
+ *
+ * Returns: 512-byte sector count or -1 in case of error.
+ */
+blkid_loff_t blkid_probe_get_sectors(blkid_probe pr)
+{
+       return pr ? pr->size >> 9 : -1;
+}
+
 /**
  * blkid_probe_numof_values:
  * @pr: probe
@@ -905,6 +1211,9 @@ int blkid_probe_numof_values(blkid_probe pr)
  * @data: pointer to return value data or NULL
  * @len: pointer to return value length or NULL
  *
+ * Note, the @len returns length of the @data, including the terminating
+ * '\0' character.
+ *
  * Returns: 0 on success, or -1 in case of error.
  */
 int blkid_probe_get_value(blkid_probe pr, int num, const char **name,
@@ -932,6 +1241,9 @@ int blkid_probe_get_value(blkid_probe pr, int num, const char **name,
  * @data: pointer to return value data or NULL
  * @len: pointer to return value length or NULL
  *
+ * Note, the @len returns length of the @data, including the terminating
+ * '\0' character.
+ *
  * Returns: 0 on success, or -1 in case of error.
  */
 int blkid_probe_lookup_value(blkid_probe pr, const char *name,
@@ -945,7 +1257,6 @@ int blkid_probe_lookup_value(blkid_probe pr, const char *name,
                *data = (char *) v->data;
        if (len)
                *len = v->len;
-       DBG(DEBUG_LOWPROBE, printf("returning %s value\n", v->name));
        return 0;
 }
 
@@ -1007,3 +1318,97 @@ void blkid_unparse_uuid(const unsigned char *uuid, char *str, size_t len)
 #endif
 }
 
+
+/* Removes whitespace from the right-hand side of a string (trailing
+ * whitespace).
+ *
+ * Returns size of the new string (without \0).
+ */
+size_t blkid_rtrim_whitespace(unsigned char *str)
+{
+       size_t i = strlen((char *) str);
+
+       while (i--) {
+               if (!isspace(str[i]))
+                       break;
+       }
+       str[++i] = '\0';
+       return i;
+}
+
+/*
+ * Some mkfs-like utils wipe some parts (usually begin) of the device.
+ * For example LVM (pvcreate) or mkswap(8). This information could be used
+ * for later resolution to conflicts between superblocks.
+ *
+ * For example we found valid LVM superblock, LVM wipes 8KiB at the begin of
+ * the device. If we found another signature (for example MBR) this wiped area
+ * then the signature has been added later and LVM superblock should be ignore.
+ *
+ * Note that this heuristic is not 100% reliable, for example "pvcreate --zero
+ * n" allows to keep the begin of the device unmodified. It's probably better
+ * to use this heuristic for conflicts between superblocks and partition tables
+ * than for conflicts between filesystem superblocks -- existence of unwanted
+ * partition table is very unusual, because PT is pretty visible (parsed and
+ * interpreted by kernel).
+ */
+void blkid_probe_set_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size)
+{
+       struct blkid_chain *chn;
+
+       if (!pr)
+               return;
+
+       if (!size) {
+               DBG(DEBUG_LOWPROBE, printf("zeroize wiper\n"));
+               pr->wipe_size = pr->wipe_off = 0;
+               pr->wipe_chain = NULL;
+               return;
+       }
+
+       chn = pr->cur_chain;
+
+       if (!chn || !chn->driver ||
+           chn->idx < 0 || chn->idx >= chn->driver->nidinfos)
+               return;
+
+       pr->wipe_size = size;
+       pr->wipe_off = off;
+       pr->wipe_chain = chn;
+
+       DBG(DEBUG_LOWPROBE,
+               printf("wiper set to %s::%s off=%jd size=%jd\n",
+                       chn->driver->name,
+                       chn->driver->idinfos[chn->idx]->name,
+                       pr->wipe_off, pr->wipe_size));
+       return;
+}
+
+/*
+ * Returns 1 if the <@off,@size> area was wiped
+ */
+int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn,
+                    blkid_loff_t off, blkid_loff_t size)
+{
+       if (!pr || !size)
+               return 0;
+
+       if (pr->wipe_off <= off && off + size <= pr->wipe_off + pr->wipe_size) {
+               if (chn)
+                       *chn = pr->wipe_chain;
+               return 1;
+       }
+       return 0;
+}
+
+void blkid_probe_use_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size)
+{
+       struct blkid_chain *chn = NULL;
+
+       if (blkid_probe_is_wiped(pr, &chn, off, size) && chn) {
+               DBG(DEBUG_LOWPROBE, printf("wiped area detected -- ignore previous results\n"));
+               blkid_probe_set_wiper(pr, 0, 0);
+               blkid_probe_chain_reset_vals(pr, chn);
+       }
+}
+