libblkid: add support for PART_ENTRY_* values

blkid(8) will be replacement for devkit-disks-part-id, so we have to
be able to found entry in partition table for requested partition.

This functionality is enabled by BLKID_PARTS_ENTRY_DETAILS flag
(see blkid_probe_set_partitions_flags() for more details).

This patch also add a new public function blkid_partlist_devno_to_partition().

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/shlibs/blkid/src/blkid.h.in b/shlibs/blkid/src/blkid.h.in
index 4e53b39feaba7cd885b2116b0f9df602d4eae9f7..59c05ab4bbb20ba6262fdd70a33b5f042b23a3a5 100644 (file)
--- a/shlibs/blkid/src/blkid.h.in
+++ b/shlibs/blkid/src/blkid.h.in
@@ -260,7 +260,8 @@ extern int blkid_probe_filter_partitions_type(blkid_probe pr, int flag, char *na
 
 
 /* partitions probing flags */
-#define BLKID_PARTS_FORCE_GPT  (1 << 1)
+#define BLKID_PARTS_FORCE_GPT          (1 << 1)
+#define BLKID_PARTS_ENTRY_DETAILS      (1 << 2)
 extern int blkid_probe_set_partitions_flags(blkid_probe pr, int flags);
 
 /* binary interface */
@@ -268,6 +269,7 @@ extern blkid_partlist blkid_probe_get_partitions(blkid_probe pr);
 
 extern int blkid_partlist_numof_partitions(blkid_partlist ls);
 extern blkid_partition blkid_partlist_get_partition(blkid_partlist ls, int n);
+extern blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno);
 
 extern blkid_parttable blkid_partition_get_table(blkid_partition par);
 extern const char *blkid_partition_get_name(blkid_partition par);

diff --git a/shlibs/blkid/src/blkid.sym b/shlibs/blkid/src/blkid.sym
index 4d01aa201b7a94e476d82af54e6f6e181cada839..ea674f75848d334c83cf6bd09146887d1617a33e 100644 (file)
--- a/shlibs/blkid/src/blkid.sym
+++ b/shlibs/blkid/src/blkid.sym
@@ -121,4 +121,5 @@ global:
 BLKID_2.18 {
 global:
        blkid_probe_all_removable;
+       blkid_partlist_devno_to_partition;
 } BLKID_2.17;

diff --git a/shlibs/blkid/src/partitions/partitions.c b/shlibs/blkid/src/partitions/partitions.c
index e8d0311371dc1d3b6fc45007037dd4c473f2210f..21b6645a238ae28ba7955d44327b8f5c405f6073 100644 (file)
--- a/shlibs/blkid/src/partitions/partitions.c
+++ b/shlibs/blkid/src/partitions/partitions.c
@@ -33,6 +33,12 @@
  *
  * @PTTYPE: partition table type (dos, gpt, etc.).
  *
+ * @PART_ENTRY_NAME: partition name (gpt and mac only)
+ *
+ * @PART_ENTRY_UUID: partition UUID (gpt only)
+ *
+ * @PART_ENTRY_TYPE: partition type, 0xNN (e.g 0x82) or type UUID (gpt only)
+ *
  * Example:
  *
  * <informalexample>
@@ -171,6 +177,8 @@ struct blkid_struct_partlist {
        struct list_head l_tabs;        /* list of partition tables */
 };
 
+static int blkid_partitions_probe_partition(blkid_probe pr);
+
 /**
  * blkid_probe_enable_partitions:
  * @pr: probe
@@ -557,7 +565,7 @@ nothing:
  */
 static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)
 {
-       int i = 0;
+       int i = 0, rc = 1;
 
        if (!pr || chn->idx < -1)
                return -1;
@@ -594,12 +602,25 @@ static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)
                DBG(DEBUG_LOWPROBE,
                        printf("<-- leaving probing loop (type=%s) [PARTS idx=%d]\n",
                        name, chn->idx));
-               return 0;
+               rc = 0;
+               break;
        }
-       DBG(DEBUG_LOWPROBE,
-               printf("<-- leaving probing loop (failed) [PARTS idx=%d]\n",
-               chn->idx));
-       return 1;
+
+       if (rc == 1) {
+               DBG(DEBUG_LOWPROBE,
+                       printf("<-- leaving probing loop (failed) [PARTS idx=%d]\n",
+                       chn->idx));
+       }
+
+       /*
+        * Gather PART_ENTRY_* values if the current device is a partition.
+        */
+       if ((blkid_partitions_get_flags(pr) & BLKID_PARTS_ENTRY_DETAILS)) {
+               if (!blkid_partitions_probe_partition(pr))
+                       rc = 0;
+       }
+
+       return rc;
 }
 
 /* Probe for nested partition table within the parental partition */
@@ -652,6 +673,73 @@ int blkid_partitions_do_subprobe(blkid_probe pr, blkid_partition parent,
        return rc;
 }
 
+static int blkid_partitions_probe_partition(blkid_probe pr)
+{
+       int rc = 1;
+       blkid_probe disk_pr = NULL;
+       blkid_partlist ls;
+       blkid_partition par;
+       dev_t devno, disk_devno;
+       char *disk_path = NULL;
+
+       devno = blkid_probe_get_devno(pr);
+       if (!devno)
+               goto nothing;
+
+       if (blkid_devno_to_wholedisk(devno, NULL, 0, &disk_devno))
+               goto nothing;
+
+       if (devno == disk_devno)
+               goto nothing;           /* this is not a partition */
+
+       disk_path = blkid_devno_to_devname(disk_devno);
+       if (!disk_path)
+               goto nothing;
+
+       DBG(DEBUG_LOWPROBE, printf(
+               "parts: %d:%d: starting whole-disk probing: %s\n",
+               major(devno), minor(devno), disk_path));
+
+       /* create a new prober for the disk */
+       disk_pr = blkid_new_probe_from_filename(disk_path);
+       if (!disk_pr)
+               goto nothing;
+
+       /* parse PT */
+       ls = blkid_probe_get_partitions(disk_pr);
+       if (!ls)
+               goto nothing;
+
+       par = blkid_partlist_devno_to_partition(ls, devno);
+       if (par) {
+               const char *v;
+
+               v = blkid_partition_get_name(par);
+               if (v)
+                       blkid_probe_set_value(pr, "PART_ENTRY_NAME",
+                               (unsigned char *) v, strlen(v) + 1);
+
+               v = blkid_partition_get_uuid(par);
+               if (v)
+                       blkid_probe_set_value(pr, "PART_ENTRY_UUID",
+                               (unsigned char *) v, strlen(v) + 1);
+
+               /* type */
+               v = blkid_partition_get_type_string(par);
+               if (v)
+                       blkid_probe_set_value(pr, "PART_ENTRY_TYPE",
+                               (unsigned char *) v, strlen(v) + 1);
+               else
+                       blkid_probe_sprintf_value(pr, "PART_ENTRY_TYPE",
+                               "0x%02x", blkid_partition_get_type(par));
+       }
+       rc = 0;
+nothing:
+       blkid_free_probe(disk_pr);
+       free(disk_path);
+       return rc;
+}
+
 /**
  * blkid_known_pttype:
  * @pttype: partiton name
@@ -707,6 +795,39 @@ blkid_partition blkid_partlist_get_partition(blkid_partlist ls, int n)
        return &ls->parts[n];
 }
 
+/**
+ * blkid_partlist_devno_to_partition:
+ * @ls: partitions list
+ * @devno: requested partition
+ *
+ * This function tries to get start and size for @devno from sysfs and
+ * returns a partition from @ls which matches with the values from sysfs.
+ *
+ * This funtion is necessary when you want to make a relation between an entry
+ * in the partition table (@ls) and block devices in your system.
+ *
+ * Returns: partition object or NULL in case or error.
+ */
+blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno)
+{
+       uint64_t start, size;
+       int i;
+
+       if (blkid_devno_get_attribute(devno, "start", &start))
+               return NULL;
+       if (blkid_devno_get_attribute(devno, "size", &size))
+               return NULL;
+
+       for (i = 0; i < ls->nparts; i++) {
+               blkid_partition par = &ls->parts[i];
+
+               if (blkid_partition_get_start(par) == start &&
+                   blkid_partition_get_size(par) == size)
+                       return par;
+       }
+       return NULL;
+}
+
 /**
  * blkid_parttable_get_type:
  * @tab: partition table